From 5f7243c3ffa355221f86077411c140ae49c1258c Mon Sep 17 00:00:00 2001 From: Zeke Sikelianos Date: Fri, 16 Oct 2020 12:16:56 -0700 Subject: [PATCH 1/3] improve script for resetting translated files (#16099) * improve script for resetting translated files * update script/README.md Co-authored-by: Chiedo John <2156688+chiedo@users.noreply.github.com> --- script/README.md | 44 ++++++++++++++++++++++++--------- script/reset-translated-file.js | 37 +++++++++++++++++++++------ 2 files changed, 61 insertions(+), 20 deletions(-) diff --git a/script/README.md b/script/README.md index c2ee1b32fa0c..a9d3e7c624d1 100644 --- a/script/README.md +++ b/script/README.md @@ -30,6 +30,15 @@ Runs tests. Equivalent of `npm test`. ## Additional scripts +### [`anonymize-branch.js`](anonymize-branch.js) + +Flatten all the commits in the current branch into a single anonymized @Octomerger commit + +Usage: script/anonymize-branch.js [base-branch] Example: script/anonymize-branch.js "nothing to see here" If the optional [base-branch] argument is omitted, it will default to `main` + +--- + + ### [`archive-enterprise-version.js`](archive-enterprise-version.js) Run this script during the Enterprise deprecation process to download static copies of all pages for the oldest supported Enterprise version. See the Enterprise deprecation issue template for instructions. @@ -270,6 +279,19 @@ Usage $ script/new-versioning/main --- +### [`new-versioning/update-not-fpt-conditionals.js`](new-versioning/update-not-fpt-conditionals.js) + +Run this script to update these Liquid conditionals: + +{% if currentVersion != 'free-pro-team@latest' %} + +to: + +{% if enterpriseServerVersions contains currentVersion %} + +--- + + ### [`new-versioning/update-products-yml.js`](new-versioning/update-products-yml.js) @@ -307,15 +329,7 @@ This script is run as a git precommit hook (installed by husky after npm install ### [`preview-openapi-changes`](preview-openapi-changes) -This script stitches and unstitches the `github/github` OpenAPI description via `rest-api-operations` to produce a local preview in docs-internal. - -`github`, `rest-api-operations`, and `docs-internal` must share a parent directory locally. - -You must bootstrap `github` for this script to work. To check if you need to bootstrap, check if the `bin` directory in `github` exists locally. If it does not exist, run `./script/bootstrap` from the `github` directory. -To stitch the repos together and do an npm build, pass the `stitch` argument. - -To unstitch the repos and revert them to their pre-stitched state, pass the `unstitch` argument. --- @@ -379,13 +393,19 @@ Run this script to remove reusables and image files that exist in the repo but a This is a convenience script for replacing the contents of translated files with the English content from their corresponding source file. -It's intended to be a workaround to temporarily bypass Crowdin parser bugs while we wait for Crowdin to fix them. +It's intended to be a workaround to temporarily bypass Crowdin parser bugs while we wait for translators to fix them. + +Usage: script/reset-translated-file.js + +Examples: + +reset a single translated file using a relative path: $ script/reset-translated-file.js translations/es-XL/content/actions/index.md -Usage: script/reset-translated-File.js [] +reset a single translated file using a full path: $ script/reset-translated-file.js /Users/z/git/github/docs-internal/translations/es-XL/content/actions/index.md -script/reset-translated-File.js content/desktop/foo.md -> resets all translations of foo.md +reset all language variants of a single English file (using a relative path): $ script/reset-translated-file.js content/actions/index.md $ script/reset-translated-file.js data/ui.yml -script/reset-translated-File.js content/desktop/foo.md de -> resets german translation of foo.md +reset all language variants of a single English file (using a full path): $ script/reset-translated-file.js /Users/z/git/github/docs-internal/content/desktop/index.md $ script/reset-translated-file.js /Users/z/git/github/docs-internal/data/ui.yml --- diff --git a/script/reset-translated-file.js b/script/reset-translated-file.js index 588d2bd531e7..9f6c689e413c 100755 --- a/script/reset-translated-file.js +++ b/script/reset-translated-file.js @@ -6,17 +6,26 @@ // files with the English content from their corresponding source file. // // It's intended to be a workaround to temporarily bypass Crowdin parser bugs -// while we wait for Crowdin to fix them. +// while we wait for translators to fix them. // // Usage: -// script/reset-translated-File.js [] +// script/reset-translated-file.js // -// script/reset-translated-File.js content/desktop/foo.md -// -> resets all translations of foo.md +// Examples: // -// script/reset-translated-File.js content/desktop/foo.md de -// -> resets german translation of foo.md +// reset a single translated file using a relative path: +// $ script/reset-translated-file.js translations/es-XL/content/actions/index.md // +// reset a single translated file using a full path: +// $ script/reset-translated-file.js /Users/z/git/github/docs-internal/translations/es-XL/content/actions/index.md +// +// reset all language variants of a single English file (using a relative path): +// $ script/reset-translated-file.js content/actions/index.md +// $ script/reset-translated-file.js data/ui.yml +// +// reset all language variants of a single English file (using a full path): +// $ script/reset-translated-file.js /Users/z/git/github/docs-internal/content/desktop/index.md +// $ script/reset-translated-file.js /Users/z/git/github/docs-internal/data/ui.yml // // [end-readme] @@ -25,8 +34,20 @@ const fs = require('fs') const path = require('path') const languages = require('../lib/languages') -const [relativePath, languageCode] = process.argv.slice(2) -assert(relativePath, 'first arg must be a target filename') +const [pathArg] = process.argv.slice(2) +assert(pathArg, 'first arg must be a target filename') +let languageCode + +// Is the arg a fully-qualified path? +let relativePath = fs.existsSync(pathArg) + ? path.relative(process.cwd(), pathArg) + : pathArg + +// extract relative path and language code if pathArg is in the format `translations//path/to/file` +if (relativePath.startsWith('translations/')) { + languageCode = Object.values(languages).find(language => relativePath.startsWith(language.dir) && language.code !== 'en').code + relativePath = relativePath.split(path.sep).slice(2).join(path.sep) +} const englishFile = path.join(process.cwd(), relativePath) assert(fs.existsSync(englishFile), `file does not exist: ${englishFile}`) From e35c50670217542ee70bad726390c174ec763ed4 Mon Sep 17 00:00:00 2001 From: Zeke Sikelianos Date: Fri, 16 Oct 2020 12:27:14 -0700 Subject: [PATCH 2/3] Update Crowdin Actions workflow to inherit old OAuth settings (#16096) * update Actions workflow to use crowdin.yml for config * no need for this comment; CODEOWNERS will now trigger a ping * add a comment about why we need a custom PAT * update Crowdin branch names Co-authored-by: Chiedo John <2156688+chiedo@users.noreply.github.com> --- .github/workflows/crowdin.yml | 10 +++++----- crowdin-actions-config.yml | 25 ------------------------- crowdin.yml | 7 +++++++ 3 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 crowdin-actions-config.yml diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index af350664b039..e3e4cf807c59 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -1,5 +1,3 @@ -# Please ping @github/docs-localization in the PR whenever you update this file! - name: Crowdin Sync on: @@ -25,18 +23,20 @@ jobs: # Using a custom config temporarily to avoid clobbering the existing crowdin.yml # that is used by the github-help-docs OAuth integration. - config: 'crowdin-actions-config.yml' + config: 'crowdin.yml' # This is the name of the git branch that Crowdin will create when opening a pull request. # This branch does NOT need to be manually created. It will be created automatically by the action. - localization_branch_name: automated-crowdin-translations + localization_branch_name: translations # This is the name of the top-level directory that Crowdin will use for files. # Note that this is not a "branch" in the git sense, but more like a top-level directory in your Crowdin project. # This branch does NOT need to be manually created. It will be created automatically by the action. - crowdin_branch_name: crowdin-main + crowdin_branch_name: main env: + # Using an @octoglot token instead of the default Actions-provided GITHUB_TOKEN here + # so that subsequent workflows will be able to run on the pull request created by this workflow. GITHUB_TOKEN: ${{ secrets.OCTOGLOT_PAT_WITH_REPO_AND_WORKFLOW_SCOPE }} # This is a numeric id, not to be confused with Crowdin API v1 "project identifier" string diff --git a/crowdin-actions-config.yml b/crowdin-actions-config.yml deleted file mode 100644 index ef80b4ec26fe..000000000000 --- a/crowdin-actions-config.yml +++ /dev/null @@ -1,25 +0,0 @@ -files: - - source: /content/**/*.md - translation: /translations/%locale%/%original_path%/%original_file_name% - ignore: [ - "/content/README.md" - ] - - source: /data/**/*.yml - translation: /translations/%locale%/%original_path%/%original_file_name% - - source: /data/**/*.md - translation: /translations/%locale%/%original_path%/%original_file_name% - ignore: [ - "data/README.md", - "data/reusables/README.md", - "data/variables/product.yml", - "data/variables/README.md", - "data/graphql", - "data/products.yml" - ] - -# These end up as env vars used by the GitHub Actions workflow -project_id_env: CROWDIN_PROJECT_ID -api_token_env: CROWDIN_PERSONAL_TOKEN - -# https://support.crowdin.com/configuration-file-v3/#saving-directory-structure-on-server -preserve_hierarchy: true \ No newline at end of file diff --git a/crowdin.yml b/crowdin.yml index 600d1d1824d7..ef80b4ec26fe 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -16,3 +16,10 @@ files: "data/graphql", "data/products.yml" ] + +# These end up as env vars used by the GitHub Actions workflow +project_id_env: CROWDIN_PROJECT_ID +api_token_env: CROWDIN_PERSONAL_TOKEN + +# https://support.crowdin.com/configuration-file-v3/#saving-directory-structure-on-server +preserve_hierarchy: true \ No newline at end of file From 4e0a9094fd836e6e64681e880cc7ccacd6938947 Mon Sep 17 00:00:00 2001 From: Zeke Sikelianos Date: Fri, 16 Oct 2020 12:50:55 -0700 Subject: [PATCH 3/3] use explicit year in table heading (#16097) * use explicit date in table heading * Update content/admin/enterprise-support/about-github-enterprise-support.md Co-authored-by: Sarah Schneider * Update translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md Co-authored-by: Sarah Schneider * Update translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md Co-authored-by: Sarah Schneider * Update translations/zh-CN/content/admin/enterprise-support/about-github-enterprise-support.md Co-authored-by: Sarah Schneider * Update translations/ru-RU/content/admin/enterprise-support/about-github-enterprise-support.md Co-authored-by: Sarah Schneider * Update translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md Co-authored-by: Sarah Schneider * Update translations/es-XL/content/admin/enterprise-support/about-github-enterprise-support.md Co-authored-by: Sarah Schneider Co-authored-by: Sarah Schneider Co-authored-by: Chiedo John <2156688+chiedo@users.noreply.github.com> --- .../about-github-enterprise-support.md | 2 +- .../about-github-enterprise-support.md | 30 +++++++++---------- .../about-github-enterprise-support.md | 30 +++++++++---------- .../about-github-enterprise-support.md | 30 +++++++++---------- .../about-github-enterprise-support.md | 30 +++++++++---------- .../about-github-enterprise-support.md | 30 +++++++++---------- .../about-github-enterprise-support.md | 30 +++++++++---------- .../about-github-enterprise-support.md | 30 +++++++++---------- 8 files changed, 106 insertions(+), 106 deletions(-) diff --git a/content/admin/enterprise-support/about-github-enterprise-support.md b/content/admin/enterprise-support/about-github-enterprise-support.md index 2c5bb9e0dba6..03244ed720a0 100644 --- a/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,7 +59,7 @@ For urgent issues, we can help you in English 24 hours per day, 7 days per week, {% data variables.contact.enterprise_support %} observes these U.S. holidays, although our global support team is available to answer urgent tickets. -| U.S. holiday | Date observed in {{ "now" | date: "%Y" }} | +| U.S. holiday | Date observed | | --- | --- | | New Year's Day | January 1 | | Martin Luther King, Jr. Day | Third Monday in January | diff --git a/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md index 81266f687ceb..1078991877e8 100644 --- a/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/de-DE/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,21 +59,21 @@ For urgent issues, we can help you in English 24 hours per day, 7 days per week, {% data variables.contact.enterprise_support %} beobachtet diese Feiertage in den USA. dessen ungeachtet steht unser Support-Team zur Verfügung, um dringende Tickets zu beantworten. -| U.S. Weihnachtsfeiertag | Beobachtetes Datum | Datum in {{ "now:%Y" }} | -| ----------------------- | ------------------------------ | ----------------------- | -| Neujahr | 1. Januar | | -| Martin Luther King Day | Dritter Montag im Januar | | -| Presidents' Day | Dritter Montag im Februar | | -| Memorial Day | Letzter Montag im Mai | | -| Independence Day | 4. Juli | | -| Labor Day | Erster Montag im September | | -| Veterans Day | 12. November | | -| Thanksgiving | Vierter Donnerstag im November | | -| Tag nach Thanksgiving | Vierter Freitag im November | | -| Heiligabend | 24. Dezember | | -| 1. Weihnachtsfeiertag | 25. Dezember | | -| 2. Weihnachtsfeiertag | 26. Dezember | | -| Silvester | 31. Dezember | | +| U.S. Weihnachtsfeiertag | Beobachtetes Datum | +| ----------------------- | ------------------------------ | +| Neujahr | 1. Januar | +| Martin Luther King Day | Dritter Montag im Januar | +| Presidents' Day | Dritter Montag im Februar | +| Memorial Day | Letzter Montag im Mai | +| Independence Day | 4. Juli | +| Labor Day | Erster Montag im September | +| Veterans Day | 12. November | +| Thanksgiving | Vierter Donnerstag im November | +| Tag nach Thanksgiving | Vierter Freitag im November | +| Heiligabend | 24. Dezember | +| 1. Weihnachtsfeiertag | 25. Dezember | +| 2. Weihnachtsfeiertag | 26. Dezember | +| Silvester | 31. Dezember | #### Feiertage in Japan diff --git a/translations/es-XL/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/es-XL/content/admin/enterprise-support/about-github-enterprise-support.md index 0de495205680..1893455672ff 100644 --- a/translations/es-XL/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/es-XL/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,21 +59,21 @@ For urgent issues, we can help you in English 24 hours per day, 7 days per week, {% data variables.contact.enterprise_support %} observa estos días festivos en Estados Unidos. {% data variables.contact.enterprise_support %} respeta estos días feriados en los EE.UU, aunque nuestro equipo de soporte global se encuentra disponible para atender tickets urgentes. -| U.S. holiday | Festejado en {{ "now" | date: "%Y" }} | -| --------------------------------- | --------------------------- | ------------- | -| Año Nuevo | 1 de enero | | -| Día de Martin Luther King, Jr. | Tercer lunes de enero | | -| Día de los Presidentes | Tercer lunes de febrero | | -| Día de los Caídos | Último lunes de mayo | | -| Día de la Independencia | 4 de julio | | -| Día del Trabajo | Primer lunes de septiembre | | -| Día de los Veteranos | 12 de noviembre | | -| Día de Acción de Gracias | Cuarto jueves de noviembre | | -| Día posterior a Acción de Gracias | Cuarto viernes de noviembre | | -| Nochebuena | 24 de diciembre | | -| Día de Navidad | 25 de diciembre | | -| Día posterior a Navidad | 26 de diciembre | | -| Víspera de Año Nuevo | 31 de diciembre | | +| U.S. holiday | Festejado | +| --------------------------------- | --------------------------- | +| Año Nuevo | 1 de enero | +| Día de Martin Luther King, Jr. | Tercer lunes de enero | +| Día de los Presidentes | Tercer lunes de febrero | +| Día de los Caídos | Último lunes de mayo | +| Día de la Independencia | 4 de julio | +| Día del Trabajo | Primer lunes de septiembre | +| Día de los Veteranos | 12 de noviembre | +| Día de Acción de Gracias | Cuarto jueves de noviembre | +| Día posterior a Acción de Gracias | Cuarto viernes de noviembre | +| Nochebuena | 24 de diciembre | +| Día de Navidad | 25 de diciembre | +| Día posterior a Navidad | 26 de diciembre | +| Víspera de Año Nuevo | 31 de diciembre | #### Feriados en Japón diff --git a/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md index 7c804a9d7b1b..659dbb5bbf41 100644 --- a/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/ja-JP/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,21 +59,21 @@ versions: {% data variables.contact.enterprise_support %} は、以下の米国の祝日を休日としています。 ただし、緊急サポートチケットにはグローバルサポートチームが対応しています。 -| アメリカ合衆国の祝日 祝日 | Date observed in {{ "now" | 日付: "%Y" }} | -| --------------------------- | --------------------------- | ----------- | -| New Year's Day | January 1 | | -| Martin Luther King, Jr. Day | Third Monday in January | | -| Presidents' Day | Third Monday in February | | -| Memorial Day | Last Monday in May | | -| Independence Day | July 4 | | -| Labor Day | First Monday in September | | -| Veterans Day | November 12 | | -| Thanksgiving Day | Fourth Thursday in November | | -| Day after Thanksgiving | Fourth Friday in November | | -| Christmas Eve | December 24 | | -| Christmas Day | December 25 | | -| Day after Christmas | December 26 | | -| New Year's Eve | December 31 | | +| アメリカ合衆国の祝日 祝日 | Date observed | +| --------------------------- | --------------------------- | +| New Year's Day | January 1 | +| Martin Luther King, Jr. Day | Third Monday in January | +| Presidents' Day | Third Monday in February | +| Memorial Day | Last Monday in May | +| Independence Day | July 4 | +| Labor Day | First Monday in September | +| Veterans Day | November 12 | +| Thanksgiving Day | Fourth Thursday in November | +| Day after Thanksgiving | Fourth Friday in November | +| Christmas Eve | December 24 | +| Christmas Day | December 25 | +| Day after Christmas | December 26 | +| New Year's Eve | December 31 | #### 日本の祝日 diff --git a/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md index 194f9a76175a..a607ebcc7745 100644 --- a/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/ko-KR/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,21 +59,21 @@ For urgent issues, we can help you in English 24 hours per day, 7 days per week, {% data variables.contact.enterprise_support %} observes these U.S. holidays, although our global support team is available to answer urgent tickets. -| U.S. holiday | Date observed in {{ "now" | date: "%Y" }} | -| --------------------------- | --------------------------- | ------------- | -| New Year's Day | January 1 | | -| Martin Luther King, Jr. Day | Third Monday in January | | -| Presidents' Day | Third Monday in February | | -| Memorial Day | Last Monday in May | | -| Independence Day | July 4 | | -| Labor Day | First Monday in September | | -| Veterans Day | November 12 | | -| Thanksgiving Day | Fourth Thursday in November | | -| Day after Thanksgiving | Fourth Friday in November | | -| Christmas Eve | December 24 | | -| Christmas Day | December 25 | | -| Day after Christmas | December 26 | | -| New Year's Eve | December 31 | | +| U.S. holiday | Date observed | +| --------------------------- | --------------------------- | +| New Year's Day | January 1 | +| Martin Luther King, Jr. Day | Third Monday in January | +| Presidents' Day | Third Monday in February | +| Memorial Day | Last Monday in May | +| Independence Day | July 4 | +| Labor Day | First Monday in September | +| Veterans Day | November 12 | +| Thanksgiving Day | Fourth Thursday in November | +| Day after Thanksgiving | Fourth Friday in November | +| Christmas Eve | December 24 | +| Christmas Day | December 25 | +| Day after Christmas | December 26 | +| New Year's Eve | December 31 | #### Holidays in Japan diff --git a/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md index b011324b8888..d095af1049ea 100644 --- a/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/pt-BR/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,21 +59,21 @@ Para problemas urgentes, fornecemos suporte em inglês 44 horas por dia, 7 dias O {% data variables.contact.enterprise_support %} observa esses feriados dos EUA. O {{ site.data.variables.contact.enterprise_support }} observa os feriados americanos, embora nossa equipe de suporte global esteja disponível para responder tíquetes urgentes. -| EUA Feriado | Data observada em {{ "now" | date: "%Y" }} | -| ----------------------- | ----------------------------- | ------------- | -| Fraternidade Universal | 1º de janeiro | | -| Martin Luther King, Jr. | 3ª segunda-feira de janeiro | | -| Dia dos Presidentes | 3ª segunda-feira de fevereiro | | -| Dia do Memorial | Última segunda-feira de maio | | -| Dia da Independência | 4 de julho | | -| Dia do Trabalho | 1ª segunda-feira de setembro | | -| Dia dos Veteranos | 12 de novembro | | -| Ação de Graças (Dia 1) | 4ª quinta-feira de novembro | | -| Ação de Graças (Dia 2) | 4ª sexta-feira de novembro | | -| Natal (Dia 1) | 24 de dezembro | | -| Natal (Dia 2) | 25 de dezembro | | -| Natal (Dia 3) | 26 de dezembro | | -| Ano-Novo | 31 de dezembro | | +| EUA Feriado | Data observada | +| ----------------------- | ----------------------------- | +| Fraternidade Universal | 1º de janeiro | +| Martin Luther King, Jr. | 3ª segunda-feira de janeiro | +| Dia dos Presidentes | 3ª segunda-feira de fevereiro | +| Dia do Memorial | Última segunda-feira de maio | +| Dia da Independência | 4 de julho | +| Dia do Trabalho | 1ª segunda-feira de setembro | +| Dia dos Veteranos | 12 de novembro | +| Ação de Graças (Dia 1) | 4ª quinta-feira de novembro | +| Ação de Graças (Dia 2) | 4ª sexta-feira de novembro | +| Natal (Dia 1) | 24 de dezembro | +| Natal (Dia 2) | 25 de dezembro | +| Natal (Dia 3) | 26 de dezembro | +| Ano-Novo | 31 de dezembro | #### Feriados no Japão diff --git a/translations/ru-RU/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/ru-RU/content/admin/enterprise-support/about-github-enterprise-support.md index 0788163ee45c..5876e057a5fc 100644 --- a/translations/ru-RU/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/ru-RU/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,21 +59,21 @@ For urgent issues, we can help you in English 24 hours per day, 7 days per week, {% data variables.contact.enterprise_support %} observes these U.S. holidays, although our global support team is available to answer urgent tickets. -| U.S. holiday | Date observed in {{ "now" | date: "%Y" }} | -| --------------------------- | --------------------------- | ------------- | -| New Year's Day | January 1 | | -| Martin Luther King, Jr. Day | Third Monday in January | | -| Presidents' Day | Third Monday in February | | -| Memorial Day | Last Monday in May | | -| Independence Day | July 4 | | -| Labor Day | First Monday in September | | -| Veterans Day | November 12 | | -| Thanksgiving Day | Fourth Thursday in November | | -| Day after Thanksgiving | Fourth Friday in November | | -| Christmas Eve | December 24 | | -| Christmas Day | December 25 | | -| Day after Christmas | December 26 | | -| New Year's Eve | December 31 | | +| U.S. holiday | Date observed | +| --------------------------- | --------------------------- | +| New Year's Day | January 1 | +| Martin Luther King, Jr. Day | Third Monday in January | +| Presidents' Day | Third Monday in February | +| Memorial Day | Last Monday in May | +| Independence Day | July 4 | +| Labor Day | First Monday in September | +| Veterans Day | November 12 | +| Thanksgiving Day | Fourth Thursday in November | +| Day after Thanksgiving | Fourth Friday in November | +| Christmas Eve | December 24 | +| Christmas Day | December 25 | +| Day after Christmas | December 26 | +| New Year's Eve | December 31 | #### Holidays in Japan diff --git a/translations/zh-CN/content/admin/enterprise-support/about-github-enterprise-support.md b/translations/zh-CN/content/admin/enterprise-support/about-github-enterprise-support.md index 81603dfc4b5f..22beaebd3559 100644 --- a/translations/zh-CN/content/admin/enterprise-support/about-github-enterprise-support.md +++ b/translations/zh-CN/content/admin/enterprise-support/about-github-enterprise-support.md @@ -59,21 +59,21 @@ versions: {% data variables.contact.enterprise_support %} observes these U.S. holidays. {{ site.data.variables.contact.enterprise_support }} 会庆祝这些美国节假日，但我们的全球支持团队可以回答紧急事件单。 -| 美国 美国节假日 | Date observed in {{ "now" | date: "%Y" }} | -| ----------- | ------------------------- | ------------- | -| 元旦 | 1 月 1 日 | | -| 马丁·路德·金纪念 日 | 1 月的第三个星期一 | | -| 总统日 | 2 月的第三个星期一 | | -| 阵亡将士纪念日 | 5 月的最后一个星期一 | | -| 独立日 | 7 月 4 日 | | -| 劳动节 | 9 月的第一个星期一 | | -| 老兵节 | 11 月 12 日 | | -| 感恩节 | 11 月的第四个星期四 | | -| 感恩节后的第一天 | 11 月的第四个星期五 | | -| 平安夜 | 12 月 24 日 | | -| 圣诞节 | 12 月 25 日 | | -| 圣诞节后的第一天 | 12 月 26 日 | | -| 新年除夕 | 12 月 31 日 | | +| 美国 美国节假日 | Date observed | +| ----------- | ------------------------- | +| 元旦 | 1 月 1 日 | +| 马丁·路德·金纪念 日 | 1 月的第三个星期一 | +| 总统日 | 2 月的第三个星期一 | +| 阵亡将士纪念日 | 5 月的最后一个星期一 | +| 独立日 | 7 月 4 日 | +| 劳动节 | 9 月的第一个星期一 | +| 老兵节 | 11 月 12 日 | +| 感恩节 | 11 月的第四个星期四 | +| 感恩节后的第一天 | 11 月的第四个星期五 | +| 平安夜 | 12 月 24 日 | +| 圣诞节 | 12 月 25 日 | +| 圣诞节后的第一天 | 12 月 26 日 | +| 新年除夕 | 12 月 31 日 | #### 日本节假日