Merge pull request #3029 from shurup/dev-ru

Merge `main` into `dev-ru` before launch

.github/ISSUE_TEMPLATE/new-term.yml

@@ -34,7 +34,7 @@ body:
           required: true
         - label: The term has not already been declined in the past. [(shift+click to check)](https://github.com/cncf/glossary/issues?q=is%3Aissue+is%3Aclosed+label%3A%22triage%2Fnot+accepted%22)
           required: false
-        - label: The term does not already exist in the [glossary](https://glossary.cncf.io).
+        - label: The term does not already exist in the [glossary](https://glossary.cncf.io) as a completed term, nor does it exist in [this directory](https://github.com/cncf/glossary/tree/main/content/en) as an incomplete term. (If the status of the term is `Feedback Appreciated`, consider updating the term.)
           required: true
         - label: I understand that maintainers will assess if the term should be part of the Glossary. (Please be patient)
           required: true

.github/labeler.yml

@@ -1,40 +1,59 @@
 lang/ar:
-- content/ar/**
+- changed-files:
+  - any-glob-to-any-file: 'content/ar/**'
 
 lang/bn:
-- content/bn/**
+- changed-files:
+  - any-glob-to-any-file: 'content/bn/**'
 
 lang/de:
-- content/de/**
+- changed-files:
+  - any-glob-to-any-file: 'content/de/**'
 
 lang/en:
-- content/en/**
+- changed-files:
+  - any-glob-to-any-file: 'content/en/**'
 
 lang/es:
-- content/es/**
+- changed-files:
+  - any-glob-to-any-file: 'content/es/**'
 
 lang/fr:
-- content/fr/**
+- changed-files:
+  - any-glob-to-any-file: 'content/fr/**'
 
 lang/hi:
-- content/hi/**
+- changed-files:
+  - any-glob-to-any-file: 'content/hi/**'
 
 lang/it:
-- content/it/**
+- changed-files:
+  - any-glob-to-any-file: 'content/it/**'
 
 lang/ja:
-- content/ja/**
+- changed-files:
+  - any-glob-to-any-file: 'content/ja/**'
 
 lang/ko:
-- content/ko/**
+- changed-files:
+  - any-glob-to-any-file: 'content/ko/**'
 
 lang/pt:
-- content/pt-br/**
+- changed-files:
+  - any-glob-to-any-file: 'content/pt-br/**'
 
-lang/tw:
-- content/zh-tw/**
+lang/ru:
+- changed-files:
+  - any-glob-to-any-file: 'content/ru/**'
 
-lang/zh:
-- content/zh-cn/**
+lang/tw:
+- changed-files:
+  - any-glob-to-any-file: 'content/zh-tw/**'
 
+lang/ur:
+- changed-files:
+  - any-glob-to-any-file: 'content/ur/**'
 
+lang/zh:
+- changed-files:
+  - any-glob-to-any-file: 'content/zh-cn/**'

.github/settings.yml

@@ -73,13 +73,19 @@ collaborators:
   - username: Garima-Negi
     permission: push
 
-  - username: sayantani11
+  - username: jayesh-srivastava
     permission: push
 
-  - username: anubha-v-ardhan
+  - username: abhay-raj19
     permission: push
 
-  - username: jayesh-srivastava
+  - username: aj11anuj
+    permission: push
+
+  - username: kumarankit999
+    permission: push
+
+  - username: bishal7679
     permission: push
 
   # l10n de approvers
@@ -204,6 +210,9 @@ collaborators:
   - username: naonishijima
     permission: push
 
+  - username: Okabe-Junya
+    permission: push
+
   - username: yuichi-nakamura
     permission: push
 
@@ -214,7 +223,7 @@ collaborators:
   - username: halil-bugol
     permission: push
 
-  - username: developer-guy
+  - username: rwxdash
     permission: push
 
   - username: eminalemdar
@@ -227,6 +236,9 @@ collaborators:
   - username: kirkonru
     permission: push
 
+  - username: tym83
+    permission: push
+
 branches:
 
   # Default branch of this repository for configurations and English contents
@@ -301,9 +313,11 @@ branches:
         # hi approvers
         users:
          - Garima-Negi
-         - sayantani11
-         - anubha-v-ardhan
          - jayesh-srivastava
+         - abhay-raj19
+         - aj11anuj
+         - kumarankit999
+         - bishal7679
         teams: []
       enforce_admins: null
       required_linear_history: null
@@ -492,6 +506,7 @@ branches:
          - inductor
          - kaitoii11
          - naonishijima
+         - Okabe-Junya
          - yuichi-nakamura
         teams: []
       enforce_admins: null
@@ -510,7 +525,7 @@ branches:
         users:
          - aliok
          - halil-bugol
-         - developer-guy
+         - rwxdash
          - eminalemdar
         teams: []
       enforce_admins: null
@@ -529,6 +544,7 @@ branches:
         users:
          - shurup
          - kirkonru
+         - tym83
         teams: []
       enforce_admins: null
       required_linear_history: null

.github/workflows/check-outdated-content.yaml

@@ -161,7 +161,7 @@ jobs:
         ls -al ${OUTPUT_DIR}
         
     - name: Upload output
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.L10N_CODE }}-outdated-checking-result
         path: ${{ env.OUTPUT_DIR }}/

.github/workflows/es-spellcheck.yml

@@ -29,6 +29,6 @@ jobs:
           set -o errexit
           diff content/es/.wordlist.txt <(LC_ALL= sort -f content/es/.wordlist.txt)
       - name: GitHub Spellcheck Action
-        uses: rojopolis/spellcheck-github-actions@0.33.1
+        uses: rojopolis/spellcheck-github-actions@0.36.0
         with:
           config_path: content/es/.spellcheck.yml

.github/workflows/labeler.yml

@@ -1,12 +1,7 @@
 name: "Pull Request Labeler"
 on:
   pull_request_target:
-    types: [opened]
-    paths:
-      - 'content/**.md'
-    branches:
-      - 'main'
-      - 'dev-**'      
+    types: [opened] 
 
 jobs:
   triage:
@@ -15,6 +10,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

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

@@ -50,7 +50,7 @@ jobs:
 #     - name: Download output
 #       uses: actions/download-artifact@v3
     - name: Download output
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v3
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: check-outdated-content.yaml
@@ -144,7 +144,7 @@ jobs:
         echo "The end of report" >> report.md
         
     - name: Create an issue from the report
-      uses: peter-evans/create-issue-from-file@v4
+      uses: peter-evans/create-issue-from-file@v5
       with:
         title: "[${{ env.L10N_CODE }}] A report to track and reflect updates of English content"
         content-filepath: report.md

.github/workflows/spellcheck.yml

@@ -25,4 +25,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: GitHub Spellcheck Action
-        uses: rojopolis/spellcheck-github-actions@0.33.1
+        uses: rojopolis/spellcheck-github-actions@0.36.0

.github/workflows/stale.yml

@@ -27,7 +27,7 @@ jobs:
     timeout-minutes: 1 # Default: 360 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8.0.0
+      - uses: actions/stale@v9.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: 'This issue/PR is stale because it has been inactive for 60 days. This issue/PR will be closed automatically with additional 20 days of inactivity. If an update/comment occur on stale issue/PR, the stale label will be removed and the timer will restart. Closed issue/PR can be reopened if necessary.'

.gitignore

@@ -4,6 +4,7 @@ resources/
 node_modules/
 .hugo_build.lock
 .DS_Store
+pagefind
 
 # Local Netlify folder
 .netlify

CODEOWNERS

@@ -39,16 +39,16 @@
 /i18n/fr.toml @huats @fydrah @Krast76 @sestegra @guillaumebernard84
 
 # Approvers for Hindi contents
-/content/hi/ @Garima-Negi @sayantani11 @anubha-v-ardhan @jayesh-srivastava
-/i18n/hi.toml @Garima-Negi @sayantani11 @anubha-v-ardhan @jayesh-srivastava
+/content/hi/ @Garima-Negi @jayesh-srivastava @abhay-raj19 @aj11anuj @kumarankit999 @bishal7679
+/i18n/hi.toml @Garima-Negi @jayesh-srivastava @abhay-raj19 @aj11anuj @kumarankit999 @bishal7679
 
 # Approvers for Italian contents
 /content/it/ @fsbaraglia @ugho16 @annalisag-spark @sistella
 /i18n/it.toml @fsbaraglia @ugho16 @annalisag-spark @sistella
 
 # Approvers for Japanese contents
-/content/ja/ @inductor @naonishijima @kaitoii11 @yuichi-nakamura
-/i18n/ja.toml @inductor @naonishijima @kaitoii11 @yuichi-nakamura
+/content/ja/ @inductor @naonishijima @kaitoii11 @yuichi-nakamura @Okabe-Junya
+/i18n/ja.toml @inductor @naonishijima @kaitoii11 @yuichi-nakamura @Okabe-Junya
 
 # Approvers for Korean contents
 /content/ko/ @seokho-son @jihoon-seo @yunkon-kim
@@ -59,12 +59,12 @@
 /i18n/pt-br.toml @edsoncelio @brunoguidone @jessicalins @MrErlison
 
 # Approvers for Russian contents
-/content/ru/ @shurup @kirkonru
-/i18n/ru.toml @shurup @kirkonru
+/content/ru/ @shurup @kirkonru @tym83
+/i18n/ru.toml @shurup @kirkonru @tym83
 
 # Approvers for Turkish contents
-/content/tr/ @aliok @halil-bugol @developer-guy @eminalemdar
-/i18n/tr.toml @aliok @halil-bugol @developer-guy @eminalemdar
+/content/tr/ @aliok @halil-bugol @rwxdash @eminalemdar
+/i18n/tr.toml @aliok @halil-bugol @rwxdash @eminalemdar
 
 # Approvers for Urdu contents
 /content/ur/ @Saim-Safdar @waleed318
@@ -75,5 +75,5 @@
 /i18n/zh-cn.toml @hanyuancheung @Jacob953 @Rocksnake @Submarinee
 
 # Approvers for Traditional Chinese contents
-/content/zh-tw/ @pichuang @ydFu @hwchiu @johnlinp
-/i18n/zh-tw.toml @pichuang @ydFu @hwchiu @johnlinp
+/content/zh-tw/ @tico88612 @ydFu @hwchiu @johnlinp
+/i18n/zh-tw.toml @tico88612 @ydFu @hwchiu @johnlinp

LOCALIZATION.md

@@ -57,26 +57,31 @@ Open a PR with the localization initiation following this example: https://githu
 
 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).
 
-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.
+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:
+
+ - The English language always stays first.
+ - Other languages are sorted based on the alphabetized English translation of their names (see how currently existing localizations are ordered as an example).
+ - Each localization is written in its own language followed by the English translation in parentheses — e.g., `한국어 (Korean)`.
+ - 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).
+
+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:
 
 - Example of `New language block for /config.toml`
   ```diff
   [languages]
-  [languages.en]
-  title = "Cloud Native Glossary"
-  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."
-  languageName ="English"
-  # Weight used for sorting.
-  weight = 1
+  ...
+  weight = 7
 
   +[languages.ko]
   +title = "클라우드 네이티브(Cloud Native) 용어집"
   +description = "CNCF 클라우드 네이티브 용어집 프로젝트는 클라우드 네이티브 애플리케이션에 대한 대화를 나눌 때 공통의 용어를 참조하여 사용하도록 하는 목적을 가지고 있다."
-  +languageName ="한국어(Korean)"
+  +languageName = "한국어 (Korean)"
   +contentDir = "content/ko"
-  +weight = 2
+  +weight = 8
   ```
 
+Since the `weight` values should always be kept consistent, please **remember to increment the weights** of all the languages following your newly added localization.
+
 #### 3-2. Adding a file for site strings
 
 `i18n/<localization>.toml` sets up language-specific site strings.

Makefile

@@ -0,0 +1,28 @@
+serve:
+	hugo server \
+		--disableFastRender \
+		--buildDrafts \
+		--buildFuture \
+		--ignoreCache
+		--printI18nWarnings \
+		--printMemoryUsage \
+		--printPathWarnings \
+		--printUnusedTemplates \
+		--templateMetrics \
+		--templateMetricsHints \
+		--gc
+
+production-build:
+	git submodule update --init --recursive
+	hugo \
+		--minify
+	npx -y pagefind --site public
+
+preview-build:
+	git submodule update --init --recursive
+	hugo \
+		--baseURL $(DEPLOY_PRIME_URL) \
+		--buildDrafts \
+		--buildFuture \
+		--minify
+	npx -y pagefind --site public

README.md

@@ -50,6 +50,6 @@ git submodule update --init --recursive
 npm install
 ```
 
-You can then run the site using `npm run serve` (select "[Hugo]").
+You can then run the site using `npm run serve` (select "[Hugo]"). To have the site run locally with a functioning local search, run `npm run serve:with-pagefind`.
 
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?repo=cncf/glossary)