Merge pull request #36906 from github/repo-sync

docs-bot · web-flow · commit 7b084704e47f · 2025-03-17T11:37:58.000-07:00
Repo sync
diff --git a/.github/actions/clone-translations/action.yml b/.github/actions/clone-translations/action.yml
@@ -10,19 +10,19 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: Clone Simplified Chinese
+    - name: Clone Spanish
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
-        repository: github/docs-internal.zh-cn
+        repository: github/docs-internal.es-es
         token: ${{ inputs.token }}
-        path: translations/zh-cn
+        path: translations/es-es
 
-    - name: Clone Spanish
+    - name: Clone Japanese
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
-        repository: github/docs-internal.es-es
+        repository: github/docs-internal.ja-jp
         token: ${{ inputs.token }}
-        path: translations/es-es
+        path: translations/ja-jp
 
     - name: Clone Portuguese
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -31,19 +31,19 @@ runs:
         token: ${{ inputs.token }}
         path: translations/pt-br
 
-    - name: Clone Russian
+    - name: Clone Simplified Chinese
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
-        repository: github/docs-internal.ru-ru
+        repository: github/docs-internal.zh-cn
         token: ${{ inputs.token }}
-        path: translations/ru-ru
+        path: translations/zh-cn
 
-    - name: Clone Japanese
+    - name: Clone Russian
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
-        repository: github/docs-internal.ja-jp
+        repository: github/docs-internal.ru-ru
         token: ${{ inputs.token }}
-        path: translations/ja-jp
+        path: translations/ru-ru
 
     - name: Clone French
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -52,16 +52,16 @@ runs:
         token: ${{ inputs.token }}
         path: translations/fr-fr
 
-    - name: Clone German
+    - name: Clone Korean
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
-        repository: github/docs-internal.de-de
+        repository: github/docs-internal.ko-kr
         token: ${{ inputs.token }}
-        path: translations/de-de
+        path: translations/ko-kr
 
-    - name: Clone Korean
+    - name: Clone German
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
-        repository: github/docs-internal.ko-kr
+        repository: github/docs-internal.de-de
         token: ${{ inputs.token }}
-        path: translations/ko-kr
+        path: translations/de-de
diff --git a/.github/workflows/index-general-search.yml b/.github/workflows/index-general-search.yml
@@ -13,7 +13,7 @@ on:
         required: false
         default: ''
       languages:
-        description: "Comma separated languages. E.g. 'en,zh,es,pt,ru,ja,fr,de,ko' (defaults to all)"
+        description: "Comma separated languages. E.g. 'en,es,ja,pt,zh,ru,fr,ko,de' (defaults to all)"
         required: false
         default: ''
   schedule:
@@ -51,7 +51,7 @@ jobs:
           script: |
             // Edit this list for the definitive list of languages
             // (other than English) we want to index in Elasticsearch.
-            const allNonEnglish = ["zh", "es", "pt", "ru", "ja", "fr", "de", "ko"]
+            const allNonEnglish = 'es,ja,pt,zh,ru,fr,ko,de'.split(',')
             const allPossible = ["en", ...allNonEnglish]
 
             if (context.eventName === "workflow_run") {
diff --git a/.github/workflows/purge-fastly.yml b/.github/workflows/purge-fastly.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
     inputs:
       languages:
-        description: "Comma separated languages. E.g. 'en,zh,es,pt,ru,ja,fr,de,ko' (defaults to en)"
+        description: "Comma separated languages. E.g. 'en,es,ja,pt,zh,ru,fr,ko,de' (defaults to en)"
         required: false
         default: 'en' # Temporary, only purge English on deploy. Set to empty string for all
 
diff --git a/config/moda/configuration/default/env.yaml b/config/moda/configuration/default/env.yaml
@@ -3,7 +3,7 @@ data:
   NODE_ENV: production
   NODE_OPTIONS: '--max-old-space-size=4096'
   PORT: '4000'
-  ENABLED_LANGUAGES: 'en,zh,es,pt,ru,ja,fr,de,ko'
+  ENABLED_LANGUAGES: 'en,es,ja,pt,zh,ru,fr,ko,de'
   RATE_LIMIT_MAX: '21'
   # Moda uses a non-default port for sending datadog metrics
   DD_DOGSTATSD_PORT: '28125'
diff --git a/config/moda/configuration/production/env.yaml b/config/moda/configuration/production/env.yaml
@@ -3,7 +3,7 @@ data:
   NODE_ENV: production
   NODE_OPTIONS: '--max-old-space-size=4096'
   PORT: '4000'
-  ENABLED_LANGUAGES: 'en,zh,es,pt,ru,ja,fr,de,ko'
+  ENABLED_LANGUAGES: 'en,es,ja,pt,zh,ru,fr,ko,de'
   RATE_LIMIT_MAX: '21'
   # Moda uses a non-default port for sending datadog metrics
   DD_DOGSTATSD_PORT: '28125'
diff --git a/content/get-started/using-github/github-mobile.md b/content/get-started/using-github/github-mobile.md
@@ -79,12 +79,12 @@ Alternatively, once logged into one account, access the account switcher to log
 {% data variables.product.prodname_mobile %} is available in the following languages.
 
 * English
+* Spanish
 * Japanese
 * Brazilian Portuguese
 * Simplified Chinese
-* Spanish
-* German
 * Korean
+* German
 
 If you configure the language on your device to a supported language, {% data variables.product.prodname_mobile %} will default to the language. You can change the language for {% data variables.product.prodname_mobile %} in {% data variables.product.prodname_mobile %}'s **Settings** menu.
 
diff --git a/content/support/contacting-github-support/viewing-and-updating-support-tickets.md b/content/support/contacting-github-support/viewing-and-updating-support-tickets.md
@@ -27,7 +27,7 @@ Your capabilities in the {% data variables.contact.landing_page_portal %} depend
 
 {% data reusables.support.view-open-tickets %}
 1. Under the text box, you can read the comment history. The most recent response is at the top.
-1. Optionally, to translate the ticket comment, click {% octicon "globe" aria-label="The globe icon" %} and choose your preferred language from the dropdown menu. You can translate your support ticket into Chinese (Simplified), French, German, Japanese, Portuguese (Brazil), or Spanish.
+1. Optionally, to translate the ticket comment, click {% octicon "globe" aria-label="The globe icon" %} and choose your preferred language from the dropdown menu. You can translate your support ticket into Spanish, Japanese, Portuguese (Brazil), Chinese (Simplified), French, or German.
 
    ![Screenshot of a support ticket with the dropdown menu showing the options for translation highlighted with a dark orange outline.](/assets/images/help/support/support-ticket-translation-options.png)
 
diff --git a/data/reusables/support/support-ticket-translation-option.md b/data/reusables/support/support-ticket-translation-option.md
@@ -1 +1 @@
-You can translate English comments on a ticket into Chinese (Simplified), French, German, Japanese, Portuguese (Brazil), or Spanish. However, when responding to tickets, you should use English, unless your {% data variables.product.prodname_dotcom %} plan permits you to respond in Japanese. For more information, see [AUTOTITLE](/support/contacting-github-support/viewing-and-updating-support-tickets).
+You can translate English comments on a ticket into Spanish, Japanese, Portuguese (Brazil), Chinese (Simplified), French, or German. However, when responding to tickets, you should use English, unless your {% data variables.product.prodname_dotcom %} plan permits you to respond in Japanese. For more information, see [AUTOTITLE](/support/contacting-github-support/viewing-and-updating-support-tickets).
diff --git a/src/deployments/production/build-scripts/fetch-repos.sh b/src/deployments/production/build-scripts/fetch-repos.sh
@@ -35,7 +35,7 @@ cd translations
 
 # Iterate over each language
 echo "Fetching translations..."
-for lang in "zh-cn" "es-es" "pt-br" "ru-ru" "ja-jp" "fr-fr" "de-de" "ko-kr"
+for lang in  "es-es" "ja-jp" "pt-br" "zh-cn" "ru-ru" "fr-fr" "ko-kr" "de-de"
 do
   translations_repo="docs-internal.$lang"
   clone_or_use_cached_repo "$lang" "$translations_repo" "main"
@@ -49,4 +49,4 @@ cd ..
 # Cleanup
 # - - - - - - - - - -
 # Delete GITHUB_TOKEN from the environment
-unset GITHUB_TOKEN
+unset GITHUB_TOKEN
diff --git a/src/ghes-releases/lib/deprecation-steps.md b/src/ghes-releases/lib/deprecation-steps.md
@@ -175,25 +175,25 @@ This step will remove the version from the drop-down picker, effectively depreca
 
 You can clone the translation repositories directly inside of your docs-internal checkout, but I'd recommend cloning them in a separate directory. For example, create a `translations` directory at the same level as your `docs-internal` directory. Inside of the `translations` directory, clone the following repoisitories (ensure this list includes all languages that we are supporting):
 
-- [docs-internal.de-de](https://github.com/github/docs-internal.de-de)
-- [docs-internal.fr-fr](https://github.com/github/docs-internal.fr-fr)
-- [docs-internal.ko-kr](https://github.com/github/docs-internal.ko-kr)
-- [docs-internal.ru-ru](https://github.com/github/docs-internal.ru-ru)
 - [docs-internal.es-es](https://github.com/github/docs-internal.es-es)
 - [docs-internal.ja-jp](https://github.com/github/docs-internal.ja-jp)
 - [docs-internal.pt-br](https://github.com/github/docs-internal.pt-br)
 - [docs-internal.zh-cn](https://github.com/github/docs-internal.zh-cn)
+- [docs-internal.ru-ru](https://github.com/github/docs-internal.ru-ru)
+- [docs-internal.fr-fr](https://github.com/github/docs-internal.fr-fr)
+- [docs-internal.ko-kr](https://github.com/github/docs-internal.ko-kr)
+- [docs-internal.de-de](https://github.com/github/docs-internal.de-de)
 
 To map the location of each translation repository, edit your `.env` file with the mapping. For example, if following the locations suggested above, your `.env` file might look like this:
 
 ```shell
 TRANSLATIONS=/Users/mona/repos/github-repos/translations
 TRANSLATIONS_ROOT_ES_ES=${TRANSLATIONS}/docs-internal.es-es
-TRANSLATIONS_ROOT_ZH_CN=${TRANSLATIONS}/docs-internal.zh-cn
 TRANSLATIONS_ROOT_JA_JP=${TRANSLATIONS}/docs-internal.ja-jp
 TRANSLATIONS_ROOT_PT_BR=${TRANSLATIONS}/docs-internal.pt-br
-TRANSLATIONS_ROOT_FR_FR=${TRANSLATIONS}/docs-internal.fr-fr
+TRANSLATIONS_ROOT_ZH_CN=${TRANSLATIONS}/docs-internal.zh-cn
 TRANSLATIONS_ROOT_RU_RU=${TRANSLATIONS}/docs-internal.ru-ru
+TRANSLATIONS_ROOT_FR_FR=${TRANSLATIONS}/docs-internal.fr-fr
 TRANSLATIONS_ROOT_KO_KR=${TRANSLATIONS}/docs-internal.ko-kr
 TRANSLATIONS_ROOT_DE_DE=${TRANSLATIONS}/docs-internal.de-de
 ```
diff --git a/src/languages/README.md b/src/languages/README.md
@@ -1,6 +1,6 @@
 # Languages
 
-Languages refers to the different translations we support on docs.github.com. Currently, our supported languages include Chinese, Spanish, Portuguese, Russian, Japanese, French, German, and Korean.
+Languages refers to the different translations we support on docs.github.com. Currently, our supported languages include Spanish, Japanese, Portuguese, Chinese, Russian, French, Korean, and German.
 
 ## TLDR: How translations work
 
@@ -106,14 +106,14 @@ This section assumes you want your local environment to replicate the structure
     cd docs-internal
     mkdir translations && cd translations
 
-    git clone <zh-cn-repo-url> zh-cn
-    git clone <ja-jp-repo-url> ja-jp
     git clone <es-es-repo-url> es-es
+    git clone <ja-jp-repo-url> ja-jp
     git clone <pt-br-repo-url> pt-br
-    git clone <de-de-repo-url> de-de
-    git clone <fr-fr-repo-url> fr-fr
+    git clone <zh-cn-repo-url> zh-cn
     git clone <ru-ru-repo-url> ru-ru
+    git clone <fr-fr-repo-url> fr-fr
     git clone <ko-kr-repo-url> ko-kr
+    git clone <de-de-repo-url> de-de
     ```
 1. Start the development server with `npm run start-all-languages`. If you need to enable specific languages, you can set `ENABLED_LANGUAGES`. For example, to start the server with English, Japanese, and Spanish only, use: `ENABLED_LANGUAGES=en,ja,es NODE_ENV=development nodemon server.js`
 
diff --git a/src/languages/lib/languages.js b/src/languages/lib/languages.js
@@ -11,14 +11,14 @@ import { ROOT, TRANSLATIONS_ROOT, TRANSLATIONS_FIXTURE_ROOT } from '#src/frame/l
 dotenv.config()
 
 const possibleEnvVars = {
-  'zh-cn': process.env.TRANSLATIONS_ROOT_ZH_CN,
   'es-es': process.env.TRANSLATIONS_ROOT_ES_ES,
+  'ja-jp': process.env.TRANSLATIONS_ROOT_JA_JP,
   'pt-br': process.env.TRANSLATIONS_ROOT_PT_BR,
+  'zh-cn': process.env.TRANSLATIONS_ROOT_ZH_CN,
   'ru-ru': process.env.TRANSLATIONS_ROOT_RU_RU,
-  'ja-jp': process.env.TRANSLATIONS_ROOT_JA_JP,
   'fr-fr': process.env.TRANSLATIONS_ROOT_FR_FR,
-  'de-de': process.env.TRANSLATIONS_ROOT_DE_DE,
   'ko-kr': process.env.TRANSLATIONS_ROOT_KO_KR,
+  'de-de': process.env.TRANSLATIONS_ROOT_DE_DE,
 }
 
 function getRoot(languageCode) {
@@ -51,21 +51,21 @@ const allLanguages = {
     hreflang: 'en',
     dir: getRoot('en'),
   },
-  zh: {
-    name: 'Simplified Chinese',
-    nativeName: '简体中文',
-    code: 'zh',
-    hreflang: 'zh-Hans',
-    redirectPatterns: [/^\/cn/, /^\/zh-\w{2}/],
-    dir: getRoot('zh-cn'),
-  },
   es: {
     name: 'Spanish',
     nativeName: 'Español',
     code: 'es',
     hreflang: 'es',
     dir: getRoot('es-es'),
   },
+  ja: {
+    name: 'Japanese',
+    nativeName: '日本語',
+    code: 'ja',
+    hreflang: 'ja',
+    redirectPatterns: [/^\/jp/],
+    dir: getRoot('ja-jp'),
+  },
   pt: {
     name: 'Portuguese',
     nativeName: 'Português do Brasil',
@@ -74,35 +74,28 @@ const allLanguages = {
     redirectPatterns: [/^\/br/],
     dir: getRoot('pt-br'),
   },
+  zh: {
+    name: 'Simplified Chinese',
+    nativeName: '简体中文',
+    code: 'zh',
+    hreflang: 'zh-Hans',
+    redirectPatterns: [/^\/cn/, /^\/zh-\w{2}/],
+    dir: getRoot('zh-cn'),
+  },
   ru: {
     name: 'Russian',
     nativeName: 'Русский',
     code: 'ru',
     hreflang: 'ru',
     dir: getRoot('ru-ru'),
   },
-  ja: {
-    name: 'Japanese',
-    nativeName: '日本語',
-    code: 'ja',
-    hreflang: 'ja',
-    redirectPatterns: [/^\/jp/],
-    dir: getRoot('ja-jp'),
-  },
   fr: {
     name: 'French',
     nativeName: 'Français',
     code: 'fr',
     hreflang: 'fr',
     dir: getRoot('fr-fr'),
   },
-  de: {
-    name: 'German',
-    nativeName: 'Deutsch',
-    code: 'de',
-    hreflang: 'de',
-    dir: getRoot('de-de'),
-  },
   ko: {
     name: 'Korean',
     nativeName: '한국어',
@@ -111,6 +104,13 @@ const allLanguages = {
     redirectPatterns: [/^\/kr/],
     dir: getRoot('ko-kr'),
   },
+  de: {
+    name: 'German',
+    nativeName: 'Deutsch',
+    code: 'de',
+    hreflang: 'de',
+    dir: getRoot('de-de'),
+  },
 }
 // Some markdownlint tests depend on having access to all
 // language keys. Not modifying the original object makes
diff --git a/src/languages/scripts/clone-translations.sh b/src/languages/scripts/clone-translations.sh
@@ -3,7 +3,7 @@
 rm -rf translations
 mkdir translations
 
-for lang in "zh-cn" "es-es" "pt-br" "ru-ru" "ja-jp" "fr-fr" "de-de" "ko-kr"
+for lang in "es-es" "ja-jp" "pt-br" "zh-cn" "ru-ru" "fr-fr" "ko-kr" "de-de"
 do
   (cd translations && git clone --depth 1 "https://github.com/github/docs-internal.$lang.git" $lang)
 done
diff --git a/src/languages/scripts/update-translation-repos.sh b/src/languages/scripts/update-translation-repos.sh
diff --git a/src/languages/tests/redirects.js b/src/languages/tests/redirects.js
diff --git a/src/search/README.md b/src/search/README.md

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-You can translate English comments on a ticket into Chinese (Simplified), French, German, Japanese, Portuguese (Brazil), or Spanish. However, when responding to tickets, you should use English, unless your {% data variables.product.prodname_dotcom %} plan permits you to respond in Japanese. For more information, see [AUTOTITLE](/support/contacting-github-support/viewing-and-updating-support-tickets).`
	`1`	`+You can translate English comments on a ticket into Spanish, Japanese, Portuguese (Brazil), Chinese (Simplified), French, or German. However, when responding to tickets, you should use English, unless your {% data variables.product.prodname_dotcom %} plan permits you to respond in Japanese. For more information, see [AUTOTITLE](/support/contacting-github-support/viewing-and-updating-support-tickets).`