Skip to content

Commit d985962

Browse files
authored
Merge pull request #45680 from github/repo-sync
Repo sync
2 parents 675ecbe + 7bb2ed2 commit d985962

6 files changed

Lines changed: 253 additions & 10 deletions

File tree

content/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ category:
1818

1919
Default community health files are a set of predefined files that provide guidance and templates for maintaining a healthy and collaborative open source project. These files help you automate and standardize various aspects of your project's development and community interaction, promoting transparency, good practices, and collaboration.
2020

21-
You can add default community health files to a repository called `.github`. {% ifversion ghec %}For an {% data variables.enterprise.prodname_emu_org %}, the `.github` repository must be **internal**. For all other accounts, the `.github` repository must be **public**.{% else %}The `.github` repository must be **public**.{% endif %}
21+
You can add default community health files to a repository called `.github`. {% ifversion ghec %}For an {% data variables.enterprise.prodname_emu_org %}, the `.github` repository must be **internal**. For all other eligible accounts, the `.github` repository must be **public**.{% else %}The `.github` repository must be **public**.{% endif %}
22+
23+
{% ifversion ghec %}
24+
>[!NOTE] A {% data variables.enterprise.prodname_managed_user %} cannot host default community health files for their personal account because their personal `.github` repository can only be private.
25+
{% endif %}
2226

2327
{% data variables.product.github %} will use and display default files for any repository owned by the account, regardless of the destination repository's visibility, that does not have its own file of that type. For supported files that can be stored in more than one location, {% data variables.product.github %} uses the following order of precedence:
2428

@@ -72,11 +76,11 @@ You cannot create a default license file. License files must be added to individ
7276
## Creating a repository for default files
7377

7478
{% data reusables.repositories.create_new %}
75-
1. Use the **Owner** drop-down menu, and select the organization or personal account you want to create default files for.
79+
1. Use the **Owner** drop-down menu, and select the organization or personal account you want to create default files for. {% ifversion ghec %}If you are signed in with a {% data variables.enterprise.prodname_managed_user %}, you must select an organization.{% endif %}
7680
![Screenshot of the owner menu for a new {% data variables.product.prodname_dotcom %} repository. The menu shows two options, octocat and github.](/assets/images/help/repository/create-repository-owner.png)
7781
1. In the "Repository name" field, type **.github**.
7882
1. Optionally, in the "Description" field, type a description.
79-
1. {% ifversion ghec %}If you are creating the repository for an {% data variables.enterprise.prodname_emu_org %}, set the repository status to **Internal**. For any other account, set the status to **Public**.{% else %}Make sure the repository status is set to **Public**.{% endif %} A repository for default files cannot be private.
83+
1. {% ifversion ghec %}If you are creating the repository for an {% data variables.enterprise.prodname_emu_org %}, set the repository status to **Internal**. For any other eligible account, set the status to **Public**.{% else %}Make sure the repository status is set to **Public**.{% endif %} A repository for default files cannot be private.
8084
{% data reusables.repositories.initialize-with-readme %}
8185
{% data reusables.repositories.create-repo %}
8286
1. In the repository, create one of the supported community health files. Discussion category forms must be in a folder called `.github/DISCUSSION_TEMPLATE`. Issue templates and their configuration file must be in a folder called `.github/ISSUE_TEMPLATE`. {% ifversion fpt or ghec %}A `FUNDING.yml` file must be in the `.github` folder. {% endif %}All other supported files may be in the root of the repository, the `.github` folder, or the `docs` folder. For more information, see [AUTOTITLE](/repositories/working-with-files/managing-files/creating-new-files).

src/ghes-releases/lib/enterprise-dates.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
},
248248
"3.17": {
249249
"releaseDate": "2025-05-13",
250-
"deprecationDate": "2026-08-25",
250+
"deprecationDate": "2026-09-22",
251251
"releaseCandidateDate": "2025-05-13",
252252
"generalAvailabilityDate": "2025-06-03"
253253
},
@@ -276,10 +276,10 @@
276276
"generalAvailabilityDate": "2026-06-11"
277277
},
278278
"3.22": {
279-
"releaseDate": "2026-08-04",
280-
"deprecationDate": "2027-08-25",
281-
"releaseCandidateDate": "2026-08-04",
282-
"generalAvailabilityDate": "2026-08-25"
279+
"releaseDate": "2026-08-11",
280+
"deprecationDate": "2027-09-01",
281+
"releaseCandidateDate": "2026-08-11",
282+
"generalAvailabilityDate": "2026-09-01"
283283
},
284284
"3.23": {
285285
"releaseDate": "2026-11-10",

src/languages/lib/correct-translation-content.ts

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,57 @@ export function correctTranslatedContentStrings(
570570
'は一定のルールに従って、インスタンス{% endif %}上のエンタープライズ{% elsif ghes %}内の各ユーザーアカウント{% ifversion ghec %}のユーザー名を決定します。',
571571
'は一定のルールに従って、{% ifversion ghec %}エンタープライズ内{% elsif ghes %}インスタンス上{% endif %}の各ユーザーアカウントのユーザー名を決定します。',
572572
)
573+
574+
// data/reusables/audit_log/audit-log-search-by-repo.md: the second
575+
// `{%- ifversion ghec or fpt %}` block lost its trim dash (`{%-` →
576+
// `{%`) and the final `{% endif %}` closing the block was dropped
577+
// entirely, leaving the tag unclosed (`tag {% ifversion ghec or fpt %}
578+
// not closed`). This affects both audit-log-search-by-repo.md and its
579+
// transcluding page audit-log-search.md. Restore the trim dash and
580+
// append the missing `{% endif %}`.
581+
content = content.replaceAll(
582+
'{% ifversion ghec or fpt %}\n* `repo:my-org/our-repo` は、`my-org` 組織内の `our-repo` リポジトリで発生したすべてのイベントを検索します。\n* `repo:my-org/our-repo repo:my-org/another-repo` は、`my-org`組織内の `our-repo` および `another-repo` リポジトリで発生したすべてのイベントを検索します。\n* `-repo:my-org/not-this-repo` は、`my-org` 組織内の `not-this-repo` リポジトリで発生したすべてのイベントを除外します。\n\n`repo` 修飾子内にアカウント名を含める必要があります。`repo:our-repo` を検索するだけでは作動しません。',
583+
'{%- ifversion ghec or fpt %}\n* `repo:my-org/our-repo` は、`my-org` 組織内の `our-repo` リポジトリで発生したすべてのイベントを検索します。\n* `repo:my-org/our-repo repo:my-org/another-repo` は、`my-org`組織内の `our-repo` および `another-repo` リポジトリで発生したすべてのイベントを検索します。\n* `-repo:my-org/not-this-repo` は、`my-org` 組織内の `not-this-repo` リポジトリで発生したすべてのイベントを除外します。\n\n`repo` 修飾子内にアカウント名を含める必要があります。`repo:our-repo` を検索するだけでは作動しません。{% endif %}',
584+
)
585+
586+
// data/reusables/enterprise-managed/assigning-users.md: the translator
587+
// scrambled `{% ifversion ghec %}...{% else %}...{% endif %}` so that
588+
// `{% endif %}` was relocated to the start of the sentence (as an
589+
// orphan) and `{% ifversion ghec %}` moved into the middle, leaving the
590+
// tag never closed (`tag "endif" not found`). Reconstruct to match
591+
// English ordering: assigning users/groups to the
592+
// {% ifversion ghec %}EMU IdP application{% else %}relevant application
593+
// in your IdP{% endif %}.
594+
content = content.replaceAll(
595+
'ユーザーまたはグループを IdP {% endif %} の {% ifversion ghec %} {% data variables.product.prodname_emu_idp_application %} アプリケーション {% else %} 関連アプリケーションに割り当てることで',
596+
'ユーザーまたはグループを {% ifversion ghec %}{% data variables.product.prodname_emu_idp_application %} アプリケーション{% else %}IdP の関連アプリケーション{% endif %}に割り当てることで',
597+
)
598+
599+
// data/reusables/actions/self-hosted-runner-management-permissions-required.md:
600+
// the `{% ifversion fpt or ghec %}...{% elsif ghes %}...{% endif %}`
601+
// block was scrambled — `{% endif %}` and `{% elsif ghes %}` were moved
602+
// earlier in the sentence, and `{% ifversion fpt or ghec %}` was moved to
603+
// the end, leaving the tag never closed (`tag "endif" not found`).
604+
// Reconstruct to match English ordering: located in your repository,
605+
// organization, or {% ifversion fpt or ghec %}enterprise account
606+
// settings on {% data variables.product.prodname_dotcom %}{% elsif ghes %}
607+
// enterprise settings on {% data variables.product.prodname_ghe_server %}{% endif %}.
608+
content = content.replaceAll(
609+
'セルフホステッド ランナーは、リポジトリまたは Organization のいずれかに配置するか、{% data variables.product.prodname_ghe_server %}{% endif %} の {% data variables.product.prodname_dotcom %}{% elsif ghes %} Enterprise 設定の {% ifversion fpt or ghec %} Enterprise アカウント設定に配置することができます。',
610+
'セルフホステッド ランナーは、リポジトリまたは Organization のいずれかに配置するか、{% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %} の Enterprise アカウント設定{% elsif ghes %}{% data variables.product.prodname_ghe_server %} の Enterprise 設定{% endif %}に配置することができます。',
611+
)
612+
613+
// data/reusables/codespaces/when-an-org-pays.md: the translator split
614+
// `{% elsif fpt %}...{% endif %}` away from its `{% ifversion ghec %}`
615+
// opener, moving `{% ifversion ghec %}` to the end of the sentence and
616+
// leaving the block never closed (`tag "elsif" not found`).
617+
// Reconstruct to match English: This includes {% ifversion ghec %}
618+
// public, private, and internal{% elsif fpt %}both public and
619+
// private{% endif %} repositories.
620+
content = content.replaceAll(
621+
'これには、パブリック リポジトリ、プライベート リポジトリ、および内部{% elsif fpt %}both パブリック リポジトリとプライベート リポジトリ{% endif %}{% ifversion ghec %}が含まれます。',
622+
'これには、{% ifversion ghec %}パブリック リポジトリ、プライベート リポジトリ、および内部{% elsif fpt %}パブリック リポジトリとプライベート リポジトリの両方{% endif %}が含まれます。',
623+
)
573624
}
574625

575626
if (context.code === 'pt') {
@@ -1032,6 +1083,42 @@ export function correctTranslatedContentStrings(
10321083
'会按照特定规则确定您实例{% endif %}上您企业{% elsif ghes %}中各个用户帐户{% ifversion ghec %}的用户名。',
10331084
'会按照特定规则确定{% ifversion ghec %}您企业中{% elsif ghes %}您实例上{% endif %}各个用户帐户的用户名。',
10341085
)
1086+
1087+
// data/reusables/codespaces/when-an-org-pays.md: the translator moved
1088+
// `{% ifversion ghec %}` from the start of the conditional to the end
1089+
// of the sentence and left `{% elsif fpt %}` mid-sentence with no
1090+
// closing tag, so the block never closes (`tag "elsif" not found`).
1091+
// Reconstruct to match English: This includes {% ifversion ghec %}
1092+
// public, private, and internal{% elsif fpt %}both public and
1093+
// private{% endif %} repositories.
1094+
content = content.replaceAll(
1095+
'这包括{% ifversion ghec %}公共存储库、专用存储库和{% endif %}内部{% elsif fpt %}存储库。',
1096+
'这包括{% ifversion ghec %}公共存储库、专用存储库和内部存储库{% elsif fpt %}公共存储库和专用存储库{% endif %}。',
1097+
)
1098+
1099+
// data/reusables/actions/permissions-statement-secrets-and-variables-organization.md:
1100+
// the translator moved `{% endif %}` from the end of the first
1101+
// conditional to the start of the sentence, leaving the tag unclosed
1102+
// (`tag "endif" not found`). Reconstruct to match English: Organization
1103+
// owners{% ifversion custom-org-roles %} and users with the "..."
1104+
// permissions{% endif %} can create secrets or variables...
1105+
content = content.replaceAll(
1106+
'具有“管理组织操作变量”或“管理组织操作机密”权限{% endif %}的组织所有者{% ifversion custom-org-roles %}和用户可以在组织级别创建机密或变量。',
1107+
'组织所有者{% ifversion custom-org-roles %}和具有“管理组织操作变量”或“管理组织操作机密”权限的用户{% endif %}可以在组织级别创建机密或变量。',
1108+
)
1109+
1110+
// data/reusables/apps/redirect-uri-wildcard-matching.md: the translator
1111+
// scrambled the trailing conditional so `{% else %}` and the date/version
1112+
// branches were reordered and `{% ifversion fpt or ghec %}` was moved to
1113+
// after `{% endif %}`, leaving `{% else %}` an orphan (`tag "else" not
1114+
// found`). Reconstruct to match English: Apps that had a single callback
1115+
// URL enabled prior to {% ifversion fpt or ghec %}August 3,
1116+
// 2026{% else %}{% data variables.product.prodname_ghe_server %}
1117+
// 3.24{% endif %} have wildcard matching enabled...
1118+
content = content.replaceAll(
1119+
'在 {% else %}2026 年 8 月 3 日{% data variables.product.prodname_ghe_server %}{% endif %} 3.24{% ifversion fpt or ghec %} 之前已启用单个回调 URL 的应用,其回调 URL 已启用通配符匹配。',
1120+
'在{% ifversion fpt or ghec %}2026 年 8 月 3 日{% else %}{% data variables.product.prodname_ghe_server %} 3.24{% endif %} 之前已启用单个回调 URL 的应用,其回调 URL 已启用通配符匹配。',
1121+
)
10351122
}
10361123

10371124
if (context.code === 'ru') {
@@ -1836,6 +1923,42 @@ export function correctTranslatedContentStrings(
18361923
'이전 조직 구성원을 초대하여{% else %}조직에 이전 멤버를{% endif%} 다시 추가하고 해당 사용자의 이전 역할, 액세스 권한, 포크 및 설정을 복원할지 여부를 선택할 수 {% ifversion fpt or ghec %}있습니다.',
18371924
'{% ifversion fpt or ghec %}이전 조직 구성원을 초대하여{% else %}조직에 이전 멤버를{% endif %} 다시 추가하고 해당 사용자의 이전 역할, 액세스 권한, 포크 및 설정을 복원할지 여부를 선택할 수 있습니다.',
18381925
)
1926+
1927+
// data/reusables/codespaces/when-an-org-pays.md: the translator split
1928+
// `{% elsif fpt %}...{% endif %}` away from its `{% ifversion ghec %}`
1929+
// opener, moving `{% ifversion ghec %}` to the end of the sentence and
1930+
// leaving the block never closed (`tag "elsif" not found`).
1931+
// Reconstruct to match English: This includes {% ifversion ghec %}
1932+
// public, private, and internal{% elsif fpt %}both public and
1933+
// private{% endif %} repositories.
1934+
content = content.replaceAll(
1935+
'여기에는 공용, 프라이빗 및 내부{% elsif fpt %}모두 공용 및 프라이빗{% endif %} 리포지토리가 포함됩니다{% ifversion ghec %}.',
1936+
'여기에는 {% ifversion ghec %}공용, 프라이빗 및 내부{% elsif fpt %}공용 및 프라이빗 모두{% endif %} 리포지토리가 포함됩니다.',
1937+
)
1938+
1939+
// data/reusables/actions/permissions-statement-secrets-and-variables-organization.md:
1940+
// the translator moved `{% endif %}` from the end of the first
1941+
// conditional to the start of the sentence, leaving the tag unclosed
1942+
// (`tag "endif" not found`). Reconstruct to match English: Organization
1943+
// owners{% ifversion custom-org-roles %} and users with the "..."
1944+
// permissions{% endif %} can create secrets or variables...
1945+
content = content.replaceAll(
1946+
'"조직 작업 변수 관리" 또는 "조직 작업 비밀 관리" 권한이{% endif %} 있는 조직 소유자{% ifversion custom-org-roles %} 및 사용자는 조직 수준에서 비밀 또는 변수를 만들 수 있습니다.',
1947+
'조직 소유자{% ifversion custom-org-roles %} 및 "조직 작업 변수 관리" 또는 "조직 작업 비밀 관리" 권한이 있는 사용자{% endif %}는 조직 수준에서 비밀 또는 변수를 만들 수 있습니다.',
1948+
)
1949+
1950+
// data/reusables/apps/redirect-uri-wildcard-matching.md: the translator
1951+
// scrambled the trailing conditional so the date/version branches and
1952+
// `{% else %}` were reordered ahead of `{% ifversion fpt or ghec %}`,
1953+
// leaving `{% else %}` an orphan (`tag "else" not found`). Reconstruct to
1954+
// match English: Apps that had a single callback URL enabled prior to
1955+
// {% ifversion fpt or ghec %}August 3, 2026{% else %}
1956+
// {% data variables.product.prodname_ghe_server %} 3.24{% endif %} have
1957+
// wildcard matching enabled...
1958+
content = content.replaceAll(
1959+
'2026{% else %}{% data variables.product.prodname_ghe_server %}년 8월 3일 3.24{% endif %} 이전에 {% ifversion fpt or ghec %}단일 콜백 URL을 사용하도록 설정된 앱에는 해당 콜백 URL에 대해 와일드카드 일치가 활성화되어 있습니다.',
1960+
'{% ifversion fpt or ghec %}2026년 8월 3일{% else %}{% data variables.product.prodname_ghe_server %} 3.24{% endif %} 이전에 단일 콜백 URL을 사용하도록 설정된 앱에는 해당 콜백 URL에 대해 와일드카드 일치가 활성화되어 있습니다.',
1961+
)
18391962
}
18401963

18411964
if (context.code === 'de') {

0 commit comments

Comments
 (0)