Skip to content

Commit ebae8ce

Browse files
authored
Merge pull request #3221 from cncf/main
[es] Merge main into dev-es
2 parents 58f5eea + d17cf47 commit ebae8ce

File tree

293 files changed

+3458
-33551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

293 files changed

+3458
-33551
lines changed

.github/settings.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,6 @@ collaborators:
168168
- username: huats
169169
permission: push
170170

171-
- username: fydrah
172-
permission: push
173-
174171
- username: Krast76
175172
permission: push
176173

@@ -180,6 +177,9 @@ collaborators:
180177
- username: guillaumebernard84
181178
permission: push
182179

180+
- username: seb-835
181+
permission: push
182+
183183
# l10n ur approvers
184184
- username: Saim-Safdar
185185
permission: push
@@ -220,7 +220,7 @@ collaborators:
220220
- username: aliok
221221
permission: push
222222

223-
- username: halil-bugol
223+
- username: symys
224224
permission: push
225225

226226
- username: rwxdash
@@ -448,10 +448,10 @@ branches:
448448
# fr approvers
449449
users:
450450
- huats
451-
- fydrah
452451
- Krast76
453452
- sestegra
454453
- guillaumebernard84
454+
- seb-835
455455
teams: []
456456
enforce_admins: null
457457
required_linear_history: null
@@ -524,7 +524,7 @@ branches:
524524
# tr approvers
525525
users:
526526
- aliok
527-
- halil-bugol
527+
- symys
528528
- rwxdash
529529
- eminalemdar
530530
teams: []

.github/workflows/check-links.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Links
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
build-and-check-links:
8+
name: CHECK LINKS
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: actions/setup-node@v4
13+
with:
14+
node-version-file: .nvmrc
15+
cache: npm
16+
cache-dependency-path: package.json
17+
- run: npm install --omit=optional
18+
- run: npm run check:links

.github/workflows/es-spellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ jobs:
2929
set -o errexit
3030
diff content/es/.wordlist.txt <(LC_ALL= sort -f content/es/.wordlist.txt)
3131
- name: GitHub Spellcheck Action
32-
uses: rojopolis/spellcheck-github-actions@0.36.0
32+
uses: rojopolis/spellcheck-github-actions@0.38.0
3333
with:
3434
config_path: content/es/.spellcheck.yml

.github/workflows/post-outdated-content-report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
# - name: Download output
5151
# uses: actions/download-artifact@v3
5252
- name: Download output
53-
uses: dawidd6/action-download-artifact@v3
53+
uses: dawidd6/action-download-artifact@v6
5454
with:
5555
github_token: ${{secrets.GITHUB_TOKEN}}
5656
workflow: check-outdated-content.yaml

.github/workflows/spellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- name: GitHub Spellcheck Action
28-
uses: rojopolis/spellcheck-github-actions@0.36.0
28+
uses: rojopolis/spellcheck-github-actions@0.38.0

.gitignore

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11

2-
public/
3-
resources/
4-
node_modules/
5-
.hugo_build.lock
62
.DS_Store
3+
.hugo_build.lock
4+
/public
5+
/resources
6+
node_modules/
7+
package-lock.json
8+
pagefind
9+
tmp/
710

811
# Local Netlify folder
912
.netlify

.htmltest.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# cSpell:ignore pagefind regexs
2+
DirectoryPath: public
3+
# IgnoreDirectoryMissingTrailingSlash: true # FIXME
4+
IgnoreInternalEmptyHash: true # FIXME
5+
IgnoreDirs:
6+
- ^(bn|de|es|fr|hi|it|ko|pt.*?|ru|tr|ur|zh.*?)/
7+
IgnoreURLs: # list of regexs of paths or URLs to be ignored
8+
- ^/pagefind

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lts/*

CODEOWNERS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
/i18n/es.toml @raelga @ramrodo @electrocucaracha @krol3 @92nqb
3636

3737
# Approvers for French contents
38-
/content/fr/ @huats @fydrah @Krast76 @sestegra @guillaumebernard84
39-
/i18n/fr.toml @huats @fydrah @Krast76 @sestegra @guillaumebernard84
38+
/content/fr/ @huats @Krast76 @sestegra @guillaumebernard84 @seb-835
39+
/i18n/fr.toml @huats @Krast76 @sestegra @guillaumebernard84 @seb-835
4040

4141
# Approvers for Hindi contents
4242
/content/hi/ @Garima-Negi @jayesh-srivastava @abhay-raj19 @aj11anuj @kumarankit999 @bishal7679
@@ -63,8 +63,8 @@
6363
/i18n/ru.toml @shurup @kirkonru @tym83
6464

6565
# Approvers for Turkish contents
66-
/content/tr/ @aliok @halil-bugol @rwxdash @eminalemdar
67-
/i18n/tr.toml @aliok @halil-bugol @rwxdash @eminalemdar
66+
/content/tr/ @aliok @symys @rwxdash @eminalemdar
67+
/i18n/tr.toml @aliok @symys @rwxdash @eminalemdar
6868

6969
# Approvers for Urdu contents
7070
/content/ur/ @Saim-Safdar @waleed318
@@ -75,5 +75,5 @@
7575
/i18n/zh-cn.toml @hanyuancheung @Jacob953 @Rocksnake @Submarinee
7676

7777
# Approvers for Traditional Chinese contents
78-
/content/zh-tw/ @pichuang @ydFu @hwchiu @johnlinp
79-
/i18n/zh-tw.toml @pichuang @ydFu @hwchiu @johnlinp
78+
/content/zh-tw/ @tico88612 @ydFu @hwchiu @johnlinp
79+
/i18n/zh-tw.toml @tico88612 @ydFu @hwchiu @johnlinp

LOCALIZATION.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,31 @@ Open a PR with the localization initiation following this example: https://githu
5757

5858
To add a new language to the site, modify [config.toml](https://github.com/cncf/glossary/blob/main/config.toml#L54) (Note: localization teams should use their assigned development branch for this).
5959

60-
The `[languages]` block of `config.toml` is used to set the language. For instance, `[languages.en]` stands for English and `[languages.ko]` for Korean language configuration. Go to the `[languages]` block in `config.toml` and add a new block for your language-specific configuration. For instance, the Korean localization team added its `[languages.ko]` block after the `[languages.en]` block.
60+
The `[languages]` block of `config.toml` is used to set the language. For instance, `[languages.en]` stands for English and `[languages.ko]` for Korean language configuration. Go to the `[languages]` block in `config.toml` and find a place for your new localization:
61+
62+
- The English language always stays first.
63+
- Other languages are sorted based on the alphabetized English translation of their names (see how currently existing localizations are ordered as an example).
64+
- Each localization is written in its own language followed by the English translation in parentheses — e.g., `한국어 (Korean)`.
65+
- The `weight` parameter in the config is used for sorting (`1` is for English, `2` is for the alphabetically first language, `3` is for the second one, and so on).
66+
67+
For instance, you're adding a new block for the Korean localization. You calculated its weight as 8. Find the language block with `weight = 7` and add your new block afterwards:
6168

6269
- Example of `New language block for /config.toml`
6370
```diff
6471
[languages]
65-
[languages.en]
66-
title = "Cloud Native Glossary"
67-
description = "The CNCF Cloud Native Glossary Project is intended to be used as a reference for common terms used when talking about cloud native applications."
68-
languageName ="English"
69-
# Weight used for sorting.
70-
weight = 1
72+
...
73+
weight = 7
7174

7275
+[languages.ko]
7376
+title = "클라우드 네이티브(Cloud Native) 용어집"
7477
+description = "CNCF 클라우드 네이티브 용어집 프로젝트는 클라우드 네이티브 애플리케이션에 대한 대화를 나눌 때 공통의 용어를 참조하여 사용하도록 하는 목적을 가지고 있다."
75-
+languageName ="한국어(Korean)"
78+
+languageName = "한국어 (Korean)"
7679
+contentDir = "content/ko"
77-
+weight = 2
80+
+weight = 8
7881
```
7982

83+
Since the `weight` values should always be kept consistent, please **remember to increment the weights** of all the languages following your newly added localization.
84+
8085
#### 3-2. Adding a file for site strings
8186

8287
`i18n/<localization>.toml` sets up language-specific site strings.

0 commit comments

Comments
 (0)