From a480324595cb53bb77f2a1830587156e08f3c497 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 15 Mar 2026 15:09:43 +0100 Subject: [PATCH] fix(i18n): reuse string for repository access, fix capitalization consistency (#11683) Followup to https://codeberg.org/forgejo/forgejo/pulls/11604 These strings are used in similar contexts and can be reused. Fixed capitalization consistency (`specific_repo_access` inherited capitalization from `repo_and_org_access` which was nearby in the UI) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11683 Reviewed-by: Gusted Reviewed-by: Mathieu Fenniak Co-authored-by: 0ko <0ko@noreply.codeberg.org> Co-committed-by: 0ko <0ko@noreply.codeberg.org> --- options/locale/locale_en-US.ini | 3 +-- options/locale_next/locale_en-US.json | 2 +- templates/org/team/new.tmpl | 2 +- templates/org/team/sidebar.tmpl | 2 +- tests/integration/user_test.go | 11 +++++++---- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 6e6f8a81cf..6ec0ba978c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -925,7 +925,7 @@ regenerate_token = Regenerate access_token_regeneration = Regenerate access token access_token_regeneration_desc = Regenerating a token will revoke access to your account for applications using it. This cannot be undone. Continue? regenerate_token_success = The token has been regenerated. Applications that use it no longer have access to your account and must be updated with the new token. -repo_and_org_access = Repository and Organization Access +repo_and_org_access = Repository and organization access permissions_public_only = Public only permissions_access_all = All (public, private, and limited) select_permissions = Select permissions @@ -2824,7 +2824,6 @@ team_name = Team name team_desc = Description team_name_helper = Team names should be short and memorable. team_desc_helper = Describe the purpose or role of the team. -team_access_desc = Repository access team_permission_desc = Permission team_unit_desc = Allow access to repository sections team_unit_disabled = (Disabled) diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json index 78aac13010..8e2a340372 100644 --- a/options/locale_next/locale_en-US.json +++ b/options/locale_next/locale_en-US.json @@ -191,7 +191,7 @@ "settings.twofa_reenroll": "Re-enroll two-factor authentication", "settings.twofa_reenroll.description": "Re-enroll your two-factor authentication", "settings.must_enable_2fa": "This Forgejo instance requires users to enable two-factor authentication before they can access their accounts.", - "settings.specific_repo_access": "Repository Access", + "settings.specific_repo_access": "Repository access", "error.must_enable_2fa": "This Forgejo instance requires users to enable two-factor authentication before they can access their accounts. Enable it at: %s", "avatar.constraints_hint": "Custom avatar may not exceed %[1]s in size or be larger than %[2]dx%[3]d pixels", "user.ghost.tooltip": "This user has been deleted, or cannot be matched.", diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index a5ebef0edd..96cc9536c9 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -25,7 +25,7 @@ {{if not (eq .Team.LowerName "owners")}}
- {{ctx.Locale.Tr "org.team_access_desc"}} + {{ctx.Locale.Tr "settings.specific_repo_access"}}