Merge remote-tracking branch 'upstream/main' into dev-es

Author: krol3

.github/ISSUE_TEMPLATE/new-term.yml

@@ -38,7 +38,7 @@ body:
           required: true
         - label: I understand that maintainers will assess if the term should be part of the Glossary. (Please be patient)
           required: true
-        - label: I want to work on this term. (If not checked, maintainers will assign another volunteer)
+        - label: I want to work on this term and confirm that I meet the criteria as outlined in "[who can contribute](https://glossary.cncf.io/contribute/#who-can-contribute)". (If not checked, maintainers will assign another volunteer)
           required: false
   - type: textarea
     id: note

.github/ISSUE_TEMPLATE/update-term.yml

@@ -28,7 +28,7 @@ body:
       options:
         - label: I understand that maintainers will confirm if the term should be updated. (Please be patient)
           required: true
-        - label: I want to work on this suggestion. (If not checked, maintainers will assign another volunteer)
+        - label: I want to work on this suggestion and confirm that I meet the criteria as outlined in "[who can contribute](https://glossary.cncf.io/contribute/#who-can-contribute)".. (If not checked, maintainers will assign another volunteer)
           required: false
   - type: textarea
     id: note

.github/labeler.yml

@@ -16,18 +16,24 @@ lang/es:
 lang/fr:
 - content/fr/*
 
+lang/hi:
+- content/hi/*
+
 lang/it:
 - content/it/*
 
-lang/hi:
-- content/hi/*
+lang/ja:
+- content/ja/*
 
 lang/ko:
 - content/ko/*
 
 lang/pt:
 - content/pt-br/*
 
+lang/tw:
+- content/zh-tw/*
+
 lang/zh:
 - content/zh-cn/*
 

.github/settings.yml

@@ -31,24 +31,27 @@ collaborators:
     permission: admin
 
   - username: jihoon-seo
-    permission: maintain
+    permission: admin
 
   - username: iamNoah1
-    permission: maintain  
+    permission: admin
 
   - username: thetwopct
     permission: push
 
   # English approvers (approver for all files in repository)
 
-  
+  - username: nate-double-u
+    permission: admin
+
+  - username: castrojo
+    permission: push
 
   # Localization approvers
+  
   # l10n ko approvers
   # Note: seokho-son is both Maintainer (maintain) and Korean approver (push)
   # Note: jihoon-seo is both Maintainer (maintain) and Korean approver (push)
-  - username: Eviekim
-    permission: push
 
   - username: yunkon-kim
     permission: push
@@ -115,16 +118,16 @@ collaborators:
     permission: push
 
   # l10n bn approvers
-  - username: mitul3737
+  - username: Arindam200
     permission: push
 
-  - username: Mouly22
+  - username: Imtiaz1234
     permission: push
 
-  - username: ikramulkayes
+  - username: mitul3737
     permission: push
 
-  - username: Imtiaz1234
+  - username: sajibAdhi
     permission: push
 
   # l10n es approvers
@@ -143,7 +146,7 @@ collaborators:
   - username: 92nqb
     permission: push
 
-  # l10n zh approvers
+  # l10n zh-cn approvers
   - username: hanyuancheung
     permission: push
 
@@ -166,13 +169,45 @@ collaborators:
   - username: Krast76
     permission: push
 
+  - username: sestegra
+    permission: push
+
   # l10n ur approvers
   - username: Saim-Safdar
     permission: push
 
   - username: waleed318
     permission: push
 
+  # l10n zh-tw approvers
+  - username: pichuang
+    permission: push
+
+  - username: ydFu
+    permission: push
+
+  # l10n ja approvers
+  - username: inductor
+    permission: push
+
+  - username: kaitoii11
+    permission: push
+
+  - username: naonishijima
+    permission: push
+
+  # l10n tr approvers
+  - username: aliok
+    permission: push
+
+  - username: halil-bugol
+    permission: push
+
+  - username: developer-guy
+    permission: push
+
+  - username: eminalemdar
+    permission: push
 
 branches:
 
@@ -193,6 +228,8 @@ branches:
          - seokho-son
          - iamNoah1
          - jihoon-seo
+         - nate-double-u
+         - castrojo
         teams: []
       enforce_admins: null
       required_linear_history: null
@@ -209,7 +246,6 @@ branches:
         # Ko approvers
         users:
          - seokho-son
-         - Eviekim
          - jihoon-seo
          - yunkon-kim
         teams: []
@@ -321,10 +357,10 @@ branches:
         apps: []
         # bn approvers
         users:
-         - mitul3737
-         - Mouly22
-         - ikramulkayes
+         - Arindam200
          - Imtiaz1234
+         - mitul3737
+         - sajibAdhi
         teams: []
       enforce_admins: null
       required_linear_history: null
@@ -349,7 +385,7 @@ branches:
       enforce_admins: null
       required_linear_history: null
 
-  # l10n branch for zh contents only
+  # l10n branch for zh-cn contents only
   - name: dev-zh
     protection:
       required_pull_request_reviews:
@@ -358,7 +394,7 @@ branches:
       required_status_checks: null
       restrictions:
         apps: []
-        # zh approvers
+        # zh-cn approvers
         users:
          - hanyuancheung
          - Jacob953
@@ -402,3 +438,57 @@ branches:
         teams: []
       enforce_admins: null
       required_linear_history: null
+
+  # l10n branch for zh-tw contents only
+  - name: dev-tw
+    protection:
+      required_pull_request_reviews:
+        required_approving_review_count: 2
+        require_code_owner_reviews: true
+      required_status_checks: null
+      restrictions:
+        apps: []
+        # zh-tw approvers
+        users:
+         - pichuang
+         - ydFu
+        teams: []
+      enforce_admins: null
+      required_linear_history: null
+
+  # l10n branch for ja contents only
+  - name: dev-ja
+    protection:
+      required_pull_request_reviews:
+        required_approving_review_count: 2
+        require_code_owner_reviews: true
+      required_status_checks: null
+      restrictions:
+        apps: []
+        # ja approvers
+        users:
+         - inductor
+         - kaitoii11
+         - naonishijima
+        teams: []
+      enforce_admins: null
+      required_linear_history: null
+      
+  # l10n branch for tr contents only
+  - name: dev-tr
+    protection:
+      required_pull_request_reviews:
+        required_approving_review_count: 2
+        require_code_owner_reviews: true
+      required_status_checks: null
+      restrictions:
+        apps: []
+        # tr approvers
+        users:
+         - aliok
+         - halil-bugol
+         - developer-guy
+         - eminalemdar
+        teams: []
+      enforce_admins: null
+      required_linear_history: null

.github/workflows/check-outdated-terms.yaml renamed to .github/workflows/check-outdated-content.yaml

@@ -1,6 +1,6 @@
-# This workflow will check if localized terms are outdated or not
-# by comparing English terms in the old branch and the latest branch.
-name: Check outdated terms
+# This workflow will check if a localized content is outdated or not
+# by comparing English content in the old branch and the latest branch.
+name: Check outdated content
 on: 
   pull_request:
     branches:
@@ -9,8 +9,8 @@ on:
       - 'content/en/**.md'
 
 jobs:
-  check-outdated-terms:
-    name: Check outdated terms
+  check-outdated-content:
+    name: Check outdated content
 
     # if: contains(fromJSON('["dev-ko", "dev-xx"]'), github.base_ref) 
     # Ref: https://docs.github.com/en/actions/learn-github-actions/expressions
@@ -41,12 +41,12 @@ jobs:
         # Set L10n directory and code
         case "${L10N_BRANCH}" in
           dev-ko)          
-          L10N_DIR="./content/ko/"
+          L10N_DIR="content/ko/"
           L10N_CODE="ko"
           ;;
           
           #dev-pt)
-          #L10N_DIR="./content/pt-br/"
+          #L10N_DIR="content/pt-br/"
           #L10N_CODE="pt"
           #;;
         esac
@@ -95,16 +95,25 @@ jobs:
         # The old branch can be 'upstream/dev-ko'
         OLD_BRANCH="origin/${{github.base_ref}}"
         echo "(DUBUG) OLD_BRANCH: ${OLD_BRANCH}"
+
+        L10N_INFO_JSON=$(cat <<EOF
+        {
+          "L10N_DIR": "${L10N_DIR}",
+          "L10N_CODE": "${L10N_CODE}"
+        }
+        EOF
+        )
         
         # Make an output directory
         if [[ ! -e $OUTPUT_DIR ]]; then
             mkdir $OUTPUT_DIR
+            echo "${L10N_INFO_JSON}" > ${OUTPUT_DIR}/L10N_INFO.json
         elif [[ ! -d $OUTPUT_DIR ]]; then
             echo "$OUTPUT_DIR already exists but is not a directory" 1>&2
         fi
         
-        # Check outdated only if there is a localized term
-        # Loop files in a localization directory, which is ${L10N_DIR} (e.g., ./content/ko/)
+        # Check outdated only if a localized content exists
+        # Loop files in a localization directory, which is ${L10N_DIR} (e.g., content/ko/)
         echo "(DEBUG) Check outdated"
         for L10N_FILE_PATH in $(find ${L10N_DIR} -name '*.md'); do
             echo "(DEBUG) L10N_FILE_PATH: ${L10N_FILE_PATH}"      
@@ -123,7 +132,7 @@ jobs:
             # Create subdirectories
             mkdir -p ${OUTPUT_DIR}/${FILE_DIR}
             
-            # Actually compare between the old and lastest English terms and log diff in the file
+            # Actually compare between the old and lastest English content and log diff in the file
             if [[ -f "./content/en/${FILE_PATH}" ]]; then
               # File exists
               # Check changes

.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.30.0
+        uses: rojopolis/spellcheck-github-actions@0.33.0
         with:
           config_path: content/es/.spellcheck.yml