From 60f7a759c8e3f1b473e455c4a3f29e02fa554b8d Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 18:09:36 +0100 Subject: [PATCH 01/19] deduplicate cancel translation --- options/locale/locale_en-US.ini | 11 ----------- templates/base/head_script.tmpl | 2 +- templates/base/modal_actions_confirm.tmpl | 2 +- templates/projects/new.tmpl | 2 +- templates/projects/view.tmpl | 4 ++-- templates/repo/commit_page.tmpl | 4 ++-- templates/repo/diff/box.tmpl | 2 +- templates/repo/editor/cherry_pick.tmpl | 2 +- templates/repo/editor/edit.tmpl | 2 +- templates/repo/editor/patch.tmpl | 2 +- templates/repo/editor/upload.tmpl | 2 +- templates/repo/issue/milestone_new.tmpl | 2 +- templates/repo/issue/view_content.tmpl | 2 +- templates/repo/issue/view_content/sidebar.tmpl | 6 +++--- templates/repo/issue/view_title.tmpl | 2 +- templates/repo/migrate/migrating.tmpl | 4 ++-- templates/repo/release/new.tmpl | 2 +- templates/repo/settings/options.tmpl | 10 +++++----- templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- 20 files changed, 28 insertions(+), 39 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index dc16d78fc7e6e..87c286531ef81 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -523,7 +523,6 @@ team_invite.text_3 = Note: This invitation was intended for %[1]s. If you were n yes = Yes no = No confirm = Confirm -cancel = Cancel modify = Update [form] @@ -708,7 +707,6 @@ change_username = Your username has been changed. change_username_prompt = Note: Changing your username also changes your account URL. change_username_redirect_prompt = The old username will redirect until someone claims it. continue = Continue -cancel = Cancel language = Language ui = Theme hidden_comment_types = Hidden comment types @@ -875,7 +873,6 @@ generate_token_success = Your new token has been generated. Copy it now as it wi generate_token_name_duplicate = %s has been used as an application name already. Please use a new one. delete_token = Delete access_token_deletion = Delete Access Token -access_token_deletion_cancel_action = Cancel access_token_deletion_confirm_action = Delete access_token_deletion_desc = Deleting a token will revoke access to your account for applications using it. This cannot be undone. Continue? delete_token_success = The token has been deleted. Applications using it no longer have access to your account. @@ -1168,7 +1165,6 @@ migrate.migrating_labels = Migrating Labels migrate.migrating_releases = Migrating Releases migrate.migrating_issues = Migrating Issues migrate.migrating_pulls = Migrating Pull Requests -migrate.cancel_migrating_title = Cancel Migration migrate.cancel_migrating_confirm = Do you want to cancel this migration? mirror_from = mirror of @@ -1281,7 +1277,6 @@ editor.file_delete_success = File "%s" has been deleted. editor.name_your_file = Name your file… editor.filename_help = Add a directory by typing its name followed by a slash ('/'). Remove a directory by typing backspace at the beginning of the input field. editor.or = or -editor.cancel_lower = Cancel editor.commit_signed_changes = Commit Signed Changes editor.commit_changes = Commit Changes editor.add_tmpl = Add '' @@ -1300,7 +1295,6 @@ editor.create_new_branch_np = Create a new branch for this comm editor.propose_file_change = Propose file change editor.new_branch_name = Name the new branch for this commit editor.new_branch_name_desc = New branch name… -editor.cancel = Cancel editor.filename_cannot_be_empty = The filename cannot be empty. editor.filename_is_invalid = The filename is invalid: "%s". editor.branch_does_not_exist = Branch "%s" does not exist in this repository. @@ -1580,7 +1574,6 @@ issues.dismiss_review = Dismiss Review issues.dismiss_review_warning = Are you sure you want to dismiss this review? issues.sign_in_require_desc = Sign in to join this conversation. issues.edit = Edit -issues.cancel = Cancel issues.save = Save issues.label_title = Name issues.label_description = Description @@ -1647,7 +1640,6 @@ issues.cancel_tracking_history = `canceled time tracking %s` issues.add_time = Manually Add Time issues.del_time = Delete this time log issues.add_time_short = Add Time -issues.add_time_cancel = Cancel issues.add_time_history = `added spent time %s` issues.del_time_history= `deleted spent time %s` issues.add_time_hours = Hours @@ -1681,7 +1673,6 @@ issues.dependency.no_permission_1 = "You do not have permission to read %d depen issues.dependency.no_permission_n = "You do not have permission to read %d dependencies" issues.dependency.no_permission.can_remove = "You do not have permission to read this dependency but can remove this dependency" issues.dependency.add = Add dependency… -issues.dependency.cancel = Cancel issues.dependency.remove = Remove issues.dependency.remove_info = Remove this dependency issues.dependency.added_dependency = `added a new dependency %s` @@ -1911,7 +1902,6 @@ milestones.invalid_due_date_format = "Due date format must be 'yyyy-mm-dd'." milestones.create_success = The milestone "%s" has been created. milestones.edit = Edit Milestone milestones.edit_subheader = Milestones organize issues and track progress. -milestones.cancel = Cancel milestones.modify = Update Milestone milestones.edit_success = Milestone "%s" has been updated. milestones.deletion = Delete Milestone @@ -2562,7 +2552,6 @@ release.title_empty = Title cannot be empty. release.message = Describe this release release.prerelease_desc = Mark as Pre-Release release.prerelease_helper = Mark this release unsuitable for production use. -release.cancel = Cancel release.publish = Publish Release release.save_draft = Save Draft release.edit_release = Update Release diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl index 22e08e9c8f69c..3ddcd33682516 100644 --- a/templates/base/head_script.tmpl +++ b/templates/base/head_script.tmpl @@ -40,7 +40,7 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly. network_error: {{ctx.Locale.Tr "error.network_error"}}, remove_label_str: {{ctx.Locale.Tr "remove_label_str"}}, modal_confirm: {{ctx.Locale.Tr "modal.confirm"}}, - modal_cancel: {{ctx.Locale.Tr "modal.cancel"}}, + modal_cancel: {{ctx.Locale.Tr "cancel"}}, more_items: {{ctx.Locale.Tr "more_items"}}, }, }; diff --git a/templates/base/modal_actions_confirm.tmpl b/templates/base/modal_actions_confirm.tmpl index c44320deffbb8..6a51e169b432d 100644 --- a/templates/base/modal_actions_confirm.tmpl +++ b/templates/base/modal_actions_confirm.tmpl @@ -17,7 +17,7 @@ The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal {{$textNegitive := ctx.Locale.Tr "modal.no"}} {{$textPositive := ctx.Locale.Tr "modal.yes"}} {{if eq .ModalButtonTypes "confirm"}} - {{$textNegitive = ctx.Locale.Tr "modal.cancel"}} + {{$textNegitive = ctx.Locale.Tr "cancel"}} {{$textPositive = ctx.Locale.Tr "modal.confirm"}} {{end}} {{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}} diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 92ee36c1c44fd..f1efbac89141f 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -57,7 +57,7 @@
- {{ctx.Locale.Tr "repo.milestones.cancel"}} + {{ctx.Locale.Tr "cancel"}}
- +
@@ -130,7 +130,7 @@
- +
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 80af73ce486e7..d3ffee6e1999c 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -97,7 +97,7 @@
- +
@@ -122,7 +122,7 @@
- +
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 39df6faea50dc..5dd52b67cfbf3 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -243,7 +243,7 @@ {{end}}
- +
diff --git a/templates/repo/editor/cherry_pick.tmpl b/templates/repo/editor/cherry_pick.tmpl index f9c9eef5aab64..86bdaefabc66c 100644 --- a/templates/repo/editor/cherry_pick.tmpl +++ b/templates/repo/editor/cherry_pick.tmpl @@ -20,7 +20,7 @@ {{.Repository.FullName}}
:
{{.BranchName}} - {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "repo.editor.cancel_lower"}} + {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "cancel"}} {{template "repo/editor/commit_form" .}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 05a8d966815b0..0864532b63488 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -21,7 +21,7 @@ {{$v}} {{end}} {{end}} - {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "repo.editor.cancel_lower"}} + {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "cancel"}} diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index 8df87589889ba..b3216adede3e6 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -13,7 +13,7 @@ {{.Repository.FullName}}
:
{{.BranchName}} - {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "repo.editor.cancel_lower"}} + {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "cancel"}} diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl index 0a7c49dae3d16..a0d233a81ce6f 100644 --- a/templates/repo/editor/upload.tmpl +++ b/templates/repo/editor/upload.tmpl @@ -19,7 +19,7 @@ {{$v}} {{end}} {{end}} - {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "repo.editor.cancel_lower"}} + {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "cancel"}} diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index 7a56d73ac93f0..b1b202edc32cc 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -42,7 +42,7 @@
{{if .PageIsEditMilestone}} - {{ctx.Locale.Tr "repo.milestones.cancel"}} + {{ctx.Locale.Tr "cancel"}} +
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 329a39dd69e06..28d6900392be5 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -79,7 +79,7 @@
- +
@@ -318,7 +318,7 @@
- +
+ + {{end}} diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl index 1d5a231db8744..2e92d390d289b 100644 --- a/templates/repo/migrate/migrating.tmpl +++ b/templates/repo/migrate/migrating.tmpl @@ -78,7 +78,7 @@
- +
@@ -87,7 +87,7 @@
- +
@@ -956,7 +956,7 @@
- +
@@ -990,7 +990,7 @@
- +
@@ -1022,7 +1022,7 @@
- +
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index e57658b197338..6ab8b17278f68 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -103,7 +103,7 @@ {{ctx.Locale.Tr "settings.gpg_key_verify"}} - {{ctx.Locale.Tr "settings.cancel"}} + {{ctx.Locale.Tr "cancel"}} diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 94ee2a1a55cda..8408778215834 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -91,7 +91,7 @@ {{ctx.Locale.Tr "settings.ssh_key_verify"}} - {{ctx.Locale.Tr "settings.cancel"}} + {{ctx.Locale.Tr "cancel"}} From 559add571da7c5ce30ddcbbe7d8c5255ef581a9b Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 18:15:09 +0100 Subject: [PATCH 02/19] deduplicate edit translation --- options/locale/locale_en-US.ini | 8 -------- templates/admin/auth/list.tmpl | 2 +- templates/admin/user/view.tmpl | 2 +- templates/repo/issue/view_content/context_menu.tmpl | 2 +- templates/repo/issue/view_title.tmpl | 2 +- templates/repo/release/list.tmpl | 2 +- templates/repo/settings/branches.tmpl | 2 +- templates/repo/wiki/view.tmpl | 6 +++--- templates/user/settings/applications_oauth2_list.tmpl | 2 +- 9 files changed, 10 insertions(+), 18 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 87c286531ef81..1b5a515673b54 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -906,7 +906,6 @@ oauth2_client_secret = Client Secret oauth2_regenerate_secret = Regenerate Secret oauth2_regenerate_secret_hint = Lost your secret? oauth2_client_secret_hint = The secret will not be shown again after you leave or refresh this page. Please ensure that you have saved it. -oauth2_application_edit = Edit oauth2_application_create_description = OAuth2 applications gives your third-party application access to user accounts on this instance. oauth2_application_remove_description = Removing an OAuth2 application will prevent it from accessing authorized user accounts on this instance. Continue? oauth2_application_locked = Gitea pre-registers some OAuth2 applications on startup if enabled in config. To prevent unexpected behavior, these can neither be edited nor removed. Please refer to the OAuth2 documentation for more information. @@ -1533,7 +1532,6 @@ issues.delete_comment_confirm = Are you sure you want to delete this comment? issues.context.copy_link = Copy Link issues.context.quote_reply = Quote Reply issues.context.reference_issue = Reference in New Issue -issues.context.edit = Edit issues.context.delete = Delete issues.no_content = No description provided. issues.close = Close Issue @@ -1573,7 +1571,6 @@ issues.remove_request_review_block=Can't remove review request issues.dismiss_review = Dismiss Review issues.dismiss_review_warning = Are you sure you want to dismiss this review? issues.sign_in_require_desc = Sign in to join this conversation. -issues.edit = Edit issues.save = Save issues.label_title = Name issues.label_description = Description @@ -1586,7 +1583,6 @@ issues.label_exclusive_desc = Name the label scope/item to make it issues.label_exclusive_warning = Any conflicting scoped labels will be removed when editing the labels of an issue or pull request. issues.label_count = %d labels issues.label_open_issues = %d open issues/pull requests -issues.label_edit = Edit issues.label_delete = Delete issues.label_modify = Edit Label issues.label_deletion = Delete Label @@ -1944,7 +1940,6 @@ wiki.page_content = Page content wiki.default_commit_message = Write a note about this page update (optional). wiki.save_page = Save Page wiki.last_commit_info = %s edited this page %s -wiki.edit_page_button = Edit wiki.new_page_button = New Page wiki.file_revision = Page Revision wiki.wiki_page_revisions = Wiki Page Revisions @@ -2402,7 +2397,6 @@ settings.merge_style_desc = Merge Styles settings.default_merge_style_desc = Default Merge Style settings.choose_branch = Choose a branch… settings.no_protected_branch = There are no protected branches. -settings.edit_protected_branch = Edit settings.protected_branch_required_rule_name = Required rule name settings.protected_branch_duplicate_rule_name = Duplicate rule name settings.protected_branch_required_approvals_min = Required approvals cannot be negative. @@ -2535,7 +2529,6 @@ release.draft = Draft release.prerelease = Pre-Release release.stable = Stable release.compare = Compare -release.edit = edit release.ahead.commits = %d commits release.ahead.target = to %s since this release tag.ahead.target = to %s since this tag @@ -2886,7 +2879,6 @@ users.last_login = Last Sign-In users.never_login = Never Signed-In users.send_register_notify = Send User Registration Notification users.new_success = The user account "%s" has been created. -users.edit = Edit users.auth_source = Authentication Source users.local = Local users.auth_login_name = Authentication Sign-In Name diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index 6483ec800c4a1..e916f7b097862 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -16,7 +16,7 @@ {{ctx.Locale.Tr "admin.auths.enabled"}} {{ctx.Locale.Tr "admin.auths.updated"}} {{ctx.Locale.Tr "admin.users.created"}} - {{ctx.Locale.Tr "admin.users.edit"}} + {{ctx.Locale.Tr "edit"}} diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index fd3017607cdc1..4704a375bd54d 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -6,7 +6,7 @@

{{.Title}}
- {{ctx.Locale.Tr "admin.users.edit"}} + {{ctx.Locale.Tr "edit"}}

diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index 17556d4e4894a..4ada6036d6d17 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -20,7 +20,7 @@ {{end}} {{if or .ctxData.Permission.IsAdmin .IsCommentPoster .ctxData.HasIssuesOrPullsWritePermission}}
-
{{ctx.Locale.Tr "repo.issues.context.edit"}}
+
{{ctx.Locale.Tr "edit"}}
{{if .delete}}
{{ctx.Locale.Tr "repo.issues.context.delete"}}
{{end}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index a33e8ae5b9a9c..9dce9e7e3a66f 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -14,7 +14,7 @@
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} - + {{end}} {{if not .Issue.IsPull}} {{ctx.Locale.Tr "repo.issues.new"}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 873cccab79f55..13ce429a2cd9c 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -30,7 +30,7 @@
{{if and $.CanCreateRelease (not $.PageIsSingleTag)}} - + {{svg "octicon-pencil"}} {{end}} diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 73aff887f367c..80ef06fa316b5 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -48,7 +48,7 @@
- {{ctx.Locale.Tr "repo.settings.edit_protected_branch"}} + {{ctx.Locale.Tr "edit"}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 19da3fd199f0f..563f86137041a 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -50,7 +50,7 @@ {{end}} {{if and .CanWriteWiki (not .Repository.IsMirror)}}
- {{ctx.Locale.Tr "repo.wiki.edit_page_button"}} + {{ctx.Locale.Tr "edit"}} {{ctx.Locale.Tr "repo.wiki.new_page_button"}} {{ctx.Locale.Tr "repo.wiki.delete_page_button"}}
@@ -79,7 +79,7 @@ {{if .sidebarPresent}}
{{if and .CanWriteWiki (not .Repository.IsMirror)}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} {{template "repo/unicode_escape_prompt" dict "EscapeStatus" .sidebarEscapeStatus "root" $}} {{.sidebarContent | SafeHTML}} @@ -91,7 +91,7 @@ {{if .footerPresent}}
{{if and .CanWriteWiki (not .Repository.IsMirror)}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} {{template "repo/unicode_escape_prompt" dict "footerEscapeStatus" .sidebarEscapeStatus "root" $}} {{.footerContent | SafeHTML}} diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index bf6b28ec5f29f..56664176cc55f 100644 --- a/templates/user/settings/applications_oauth2_list.tmpl +++ b/templates/user/settings/applications_oauth2_list.tmpl @@ -22,7 +22,7 @@ {{else}} {{svg "octicon-pencil" 16 "gt-mr-2"}} - {{ctx.Locale.Tr "settings.oauth2_application_edit"}} + {{ctx.Locale.Tr "edit"}} - +
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 7c5bb0fa1d947..aed439ded3825 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -163,7 +163,7 @@
- +
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 9dce9e7e3a66f..76969cf4f4410 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -23,7 +23,7 @@ {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
- +
{{end}}
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index e95dd831c945b..3cdca39cd0cb2 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -263,7 +263,7 @@
- +
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 640f8ca9cd607..5fd971859d841 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -37,7 +37,7 @@
{{ctx.Locale.Tr "cancel"}} - +
diff --git a/templates/user/settings/applications_oauth2_edit_form.tmpl b/templates/user/settings/applications_oauth2_edit_form.tmpl index c0bddd55b3d98..6d0abf5c30598 100644 --- a/templates/user/settings/applications_oauth2_edit_form.tmpl +++ b/templates/user/settings/applications_oauth2_edit_form.tmpl @@ -46,7 +46,7 @@ From 806520b7fecfd4e938d06dc0b966dd5660393209 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 18:24:38 +0100 Subject: [PATCH 04/19] deduplicate delete translation --- options/locale/locale_en-US.ini | 8 -------- templates/admin/repo/unadopted.tmpl | 2 +- templates/projects/list.tmpl | 2 +- templates/projects/view.tmpl | 2 +- templates/repo/issue/labels/label_list.tmpl | 4 ++-- templates/repo/issue/milestones.tmpl | 2 +- templates/repo/issue/view_content/context_menu.tmpl | 2 +- templates/repo/settings/webhook/settings.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- templates/user/settings/applications.tmpl | 2 +- templates/user/settings/repos.tmpl | 2 +- 11 files changed, 11 insertions(+), 19 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index a889ca32d085f..82c501b1b6b5f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -871,9 +871,7 @@ token_name = Token Name generate_token = Generate Token generate_token_success = Your new token has been generated. Copy it now as it will not be shown again. generate_token_name_duplicate = %s has been used as an application name already. Please use a new one. -delete_token = Delete access_token_deletion = Delete Access Token -access_token_deletion_confirm_action = Delete access_token_deletion_desc = Deleting a token will revoke access to your account for applications using it. This cannot be undone. Continue? delete_token_success = The token has been deleted. Applications using it no longer have access to your account. repo_and_org_access = Repository and Organization Access @@ -1065,7 +1063,6 @@ adopt_preexisting_label = Adopt Files adopt_preexisting = Adopt pre-existing files adopt_preexisting_content = Create repository from %s adopt_preexisting_success = Adopted files and created repository from %s -delete_preexisting_label = Delete delete_preexisting = Delete pre-existing files delete_preexisting_content = Delete files in %s delete_preexisting_success = Deleted unadopted files in %s @@ -1531,7 +1528,6 @@ issues.delete_comment_confirm = Are you sure you want to delete this comment? issues.context.copy_link = Copy Link issues.context.quote_reply = Quote Reply issues.context.reference_issue = Reference in New Issue -issues.context.delete = Delete issues.no_content = No description provided. issues.close = Close Issue issues.comment_pull_merged_at = merged commit %[1]s into %[2]s %[3]s @@ -1581,7 +1577,6 @@ issues.label_exclusive_desc = Name the label scope/item to make it issues.label_exclusive_warning = Any conflicting scoped labels will be removed when editing the labels of an issue or pull request. issues.label_count = %d labels issues.label_open_issues = %d open issues/pull requests -issues.label_delete = Delete issues.label_modify = Edit Label issues.label_deletion = Delete Label issues.label_deletion_desc = Deleting a label removes it from all issues. Continue? @@ -1618,7 +1613,6 @@ issues.lock.reason = Reason for locking issues.lock.title = Lock conversation on this issue. issues.unlock.title = Unlock conversation on this issue. issues.comment_on_locked = You cannot comment on a locked issue. -issues.delete = Delete issues.delete.title = Delete this issue? issues.delete.text = Do you really want to delete this issue? (This will permanently remove all content. Consider closing it instead, if you intend to keep it archived) issues.tracker = Time Tracker @@ -2234,7 +2228,6 @@ settings.event_choose = Custom Events… settings.event_header_repository = Repository Events settings.event_create = Create settings.event_create_desc = Branch or tag created. -settings.event_delete = Delete settings.event_delete_desc = Branch or tag deleted. settings.event_fork = Fork settings.event_fork_desc = Repository forked. @@ -2564,7 +2557,6 @@ release.tags_for = Tags for %s branch.name = Branch Name branch.already_exists = A branch named "%s" already exists. -branch.delete_head = Delete branch.delete = Delete Branch "%s" branch.delete_html = Delete Branch branch.delete_desc = Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue? diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index c65cfd9db417e..4b909f55d6d39 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -40,7 +40,7 @@ {{template "base/modal_actions_confirm"}} - + diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 52043d7f2f290..f159f190048cc 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -22,7 +22,7 @@ {{end}} diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index eeb2b6cbddf2a..d942247da0025 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -51,7 +51,7 @@ {{end}} {{if $.allowDelete}} - + {{ctx.Locale.Tr "packages.dependency.id"}} - {{ctx.Locale.Tr "packages.dependency.version"}} + {{ctx.Locale.Tr "version"}} diff --git a/templates/package/content/npm_dependencies.tmpl b/templates/package/content/npm_dependencies.tmpl index dba45750b7f7a..d019a3e245023 100644 --- a/templates/package/content/npm_dependencies.tmpl +++ b/templates/package/content/npm_dependencies.tmpl @@ -4,7 +4,7 @@ {{ctx.Locale.Tr "packages.dependency.id"}} - {{ctx.Locale.Tr "packages.dependency.version"}} + {{ctx.Locale.Tr "version"}} diff --git a/templates/package/content/nuget.tmpl b/templates/package/content/nuget.tmpl index 0911260fbaa21..ed200cf1d7006 100644 --- a/templates/package/content/nuget.tmpl +++ b/templates/package/content/nuget.tmpl @@ -31,7 +31,7 @@ {{ctx.Locale.Tr "packages.dependency.id"}} - {{ctx.Locale.Tr "packages.dependency.version"}} + {{ctx.Locale.Tr "version"}} {{ctx.Locale.Tr "packages.nuget.dependency.framework"}} diff --git a/templates/package/content/rubygems_dependencies.tmpl b/templates/package/content/rubygems_dependencies.tmpl index 2c42dcead2ddc..28b5c355998a2 100644 --- a/templates/package/content/rubygems_dependencies.tmpl +++ b/templates/package/content/rubygems_dependencies.tmpl @@ -4,7 +4,7 @@ {{ctx.Locale.Tr "packages.dependency.id"}} - {{ctx.Locale.Tr "packages.dependency.version"}} + {{ctx.Locale.Tr "version"}} diff --git a/templates/package/shared/cleanup_rules/preview.tmpl b/templates/package/shared/cleanup_rules/preview.tmpl index cff8e8249f46f..ada2fdca0847f 100644 --- a/templates/package/shared/cleanup_rules/preview.tmpl +++ b/templates/package/shared/cleanup_rules/preview.tmpl @@ -8,7 +8,7 @@ {{ctx.Locale.Tr "admin.packages.type"}} {{ctx.Locale.Tr "admin.packages.name"}} - {{ctx.Locale.Tr "admin.packages.version"}} + {{ctx.Locale.Tr "version"}} {{ctx.Locale.Tr "admin.packages.creator"}} {{ctx.Locale.Tr "admin.packages.size"}} {{ctx.Locale.Tr "admin.packages.published"}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 73c9ca6a1f8d1..2a1093eab7414 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -64,7 +64,7 @@
- +
- +
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 28d6900392be5..2e9ff2a0db30b 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -270,7 +270,7 @@
- {{ctx.Locale.Tr "notification.notifications"}} + {{ctx.Locale.Tr "notifications"}}
{{template "repo/issue/view_content/watching" .}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 62f6dc05f91a4..9bf8d74311ad5 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -17,7 +17,7 @@ {{FileSize .Repository.Size}}
- +
diff --git a/templates/repo/settings/webhook/discord.tmpl b/templates/repo/settings/webhook/discord.tmpl index 104346e04219b..df07d8115a50c 100644 --- a/templates/repo/settings/webhook/discord.tmpl +++ b/templates/repo/settings/webhook/discord.tmpl @@ -7,7 +7,7 @@
- +
diff --git a/templates/repo/settings/webhook/slack.tmpl b/templates/repo/settings/webhook/slack.tmpl index e7cae92d4bf16..c694ba06247aa 100644 --- a/templates/repo/settings/webhook/slack.tmpl +++ b/templates/repo/settings/webhook/slack.tmpl @@ -12,7 +12,7 @@
- +
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 5fd971859d841..8daa5bee8d94d 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -4,7 +4,7 @@
{{template "base/alert" .}}
- {{ctx.Locale.Tr "repo.wiki.new_page"}} + {{ctx.Locale.Tr "page"}} {{if .PageIsWikiEdit}} {{ctx.Locale.Tr "repo.wiki.new_page_button"}} {{end}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 563f86137041a..7fccb8fd37638 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -8,7 +8,7 @@
- {{ctx.Locale.Tr "repo.wiki.page"}}: + {{ctx.Locale.Tr "page"}}: {{$title}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 8163007993645..0d5cebaf888cc 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -52,7 +52,7 @@ {{ctx.Locale.Tr "actions.runners.name"}} {{SortArrow "alphabetically" "reversealphabetically" .SortType false}} - {{ctx.Locale.Tr "actions.runners.version"}} + {{ctx.Locale.Tr "version"}} {{ctx.Locale.Tr "actions.runners.owner_type"}} {{ctx.Locale.Tr "actions.runners.labels"}} {{ctx.Locale.Tr "actions.runners.last_online"}} diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl index 7ba0070863089..5b15483154ac4 100644 --- a/templates/shared/repo_search.tmpl +++ b/templates/shared/repo_search.tmpl @@ -28,7 +28,7 @@
- +
diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 7f8ff0eb5a463..f30c3d25ab4a1 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -15,7 +15,7 @@
- +
{{else}} diff --git a/templates/user/auth/finalize_openid.tmpl b/templates/user/auth/finalize_openid.tmpl index 1c1dcdb825bb7..b00526cb7f31b 100644 --- a/templates/user/auth/finalize_openid.tmpl +++ b/templates/user/auth/finalize_openid.tmpl @@ -6,7 +6,7 @@
{{template "base/alert" .}}

- {{ctx.Locale.Tr "auth.login_userpass"}} + {{ctx.Locale.Tr "sign_in"}}

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index d7d3649a4d7b3..64466393df227 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -5,7 +5,7 @@ {{if .LinkAccountMode}} {{ctx.Locale.Tr "auth.oauth_signin_title"}} {{else}} - {{ctx.Locale.Tr "auth.login_userpass"}} + {{ctx.Locale.Tr "sign_in"}} {{end}}
diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl index a5768830652f6..fa0c3afce2173 100644 --- a/templates/user/auth/signin_navbar.tmpl +++ b/templates/user/auth/signin_navbar.tmpl @@ -2,7 +2,7 @@
- {{ctx.Locale.Tr "auth.login_userpass"}} + {{ctx.Locale.Tr "sign_in"}} {{ctx.Locale.Tr "auth.create_new_account"}} diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl index cfd826a0ce210..85c5070e0f946 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -3,7 +3,7 @@ {{if .LinkAccountMode}} {{ctx.Locale.Tr "auth.oauth_signup_title"}} {{else}} - {{ctx.Locale.Tr "sign_up"}} + {{ctx.Locale.Tr "register"}} {{end}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 515e79d739f39..21d33ccb28164 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -1,7 +1,7 @@ {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings account")}}

- {{ctx.Locale.Tr "settings.password"}} + {{ctx.Locale.Tr "password"}}

{{if or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2)}} From bed1b0899d06518cc703a15183319c747ab67ab8 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 18:56:01 +0100 Subject: [PATCH 06/19] deduplicate repository/repositories translation --- options/locale/locale_en-US.ini | 14 +------------- routers/web/admin/repos.go | 4 ++-- routers/web/repo/setting/setting.go | 2 +- routers/web/user/setting/profile.go | 2 +- templates/admin/navbar.tmpl | 2 +- templates/admin/org/list.tmpl | 2 +- templates/admin/packages/list.tmpl | 2 +- templates/admin/user/view.tmpl | 2 +- templates/org/menu.tmpl | 2 +- templates/package/content/alpine.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- templates/repo/settings/webhook/settings.tmpl | 2 +- templates/shared/actions/runner_edit.tmpl | 2 +- templates/user/dashboard/repolist.tmpl | 2 +- templates/user/overview/header.tmpl | 2 +- templates/user/settings/navbar.tmpl | 2 +- templates/user/settings/repos.tmpl | 2 +- 17 files changed, 18 insertions(+), 30 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 468b6f3f41c26..317f756cbbb4f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -51,6 +51,7 @@ webauthn_error_timeout = Timeout reached before your key could be read. Please r webauthn_reload = Reload repository = Repository +repositories = Repositories organization = Organization mirror = Mirror new_repo = New Repository @@ -129,7 +130,6 @@ archived = Archived concept_system_global = Global concept_user_individual = Individual -concept_code_repository = Repository concept_user_organization = Organization show_timestamps = Show timestamps @@ -340,7 +340,6 @@ env_config_keys_prompt = The following environment variables will also be applie nav_menu = Navigation Menu uname_holder = Username or Email Address switch_dashboard_context = Switch Dashboard Context -my_repos = Repositories show_more_repos = Show more repositories… collaborative_repos = Collaborative Repositories my_orgs = My Organizations @@ -363,7 +362,6 @@ show_only_public = Showing only public issues.in_your_repos = In your repositories [explore] -repos = Repositories users = Users organizations = Organizations go_to = Go to @@ -615,7 +613,6 @@ admin_cannot_delete_self = You cannot delete yourself when you are an admin. Ple [user] change_avatar = Change your avatar… joined_on = Joined on %s -repositories = Repositories activity = Public Activity followers = Followers starred = Starred Repositories @@ -671,7 +668,6 @@ ssh_gpg_keys = SSH / GPG Keys social = Social Accounts applications = Applications orgs = Manage Organizations -repos = Repositories delete = Delete Account twofa = Two-Factor Authentication (TOTP) account_link = Linked Accounts @@ -2005,7 +2001,6 @@ contributors.contribution_type.deletions = Deletions settings = Settings settings.desc = Settings is where you can manage the settings for the repository -settings.options = Repository settings.collaboration = Collaborators settings.collaboration.admin = Administrator settings.collaboration.write = Write @@ -2219,7 +2214,6 @@ settings.event_release = Release settings.event_release_desc = Release published, updated or deleted in a repository. settings.event_push = Push settings.event_push_desc = Git push to a repository. -settings.event_repository = Repository settings.event_repository_desc = Repository created or deleted. settings.event_header_issue = Issue Events settings.event_issues = Issues @@ -2730,7 +2724,6 @@ identity_access = Identity & Access users = User Accounts organizations = Organizations assets = Code Assets -repositories = Repositories hooks = Webhooks integrations = Integrations authentication = Authentication Sources @@ -2841,7 +2834,6 @@ users.reserved = Reserved users.bot = Bot users.remote = Remote users.2fa = 2FA -users.repos = Repos users.created = Created users.last_login = Last Sign-In users.never_login = Never Signed-In @@ -2928,7 +2920,6 @@ packages.owner = Owner packages.creator = Creator packages.name = Name packages.type = Type -packages.repository = Repository packages.size = Size packages.published = Published @@ -3382,7 +3373,6 @@ alpine.registry.info = Choose $branch and $repository from the list below. alpine.install = To install the package, run the following command: alpine.repository = Repository Info alpine.repository.branches = Branches -alpine.repository.repositories = Repositories alpine.repository.architectures = Architectures cargo.registry = Setup this registry in the Cargo configuration file (for example ~/.cargo/config.toml): cargo.install = To install the package using Cargo, run the following command: @@ -3392,7 +3382,6 @@ composer.registry = Setup this registry in your ~/.composer/config.json.condarc file: @@ -3543,7 +3532,6 @@ runners.task_list = Recent tasks on this runner runners.task_list.no_tasks = There is no task yet. runners.task_list.run = Run runners.task_list.status = Status -runners.task_list.repository = Repository runners.task_list.commit = Commit runners.task_list.done_at = Done At runners.edit_runner = Edit Runner diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go index ddf4440167686..5c68d44e466fe 100644 --- a/routers/web/admin/repos.go +++ b/routers/web/admin/repos.go @@ -27,7 +27,7 @@ const ( // Repos show all the repositories func Repos(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("admin.repositories") + ctx.Data["Title"] = ctx.Tr("repositories") ctx.Data["PageIsAdminRepositories"] = true explore.RenderRepoSearch(ctx, &explore.RepoSearchOptions{ @@ -62,7 +62,7 @@ func DeleteRepo(ctx *context.Context) { // UnadoptedRepos lists the unadopted repositories func UnadoptedRepos(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("admin.repositories") + ctx.Data["Title"] = ctx.Tr("repositories") ctx.Data["PageIsAdminRepositories"] = true opts := db.ListOptions{ diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index e045e3b8dcc09..656442f66ccaf 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -50,7 +50,7 @@ const ( // SettingsCtxData is a middleware that sets all the general context data for the // settings template. func SettingsCtxData(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.settings.options") + ctx.Data["Title"] = ctx.Tr("repository") ctx.Data["PageIsSettingsOptions"] = true ctx.Data["ForcePrivate"] = setting.Repository.ForcePrivate ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 49eb050dcb63e..306e378a5f5fc 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -210,7 +210,7 @@ func Organization(ctx *context.Context) { // Repos display a list of all repositories of the user func Repos(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings.repos") + ctx.Data["Title"] = ctx.Tr("repositories") ctx.Data["PageIsSettingsRepos"] = true ctx.Data["allowAdopt"] = ctx.IsUserSiteAdmin() || setting.Repository.AllowAdoptionOfUnadoptedRepositories ctx.Data["allowDelete"] = ctx.IsUserSiteAdmin() || setting.Repository.AllowDeleteOfUnadoptedRepositories diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 8f5f231ae854e..6db19bce7f02f 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -33,7 +33,7 @@ {{end}} - {{ctx.Locale.Tr "admin.repositories"}} + {{ctx.Locale.Tr "repositories"}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index efb0a8847e12e..6b6cc5567ef90 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -39,7 +39,7 @@ {{ctx.Locale.Tr "admin.orgs.teams"}} {{ctx.Locale.Tr "admin.orgs.members"}} - {{ctx.Locale.Tr "admin.users.repos"}} + {{ctx.Locale.Tr "repositories"}} {{ctx.Locale.Tr "admin.users.created"}} {{SortArrow "recentupdate" "leastupdate" $.SortType false}} diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index a97f3edb149d2..f2615d9fc1f2d 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -42,7 +42,7 @@ {{SortArrow "version_desc" "version_asc" .SortType false}} {{ctx.Locale.Tr "admin.packages.creator"}} - {{ctx.Locale.Tr "admin.packages.repository"}} + {{ctx.Locale.Tr "repository"}} {{ctx.Locale.Tr "admin.packages.size"}} {{ctx.Locale.Tr "admin.packages.published"}} diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index 4704a375bd54d..08f07ee44d7ea 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -26,7 +26,7 @@

- {{ctx.Locale.Tr "admin.repositories"}} + {{ctx.Locale.Tr "repositories"}}
{{.ReposTotal}}
diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 8eacc17e82a96..f9af7276dc648 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -2,7 +2,7 @@
- {{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}} + {{svg "octicon-repo"}} {{ctx.Locale.Tr "repositories"}} {{if .RepoCount}}
{{.RepoCount}}
{{end}} diff --git a/templates/package/content/alpine.tmpl b/templates/package/content/alpine.tmpl index 5c144b977903c..4b67c98c95312 100644 --- a/templates/package/content/alpine.tmpl +++ b/templates/package/content/alpine.tmpl @@ -32,7 +32,7 @@ {{StringUtils.Join .Branches ", "}} -
{{ctx.Locale.Tr "packages.alpine.repository.repositories"}}
+
{{ctx.Locale.Tr "repositories"}}
{{StringUtils.Join .Repositories ", "}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 0b0ef0b6e8542..5f5a699bafdf5 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -2,7 +2,7 @@
{{ctx.Locale.Tr "repo.settings"}}
 - {{ctx.Locale.Tr "repo.settings.options"}} + {{ctx.Locale.Tr "repository"}} {{ctx.Locale.Tr "repo.settings.collaboration"}} diff --git a/templates/repo/settings/webhook/settings.tmpl b/templates/repo/settings/webhook/settings.tmpl index 4337bd1acdd0a..ca49223eb5511 100644 --- a/templates/repo/settings/webhook/settings.tmpl +++ b/templates/repo/settings/webhook/settings.tmpl @@ -72,7 +72,7 @@
- + {{ctx.Locale.Tr "repo.settings.event_repository_desc"}}
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index fbc730b28898a..b739c04bfdaa5 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -55,7 +55,7 @@ {{ctx.Locale.Tr "actions.runners.task_list.run"}} {{ctx.Locale.Tr "actions.runners.task_list.status"}} - {{ctx.Locale.Tr "actions.runners.task_list.repository"}} + {{ctx.Locale.Tr "repository"}} {{ctx.Locale.Tr "actions.runners.task_list.commit"}} {{ctx.Locale.Tr "actions.runners.task_list.done_at"}} diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index a879f1fb9d870..9c12ed51cc4d2 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -7,7 +7,7 @@ const data = { textRepository: {{ctx.Locale.Tr "repository"}}, textOrganization: {{ctx.Locale.Tr "organization"}}, - textMyRepos: {{ctx.Locale.Tr "home.my_repos"}}, + textMyRepos: {{ctx.Locale.Tr "repositories"}}, textNewRepo: {{ctx.Locale.Tr "new_repo"}}, textSearchRepos: {{ctx.Locale.Tr "search.repo_kind"}}, textFilter: {{ctx.Locale.Tr "home.filter"}}, diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 275c4e295e447..dd0a02421f89c 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -6,7 +6,7 @@ {{end}} - {{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}} + {{svg "octicon-repo"}} {{ctx.Locale.Tr "repositories"}} {{if .RepoCount}}
{{.RepoCount}}
{{end}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index c360944814a45..4b396384ee7b2 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -52,7 +52,7 @@ {{ctx.Locale.Tr "settings.organization"}} - {{ctx.Locale.Tr "settings.repos"}} + {{ctx.Locale.Tr "repositories"}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index d942247da0025..851d6106bdbe1 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -1,7 +1,7 @@ {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings repos")}}

- {{ctx.Locale.Tr "settings.repos"}} + {{ctx.Locale.Tr "repositories"}}

{{if or .allowAdopt .allowDelete}} From d33ce64019c561e304550a831b789adaa8209e7b Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 19:01:09 +0100 Subject: [PATCH 07/19] deduplicate orgnization(s) translation --- models/shared/types/ownertype.go | 2 +- options/locale/locale_en-US.ini | 6 +----- routers/web/admin/orgs.go | 2 +- routers/web/user/setting/profile.go | 2 +- templates/admin/navbar.tmpl | 2 +- templates/admin/user/view.tmpl | 2 +- templates/explore/navbar.tmpl | 2 +- templates/org/settings/navbar.tmpl | 2 +- templates/org/settings/options.tmpl | 2 +- templates/user/settings/navbar.tmpl | 2 +- 10 files changed, 10 insertions(+), 14 deletions(-) diff --git a/models/shared/types/ownertype.go b/models/shared/types/ownertype.go index a1d46c986f9cc..8784b6822d8fc 100644 --- a/models/shared/types/ownertype.go +++ b/models/shared/types/ownertype.go @@ -23,7 +23,7 @@ func (o OwnerType) LocaleString(locale translation.Locale) string { case OwnerTypeRepository: return locale.TrString("concept_code_repository") case OwnerTypeOrganization: - return locale.TrString("concept_user_organization") + return locale.TrString("organization") } return locale.TrString("unknown") } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 317f756cbbb4f..d0f066f1c7df8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -53,6 +53,7 @@ webauthn_reload = Reload repository = Repository repositories = Repositories organization = Organization +organizations = Organizations mirror = Mirror new_repo = New Repository new_migrate = New Migration @@ -130,7 +131,6 @@ archived = Archived concept_system_global = Global concept_user_individual = Individual -concept_user_organization = Organization show_timestamps = Show timestamps show_log_seconds = Show seconds @@ -363,7 +363,6 @@ issues.in_your_repos = In your repositories [explore] users = Users -organizations = Organizations go_to = Go to code = Code code_last_indexed_at = Last indexed %s @@ -671,7 +670,6 @@ orgs = Manage Organizations delete = Delete Account twofa = Two-Factor Authentication (TOTP) account_link = Linked Accounts -organization = Organizations uid = UID webauthn = Two-Factor Authentication (Security Keys) @@ -2622,7 +2620,6 @@ form.name_pattern_not_allowed = The pattern "%s" is not allowed in an organizati form.create_org_not_allowed = You are not allowed to create an organization. settings = Settings -settings.options = Organization settings.full_name = Full Name settings.email = Contact Email settings.website = Website @@ -2722,7 +2719,6 @@ teams.invite.description = Please click the button below to join the team. self_check = Self Check identity_access = Identity & Access users = User Accounts -organizations = Organizations assets = Code Assets hooks = Webhooks integrations = Integrations diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go index c5454db71e39c..d70e02b42e04e 100644 --- a/routers/web/admin/orgs.go +++ b/routers/web/admin/orgs.go @@ -20,7 +20,7 @@ const ( // Organizations show all the organizations func Organizations(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("admin.organizations") + ctx.Data["Title"] = ctx.Tr("organizations") ctx.Data["PageIsAdminOrganizations"] = true if ctx.FormString("sort") == "" { diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 306e378a5f5fc..b00226141a45d 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -179,7 +179,7 @@ func DeleteAvatar(ctx *context.Context) { // Organization render all the organization of the user func Organization(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings.organization") + ctx.Data["Title"] = ctx.Tr("organizations") ctx.Data["PageIsSettingsOrganization"] = true opts := organization.FindOrgOptions{ diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 6db19bce7f02f..51cb675b3698e 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -14,7 +14,7 @@ {{ctx.Locale.Tr "admin.authentication"}} - {{ctx.Locale.Tr "admin.organizations"}} + {{ctx.Locale.Tr "organizations"}} {{ctx.Locale.Tr "admin.users"}} diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index 08f07ee44d7ea..0533aa7e82408 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -35,7 +35,7 @@ {{template "explore/repo_list" .}}

- {{ctx.Locale.Tr "settings.organization"}} + {{ctx.Locale.Tr "organizations"}}
{{.OrgsTotal}}
diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl index 8841613b9f128..4972c7ba20a92 100644 --- a/templates/explore/navbar.tmpl +++ b/templates/explore/navbar.tmpl @@ -9,7 +9,7 @@ {{end}} - {{svg "octicon-organization"}} {{ctx.Locale.Tr "explore.organizations"}} + {{svg "octicon-organization"}} {{ctx.Locale.Tr "organizations"}} {{if and (not $.UnitTypeCode.UnitGlobalDisabled) .IsRepoIndexerEnabled}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index ce792f667c4f9..9beea72d1a8a3 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -2,7 +2,7 @@
{{ctx.Locale.Tr "org.settings"}}
 - {{ctx.Locale.Tr "org.settings.options"}} + {{ctx.Locale.Tr "organization"}} {{if not DisableWebhooks}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 31c0d85d89eda..4c5946a5e0650 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -1,7 +1,7 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}

- {{ctx.Locale.Tr "org.settings.options"}} + {{ctx.Locale.Tr "organization"}}

diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 4b396384ee7b2..eaf183e20ca03 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -49,7 +49,7 @@ {{end}} - {{ctx.Locale.Tr "settings.organization"}} + {{ctx.Locale.Tr "organizations"}} {{ctx.Locale.Tr "repositories"}} From f2621497ce773e710a222eff77f0f6d38c8d6fdd Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 19:05:16 +0100 Subject: [PATCH 08/19] deduplicate remove translation --- options/locale/locale_en-US.ini | 5 ----- templates/org/member/members.tmpl | 4 ++-- templates/org/team/members.tmpl | 6 +++--- templates/repo/issue/view_content/sidebar.tmpl | 2 +- templates/repo/settings/collaboration.tmpl | 4 ++-- templates/repo/settings/deploy_keys.tmpl | 2 +- templates/user/settings/account.tmpl | 2 +- templates/user/settings/applications_oauth2_list.tmpl | 2 +- templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_principal.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- templates/user/settings/security/accountlinks.tmpl | 2 +- templates/user/settings/security/openid.tmpl | 2 +- templates/user/settings/security/webauthn.tmpl | 2 +- 14 files changed, 17 insertions(+), 22 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d0f066f1c7df8..1ffcca3e0deec 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -747,7 +747,6 @@ primary_email = Make Primary activate_email = Send Activation activations_pending = Activations Pending can_not_add_email_activations_pending = There is a pending activation, try again in a few minutes if you want to add a new email. -delete_email = Remove email_deletion = Remove Email Address email_deletion_desc = The email address and related information will be removed from your account. Git commits by this email address will remain unchanged. Continue? email_deletion_success = The email address has been removed. @@ -817,7 +816,6 @@ principal_content = Content add_key_success = The SSH key "%s" has been added. add_gpg_key_success = The GPG key "%s" has been added. add_principal_success = The SSH certificate principal "%s" has been added. -delete_key = Remove ssh_key_deletion = Remove SSH Key gpg_key_deletion = Remove GPG Key ssh_principal_deletion = Remove SSH Certificate Principal @@ -1641,7 +1639,6 @@ issues.dependency.no_permission_1 = "You do not have permission to read %d depen issues.dependency.no_permission_n = "You do not have permission to read %d dependencies" issues.dependency.no_permission.can_remove = "You do not have permission to read this dependency but can remove this dependency" issues.dependency.add = Add dependency… -issues.dependency.remove = Remove issues.dependency.remove_info = Remove this dependency issues.dependency.added_dependency = `added a new dependency %s` issues.dependency.removed_dependency = `removed a dependency %s` @@ -2152,7 +2149,6 @@ settings.add_collaborator_inactive_user = Cannot add an inactive user as a colla settings.add_collaborator_owner = Cannot add an owner as a collaborator. settings.add_collaborator_duplicate = The collaborator is already added to this repository. settings.add_collaborator.blocked_user = The collaborator is blocked by the repository owner or vice versa. -settings.delete_collaborator = Remove settings.collaborator_deletion = Remove Collaborator settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue? settings.remove_collaborator_success = The collaborator has been removed. @@ -2656,7 +2652,6 @@ members.private_helper = make visible members.member_role = Member Role: members.owner = Owner members.member = Member -members.remove = Remove members.remove.detail = Remove %[1]s from %[2]s? members.leave = Leave members.leave.detail = Leave %s? diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 54f84450eb743..23ffa6c7a64a2 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -57,7 +57,7 @@ + data-data-organization-name="{{$.Org.DisplayName}}">{{ctx.Locale.Tr "remove"}} {{end}}
@@ -79,7 +79,7 @@
@@ -78,7 +78,7 @@

{{end}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index d7b5c96bab17f..07ce4d4f3a3cc 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -30,7 +30,7 @@

@@ -76,7 +76,7 @@ {{if $allowedToChangeTeams}}
{{end}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index a79a19682522e..885aefcb8906d 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -60,7 +60,7 @@
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 21d33ccb28164..bd38a81a944bd 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -68,7 +68,7 @@ {{if not .IsPrimary}}
{{if .CanBePrimary}} diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index 56664176cc55f..5563a8c0896d4 100644 --- a/templates/user/settings/applications_oauth2_list.tmpl +++ b/templates/user/settings/applications_oauth2_list.tmpl @@ -27,7 +27,7 @@ {{end}}
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 6ab8b17278f68..74f22540d7605 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -70,7 +70,7 @@
{{if and (not .Verified) (ne $.VerifyingID .KeyID)}} {{ctx.Locale.Tr "settings.gpg_key_verify"}} diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index b6acb63c5e8cc..c430456e60df5 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -27,7 +27,7 @@
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 8408778215834..530e328a11316 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -58,7 +58,7 @@
{{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}} {{ctx.Locale.Tr "settings.ssh_key_verify"}} diff --git a/templates/user/settings/security/accountlinks.tmpl b/templates/user/settings/security/accountlinks.tmpl index 0820844547b90..196514ffecb03 100644 --- a/templates/user/settings/security/accountlinks.tmpl +++ b/templates/user/settings/security/accountlinks.tmpl @@ -41,7 +41,7 @@
diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl index 0e9b4adcbefc9..398775040f2f9 100644 --- a/templates/user/settings/security/openid.tmpl +++ b/templates/user/settings/security/openid.tmpl @@ -31,7 +31,7 @@ {{end}}
diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl index eceee191bd8a7..660a2b570d7d1 100644 --- a/templates/user/settings/security/webauthn.tmpl +++ b/templates/user/settings/security/webauthn.tmpl @@ -17,7 +17,7 @@
From 65c1c34d8a235e6a08056d36814e5a58311ea492 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 19:10:59 +0100 Subject: [PATCH 09/19] deduplicate enabled/disabled translation --- options/locale/locale_en-US.ini | 7 ------- templates/admin/auth/list.tmpl | 2 +- templates/admin/config.tmpl | 8 ++++---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 1ffcca3e0deec..9da90570fccf0 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2928,7 +2928,6 @@ auths.auth_manage_panel = Authentication Source Management auths.new = Add Authentication Source auths.name = Name auths.type = Type -auths.enabled = Enabled auths.syncenabled = Enable User Synchronization auths.updated = Updated auths.auth_type = Authentication Type @@ -3063,7 +3062,6 @@ config.script_type = Script Type config.reverse_auth_user = Reverse Authentication User config.ssh_config = SSH Configuration -config.ssh_enabled = Enabled config.ssh_start_builtin_server = Use Built-In Server config.ssh_domain = SSH Server Domain config.ssh_port = Port @@ -3075,7 +3073,6 @@ config.ssh_minimum_key_size_check = Minimum Key Size Check config.ssh_minimum_key_sizes = Minimum Key Sizes config.lfs_config = LFS Configuration -config.lfs_enabled = Enabled config.lfs_content_path = LFS Content Path config.lfs_http_auth_expiry = LFS HTTP Auth Expiry @@ -3115,7 +3112,6 @@ config.deliver_timeout = Deliver Timeout config.skip_tls_verify = Skip TLS Verification config.mailer_config = Mailer Configuration -config.mailer_enabled = Enabled config.mailer_enable_helo = Enable HELO config.mailer_name = Name config.mailer_protocol = Protocol @@ -3134,7 +3130,6 @@ config.test_mail_failed = Failed to send a testing email to "%s": %v config.test_mail_sent = A testing email has been sent to "%s". config.oauth_config = OAuth Configuration -config.oauth_enabled = Enabled config.cache_config = Cache Configuration config.cache_adapter = Cache Adapter @@ -3171,7 +3166,6 @@ config.git_gc_timeout = GC Operation Timeout config.log_config = Log Configuration config.logger_name_fmt = Logger: %s -config.disabled_logger = Disabled config.access_log_mode = Access Log Mode config.access_log_template = Access Log Template config.xorm_log_sql = Log SQL @@ -3461,7 +3455,6 @@ owner.settings.cleanuprules.none = No cleanup rules available. Please consult th owner.settings.cleanuprules.preview = Cleanup Rule Preview owner.settings.cleanuprules.preview.overview = %d packages are scheduled to be removed. owner.settings.cleanuprules.preview.none = Cleanup rule does not match any packages. -owner.settings.cleanuprules.enabled = Enabled owner.settings.cleanuprules.pattern_full_match = Apply pattern to full package name owner.settings.cleanuprules.keep.title = Versions that match these rules are kept, even if they match a removal rule below. owner.settings.cleanuprules.keep.count = Keep the most recent diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index e916f7b097862..d2ced50156353 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -13,7 +13,7 @@ ID {{ctx.Locale.Tr "admin.auths.name"}} {{ctx.Locale.Tr "admin.auths.type"}} - {{ctx.Locale.Tr "admin.auths.enabled"}} + {{ctx.Locale.Tr "enabled"}} {{ctx.Locale.Tr "admin.auths.updated"}} {{ctx.Locale.Tr "admin.users.created"}} {{ctx.Locale.Tr "edit"}} diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 1627841405fe1..e555cab859b42 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -54,7 +54,7 @@
-
{{ctx.Locale.Tr "admin.config.ssh_enabled"}}
+
{{ctx.Locale.Tr "enabled"}}
{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if not .SSH.Disabled}}
{{ctx.Locale.Tr "admin.config.ssh_start_builtin_server"}}
@@ -89,7 +89,7 @@
-
{{ctx.Locale.Tr "admin.config.lfs_enabled"}}
+
{{ctx.Locale.Tr "enabled"}}
{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if .LFS.StartServer}}
{{ctx.Locale.Tr "admin.config.lfs_content_path"}}
@@ -199,7 +199,7 @@
-
{{ctx.Locale.Tr "admin.config.mailer_enabled"}}
+
{{ctx.Locale.Tr "enabled"}}
{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if .MailerEnabled}}
{{ctx.Locale.Tr "admin.config.mailer_name"}}
@@ -334,7 +334,7 @@ {{if $loggerDetail.IsEnabled}} 
{{$loggerDetail.EventWriters | JsonUtils.EncodeToString | JsonUtils.PrettyIndent}}
{{else}} -
{{ctx.Locale.Tr "admin.config.disabled_logger"}}
+
{{ctx.Locale.Tr "disabled"}}
{{end}} {{end}}
From ff5d2a5dfe114dd6d32b25817a1c50b085a5cb79 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 19:15:22 +0100 Subject: [PATCH 10/19] deduplicate settings translation --- options/locale/locale_en-US.ini | 5 ----- routers/web/admin/config.go | 2 +- templates/admin/navbar.tmpl | 2 +- templates/base/head_navbar.tmpl | 2 +- templates/org/menu.tmpl | 2 +- templates/org/team/new.tmpl | 2 +- templates/org/team/sidebar.tmpl | 2 +- templates/package/settings.tmpl | 2 +- templates/package/view.tmpl | 2 +- templates/repo/header.tmpl | 4 ++-- templates/repo/settings/navbar.tmpl | 2 +- templates/user/settings/navbar.tmpl | 2 +- 12 files changed, 12 insertions(+), 17 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9da90570fccf0..47a42dcc8dc7b 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -68,7 +68,6 @@ account_settings = Account Settings settings = Settings your_profile = Profile your_starred = Starred -your_settings = Settings all = All sources = Sources @@ -1994,7 +1993,6 @@ contributors.contribution_type.commits = Commits contributors.contribution_type.additions = Additions contributors.contribution_type.deletions = Deletions -settings = Settings settings.desc = Settings is where you can manage the settings for the repository settings.collaboration = Collaborators settings.collaboration.admin = Administrator @@ -2615,7 +2613,6 @@ form.name_reserved = The organization name "%s" is reserved. form.name_pattern_not_allowed = The pattern "%s" is not allowed in an organization name. form.create_org_not_allowed = You are not allowed to create an organization. -settings = Settings settings.full_name = Full Name settings.email = Contact Email settings.website = Website @@ -2674,7 +2671,6 @@ teams.write_access_helper = Members can read and push to team repositories. teams.admin_access = Administrator Access teams.admin_access_helper = Members can pull and push to team repositories and add collaborators to them. teams.no_desc = This team has no description -teams.settings = Settings teams.owners_permission_desc = Owners have full access to all repositories and have administrator access to the organization. teams.members = Team Members teams.update_settings = Update Settings @@ -2721,7 +2717,6 @@ authentication = Authentication Sources emails = User Emails config = Configuration config_summary = Summary -config_settings = Settings notices = System Notices monitor = Monitoring first_page = First diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go index 2f5f17e2013f2..3f76e2837e350 100644 --- a/routers/web/admin/config.go +++ b/routers/web/admin/config.go @@ -171,7 +171,7 @@ func Config(ctx *context.Context) { } func ConfigSettings(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("admin.config_settings") + ctx.Data["Title"] = ctx.Tr("settings") ctx.Data["PageIsAdminConfig"] = true ctx.Data["PageIsAdminConfigSettings"] = true ctx.Data["DefaultOpenWithEditorAppsString"] = setting.DefaultOpenWithEditorApps().ToTextareaString() diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 51cb675b3698e..758d48b5a7cb2 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -82,7 +82,7 @@ {{ctx.Locale.Tr "admin.config_summary"}} - {{ctx.Locale.Tr "admin.config_settings"}} + {{ctx.Locale.Tr "settings"}}
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 4f48dc82c3270..e9501c955e94b 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -169,7 +169,7 @@ {{svg "octicon-tools"}} - {{ctx.Locale.Tr "your_settings"}} + {{ctx.Locale.Tr "settings"}} {{svg "octicon-question"}} diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index f9af7276dc648..d828fb08f27ad 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -41,7 +41,7 @@ {{end}} {{if .IsOrganizationOwner}} - {{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}} + {{svg "octicon-tools"}} {{ctx.Locale.Tr "settings"}} {{end}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 50ef53b91b2eb..9fb194a5d553e 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -7,7 +7,7 @@
{{.CsrfTokenHtml}}

- {{if .PageIsOrgTeamsNew}}{{ctx.Locale.Tr "org.create_new_team"}}{{else}}{{ctx.Locale.Tr "org.teams.settings"}}{{end}} + {{if .PageIsOrgTeamsNew}}{{ctx.Locale.Tr "org.create_new_team"}}{{else}}{{ctx.Locale.Tr "settings"}}{{end}}

{{template "base/alert" .}} diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 9311a46e38f75..134f5beb94d9c 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -79,7 +79,7 @@
{{if .IsOrganizationOwner}}
- {{svg "octicon-gear"}} {{ctx.Locale.Tr "org.teams.settings"}} + {{svg "octicon-gear"}} {{ctx.Locale.Tr "settings"}}
{{end}}
diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl index 9424baf4939ef..8e42ce09dd0d6 100644 --- a/templates/package/settings.tmpl +++ b/templates/package/settings.tmpl @@ -10,7 +10,7 @@ {{template "user/overview/header" .}} {{end}} {{template "base/alert" .}} -

{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}}) / {{ctx.Locale.Tr "repo.settings"}}

+

{{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}}) / {{ctx.Locale.Tr "settings"}}

{{ctx.Locale.Tr "packages.settings.link"}}

diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 54af71126f098..c5d9821154734 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -103,7 +103,7 @@
{{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{ctx.Locale.Tr "repo.issues"}}
{{end}} {{if .CanWritePackages}} -
{{svg "octicon-tools" 16 "gt-mr-3"}} {{ctx.Locale.Tr "repo.settings"}}
+
{{svg "octicon-tools" 16 "gt-mr-3"}} {{ctx.Locale.Tr "settings"}}
{{end}} {{end}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 6e0a9985f704b..63188f768e7cd 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -215,14 +215,14 @@ {{if .Permission.IsAdmin}} - {{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}} + {{svg "octicon-tools"}} {{ctx.Locale.Tr "settings"}} {{end}} {{else if .Permission.IsAdmin}}
- {{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}} + {{svg "octicon-tools"}} {{ctx.Locale.Tr "settings"}}
{{end}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 5f5a699bafdf5..089d6761a1410 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -1,6 +1,6 @@
-
{{ctx.Locale.Tr "repo.settings"}}
+
{{ctx.Locale.Tr "settings"}}
{{ctx.Locale.Tr "repository"}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index eaf183e20ca03..f7a4f6db77281 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -1,6 +1,6 @@
-
{{ctx.Locale.Tr "user.settings"}}
+
{{ctx.Locale.Tr "settings"}}
{{ctx.Locale.Tr "settings.profile"}} From 5d811d45400f174211fc84cd742a284cec335692 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 20:05:17 +0100 Subject: [PATCH 11/19] deduplicate permissions translations --- options/locale/locale_en-US.ini | 27 ++++++---------------- routers/web/repo/setting/collaboration.go | 2 +- templates/admin/org/list.tmpl | 2 +- templates/admin/packages/list.tmpl | 2 +- templates/admin/repo/list.tmpl | 2 +- templates/admin/user/list.tmpl | 4 ++-- templates/admin/user/view_details.tmpl | 2 +- templates/org/member/members.tmpl | 2 +- templates/org/team/new.tmpl | 8 +++---- templates/org/team/sidebar.tmpl | 4 ++-- templates/repo/create.tmpl | 2 +- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/git.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/onedev.tmpl | 2 +- templates/repo/pulls/fork.tmpl | 2 +- templates/repo/settings/collaboration.tmpl | 12 +++++----- templates/repo/settings/deploy_keys.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- templates/user/settings/applications.tmpl | 2 +- 24 files changed, 40 insertions(+), 53 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 47a42dcc8dc7b..fc07c1ffd3735 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -108,6 +108,13 @@ copy_error = Copy failed copy_type_unsupported = This file type cannot be copied write = Write +read = Read +owner = Owner +member = Member +members = Members +admin = Admin +collaborator = Collaborator +collaborators = Collaborators preview = Preview loading = Loading… @@ -829,8 +836,6 @@ valid_until_date = Valid until %s valid_forever = Valid forever last_used = Last used on no_activity = No recent activity -can_read_info = Read -can_write_info = Write key_state_desc = This key has been used in the last 7 days token_state_desc = This token has been used in the last 7 days principal_state_desc = This principal has been used in the last 7 days @@ -859,7 +864,6 @@ permissions_public_only = Public only permissions_access_all = All (public, private, and limited) select_permissions = Select permissions permission_no_access = No Access -permission_read = Read permission_write = Read and Write access_token_desc = Selected token permissions limit authorization only to the corresponding API routes. Read the documentation for more information. at_least_one_permission = You must select at least one permission to create a token @@ -957,7 +961,6 @@ visibility.private_tooltip = Visible only to members of organizations you have j [repo] new_repo_helper = A repository contains all project files, including revision history. Already hosting one elsewhere? Migrate repository. -owner = Owner owner_helper = Some organizations may not show up in the dropdown due to a maximum repository count limit. repo_name = Repository Name repo_name_helper = Good repository names use short, memorable and unique keywords. @@ -1994,11 +1997,6 @@ contributors.contribution_type.additions = Additions contributors.contribution_type.deletions = Deletions settings.desc = Settings is where you can manage the settings for the repository -settings.collaboration = Collaborators -settings.collaboration.admin = Administrator -settings.collaboration.write = Write -settings.collaboration.read = Read -settings.collaboration.owner = Owner settings.collaboration.undefined = Undefined settings.hooks = Webhooks settings.githooks = Git Hooks @@ -2118,7 +2116,6 @@ settings.signing_settings = Signing Verification Settings settings.trust_model = Signature Trust Model settings.trust_model.default = Default Trust Model settings.trust_model.default.desc= Use the default repository trust model for this installation. -settings.trust_model.collaborator = Collaborator settings.trust_model.collaborator.long = Collaborator: Trust signatures by collaborators settings.trust_model.collaborator.desc = Valid signatures by collaborators of this repository will be marked "trusted" - (whether they match the committer or not). Otherwise, valid signatures will be marked "untrusted" if the signature matches the committer and "unmatched" if not. settings.trust_model.committer = Committer @@ -2592,7 +2589,6 @@ org_full_name_holder = Organization Full Name org_name_helper = Organization names should be short and memorable. create_org = Create Organization repo_updated = Updated -members = Members teams = Teams code = Code lower_members = members @@ -2647,8 +2643,6 @@ members.public_helper = make hidden members.private = Hidden members.private_helper = make visible members.member_role = Member Role: -members.owner = Owner -members.member = Member members.remove.detail = Remove %[1]s from %[2]s? members.leave = Leave members.leave.detail = Leave %s? @@ -2664,9 +2658,7 @@ teams.none_access = No Access teams.none_access_helper = Members cannot view or do any other action on this unit. It has no effect for public repositories. teams.general_access = General Access teams.general_access_helper = Members permissions will be decided by below permission table. -teams.read_access = Read teams.read_access_helper = Members can view and clone team repositories. -teams.write_access = Write teams.write_access_helper = Members can read and push to team repositories. teams.admin_access = Administrator Access teams.admin_access_helper = Members can pull and push to team repositories and add collaborators to them. @@ -2814,7 +2806,6 @@ users.user_manage_panel = User Account Management users.new_account = Create User Account users.full_name = Full Name users.activated = Activated -users.admin = Admin users.restricted = Restricted users.reserved = Reserved users.bot = Bot @@ -2855,7 +2846,6 @@ users.list_status_filter.menu_text = Filter users.list_status_filter.reset = Reset users.list_status_filter.is_active = Active users.list_status_filter.not_active = Inactive -users.list_status_filter.is_admin = Admin users.list_status_filter.not_admin = Not Admin users.list_status_filter.is_restricted = Restricted users.list_status_filter.not_restricted = Not Restricted @@ -2881,13 +2871,11 @@ emails.change_email_text = Are you sure you want to update this email address? orgs.org_manage_panel = Organization Management orgs.name = Name orgs.teams = Teams -orgs.members = Members orgs.new_orga = New Organization repos.repo_manage_panel = Repository Management repos.unadopted = Unadopted Repositories repos.unadopted.no_more = No more unadopted repositories found -repos.owner = Owner repos.name = Name repos.private = Private repos.watches = Watches @@ -2902,7 +2890,6 @@ packages.total_size = Total Size: %s packages.unreferenced_size = Unreferenced Size: %s packages.cleanup = Clean up expired data packages.cleanup.success = Cleaned up expired data successfully -packages.owner = Owner packages.creator = Creator packages.name = Name packages.type = Type diff --git a/routers/web/repo/setting/collaboration.go b/routers/web/repo/setting/collaboration.go index 31f9f76d0f996..b8afcd1e51fad 100644 --- a/routers/web/repo/setting/collaboration.go +++ b/routers/web/repo/setting/collaboration.go @@ -24,7 +24,7 @@ import ( // Collaboration render a repository's collaboration page func Collaboration(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.settings.collaboration") + ctx.Data["Title"] = ctx.Tr("collaborators") ctx.Data["PageIsSettingsCollaboration"] = true users, _, err := repo_model.GetCollaborators(ctx, &repo_model.FindCollaborationOptions{RepoID: ctx.Repo.Repository.ID}) diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 6b6cc5567ef90..281fe1eb0adde 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -38,7 +38,7 @@ {{SortArrow "alphabetically" "reversealphabetically" $.SortType true}} {{ctx.Locale.Tr "admin.orgs.teams"}} - {{ctx.Locale.Tr "admin.orgs.members"}} + {{ctx.Locale.Tr "members"}} {{ctx.Locale.Tr "repositories"}} {{ctx.Locale.Tr "admin.users.created"}} diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index f2615d9fc1f2d..e2fc0d0a70e6f 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -31,7 +31,7 @@ ID - {{ctx.Locale.Tr "admin.packages.owner"}} + {{ctx.Locale.Tr "owner"}} {{ctx.Locale.Tr "admin.packages.type"}} {{ctx.Locale.Tr "admin.packages.name"}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index e977c8307c412..999f7c18d1c21 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -14,7 +14,7 @@ ID{{SortArrow "oldest" "newest" $.SortType false}} - {{ctx.Locale.Tr "admin.repos.owner"}} + {{ctx.Locale.Tr "owner"}} {{ctx.Locale.Tr "admin.repos.name"}} {{SortArrow "alphabetically" "reversealphabetically" $.SortType false}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 1c0477a8925af..0e7eee23339e1 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -18,7 +18,7 @@
{{ctx.Locale.Tr "admin.users.list_status_filter.reset"}}
- +
@@ -83,7 +83,7 @@ {{.Name}} {{if .IsAdmin}} - {{ctx.Locale.Tr "admin.users.admin"}} + {{ctx.Locale.Tr "admin"}} {{else if eq 2 .Type}}{{/* Reserved user */}} {{ctx.Locale.Tr "admin.users.reserved"}} {{else if eq 4 .Type}}{{/* Bot "user" */}} diff --git a/templates/admin/user/view_details.tmpl b/templates/admin/user/view_details.tmpl index be2f32b5ec7de..2999004ae921c 100644 --- a/templates/admin/user/view_details.tmpl +++ b/templates/admin/user/view_details.tmpl @@ -7,7 +7,7 @@
{{template "shared/user/name" .User}} {{if .User.IsAdmin}} - {{ctx.Locale.Tr "admin.users.admin"}} + {{ctx.Locale.Tr "admin"}} {{end}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 23ffa6c7a64a2..1d98cd79a735f 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -21,7 +21,7 @@ {{if not $.PublicOnly}}
{{ctx.Locale.Tr "org.members.member_role"}} - {{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{ctx.Locale.Tr "org.members.owner"}}{{else}}{{ctx.Locale.Tr "org.members.member"}}{{end}} + {{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{ctx.Locale.Tr "owner"}}{{else}}{{ctx.Locale.Tr "member"}}{{end}}
{{if $.IsOrganizationOwner}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 9fb194a5d553e..fb6e7ef2e658b 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -79,9 +79,9 @@ {{ctx.Locale.Tr "units.unit"}} {{ctx.Locale.Tr "org.teams.none_access"}} {{svg "octicon-question" 16 "gt-ml-2"}} - {{ctx.Locale.Tr "org.teams.read_access"}} + {{ctx.Locale.Tr "read"}} {{svg "octicon-question" 16 "gt-ml-2"}} - {{ctx.Locale.Tr "org.teams.write_access"}} + {{ctx.Locale.Tr "write"}} {{svg "octicon-question" 16 "gt-ml-2"}} @@ -104,12 +104,12 @@
- +
- +
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 134f5beb94d9c..b7fcf38f40745 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -64,9 +64,9 @@ {{if eq ($.Team.UnitAccessMode $.Context $unit.Type) 0 -}} {{ctx.Locale.Tr "org.teams.none_access"}} {{- else if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $.Context $unit.Type) 1) -}} - {{ctx.Locale.Tr "org.teams.read_access"}} + {{ctx.Locale.Tr "read"}} {{- else if eq ($.Team.UnitAccessMode $.Context $unit.Type) 2 -}} - {{ctx.Locale.Tr "org.teams.write_access"}} + {{ctx.Locale.Tr "write"}} {{- end}} {{end}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 2a1093eab7414..f4524d476a303 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -17,7 +17,7 @@
{{end}}
- +
diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl index 439a8838637a6..9f31fcb014905 100644 --- a/templates/repo/migrate/codebase.tmpl +++ b/templates/repo/migrate/codebase.tmpl @@ -58,7 +58,7 @@
- +
diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl index db01b8d85822d..f4db9c7ca4cfd 100644 --- a/templates/repo/migrate/git.tmpl +++ b/templates/repo/migrate/git.tmpl @@ -32,7 +32,7 @@
- +
diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl index d1f1db99ba79d..1627e54b5c02b 100644 --- a/templates/repo/migrate/gitbucket.tmpl +++ b/templates/repo/migrate/gitbucket.tmpl @@ -74,7 +74,7 @@
- +
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index 143f2204495d2..fef46c65a0d53 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -70,7 +70,7 @@
- +
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index dfb2b4bc469d8..e4447f0a278ce 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -72,7 +72,7 @@
- +
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 76c2828257625..3c1cbc17e6c22 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -69,7 +69,7 @@
- +
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index b01d0eeb67cde..4391df660b669 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -72,7 +72,7 @@
- +
diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl index 8b2a2d8730218..d4ced2c690903 100644 --- a/templates/repo/migrate/onedev.tmpl +++ b/templates/repo/migrate/onedev.tmpl @@ -58,7 +58,7 @@
- +
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index f0907f409bafd..54abeaa6f2b29 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -10,7 +10,7 @@
{{template "base/alert" .}}
- +
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 07ce4d4f3a3cc..81aeb7003698f 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -1,7 +1,7 @@ {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings collaboration")}}

- {{ctx.Locale.Tr "repo.settings.collaboration"}} + {{ctx.Locale.Tr "collaborators"}}

{{if .Collaborators}}
@@ -20,12 +20,12 @@
{{svg "octicon-shield-lock"}}
-
{{if eq .Collaboration.Mode 1}}{{ctx.Locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{ctx.Locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{ctx.Locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{ctx.Locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
+
{{if eq .Collaboration.Mode 1}}{{ctx.Locale.Tr "read"}}{{else if eq .Collaboration.Mode 2}}{{ctx.Locale.Tr "write"}}{{else if eq .Collaboration.Mode 3}}{{ctx.Locale.Tr "admin"}}{{else}}{{ctx.Locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-
{{ctx.Locale.Tr "repo.settings.collaboration.admin"}}
-
{{ctx.Locale.Tr "repo.settings.collaboration.write"}}
-
{{ctx.Locale.Tr "repo.settings.collaboration.read"}}
+
{{ctx.Locale.Tr "admin"}}
+
{{ctx.Locale.Tr "write"}}
+
{{ctx.Locale.Tr "read"}}
@@ -64,7 +64,7 @@
{{svg "octicon-shield-lock"}} - {{if eq .AccessMode 1}}{{ctx.Locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{ctx.Locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{ctx.Locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{ctx.Locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{ctx.Locale.Tr "repo.settings.collaboration.undefined"}}{{end}} + {{if eq .AccessMode 1}}{{ctx.Locale.Tr "read"}}{{else if eq .AccessMode 2}}{{ctx.Locale.Tr "write"}}{{else if eq .AccessMode 3}}{{ctx.Locale.Tr "admin"}}{{else if eq .AccessMode 4}}{{ctx.Locale.Tr "owner"}}{{else}}{{ctx.Locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
{{if or (eq .AccessMode 1) (eq .AccessMode 2)}} {{$first := true}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 885aefcb8906d..0a7e62368b3dc 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -55,7 +55,7 @@ {{.Fingerprint}}
- {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - {{ctx.Locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "settings.can_write_info"}} {{end}} + {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - {{ctx.Locale.Tr "read"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "write"}} {{end}}
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 089d6761a1410..2809fad23fa98 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -5,7 +5,7 @@ {{ctx.Locale.Tr "repository"}} - {{ctx.Locale.Tr "repo.settings.collaboration"}} + {{ctx.Locale.Tr "collaborators"}} {{if not DisableWebhooks}} diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 9c3e4f6f72d23..9459517123e29 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -81,7 +81,7 @@
From 38594cc56c423935b250c16ca54c3e8701fec02d Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 20:11:34 +0100 Subject: [PATCH 12/19] deduplicate issues translation --- options/locale/locale_en-US.ini | 4 ---- templates/admin/repo/list.tmpl | 2 +- templates/package/view.tmpl | 2 +- templates/repo/header.tmpl | 4 ++-- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/onedev.tmpl | 2 +- templates/repo/settings/options.tmpl | 2 +- templates/repo/settings/webhook/settings.tmpl | 2 +- 13 files changed, 13 insertions(+), 17 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index fc07c1ffd3735..9af31f381f25e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1103,7 +1103,6 @@ migrate_items = Migration Items migrate_items_wiki = Wiki migrate_items_milestones = Milestones migrate_items_labels = Labels -migrate_items_issues = Issues migrate_items_pullrequests = Pull Requests migrate_items_merge_requests = Merge Requests migrate_items_releases = Releases @@ -1176,7 +1175,6 @@ filter_branch_and_tag = Filter branch or tag find_tag = Find tag branches = Branches tags = Tags -issues = Issues pulls = Pull Requests project_board = Projects packages = Packages @@ -2205,7 +2203,6 @@ settings.event_push = Push settings.event_push_desc = Git push to a repository. settings.event_repository_desc = Repository created or deleted. settings.event_header_issue = Issue Events -settings.event_issues = Issues settings.event_issues_desc = Issue opened, closed, reopened, or edited. settings.event_issue_assign = Issue Assigned settings.event_issue_assign_desc = Issue assigned or unassigned. @@ -2881,7 +2878,6 @@ repos.private = Private repos.watches = Watches repos.stars = Stars repos.forks = Forks -repos.issues = Issues repos.size = Size repos.lfs_size = LFS Size diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 999f7c18d1c21..d01371ac3e87a 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -28,7 +28,7 @@ {{ctx.Locale.Tr "admin.repos.forks"}} {{SortArrow "mostforks" "fewestforks" $.SortType false}} - {{ctx.Locale.Tr "admin.repos.issues"}} + {{ctx.Locale.Tr "issues"}} {{ctx.Locale.Tr "admin.repos.size"}} {{SortArrow "gitsize" "reversegitsize" $.SortType false}} diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index c5d9821154734..dd41fcd9a8a37 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -100,7 +100,7 @@
{{if .HasRepositoryAccess}} -
{{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{ctx.Locale.Tr "repo.issues"}}
+
{{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{ctx.Locale.Tr "issues"}}
{{end}} {{if .CanWritePackages}}
{{svg "octicon-tools" 16 "gt-mr-3"}} {{ctx.Locale.Tr "settings"}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 63188f768e7cd..57ccb29275b1e 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -137,7 +137,7 @@ {{if .Permission.CanRead $.UnitTypeIssues}} - {{svg "octicon-issue-opened"}} {{ctx.Locale.Tr "repo.issues"}} + {{svg "octicon-issue-opened"}} {{ctx.Locale.Tr "issues"}} {{if .Repository.NumOpenIssues}} {{CountFmt .Repository.NumOpenIssues}} {{end}} @@ -146,7 +146,7 @@ {{if .Permission.CanRead $.UnitTypeExternalTracker}} - {{svg "octicon-link-external"}} {{ctx.Locale.Tr "repo.issues"}} + {{svg "octicon-link-external"}} {{ctx.Locale.Tr "issues"}} {{end}} diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl index 9f31fcb014905..226076b3c7129 100644 --- a/templates/repo/migrate/codebase.tmpl +++ b/templates/repo/migrate/codebase.tmpl @@ -46,7 +46,7 @@
- +
diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl index 1627e54b5c02b..4aaf13c2a2ee5 100644 --- a/templates/repo/migrate/gitbucket.tmpl +++ b/templates/repo/migrate/gitbucket.tmpl @@ -48,7 +48,7 @@
- +
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index fef46c65a0d53..587770d39b6eb 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -44,7 +44,7 @@
- +
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index e4447f0a278ce..24a95a897e1bc 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -46,7 +46,7 @@
- +
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 3c1cbc17e6c22..25e53126ec2e3 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -43,7 +43,7 @@
- +
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index 4391df660b669..d0f50d65387f1 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -44,7 +44,7 @@
- +
diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl index d4ced2c690903..685178527fdc5 100644 --- a/templates/repo/migrate/onedev.tmpl +++ b/templates/repo/migrate/onedev.tmpl @@ -46,7 +46,7 @@
- +
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 9bf8d74311ad5..2434ba8e26bbb 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -359,7 +359,7 @@ {{$isExternalTrackerGlobalDisabled := .UnitTypeExternalTracker.UnitGlobalDisabled}} {{$isIssuesAndExternalGlobalDisabled := and $isIssuesGlobalDisabled $isExternalTrackerGlobalDisabled}}
- +
diff --git a/templates/repo/settings/webhook/settings.tmpl b/templates/repo/settings/webhook/settings.tmpl index ca49223eb5511..6814c67fe8c8c 100644 --- a/templates/repo/settings/webhook/settings.tmpl +++ b/templates/repo/settings/webhook/settings.tmpl @@ -118,7 +118,7 @@
- + {{ctx.Locale.Tr "repo.settings.event_issues_desc"}}
From a411dd4be233e86bdbb3f038c5fd052e0091cc84 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 20:15:28 +0100 Subject: [PATCH 13/19] deduplicate name translation --- options/locale/locale_en-US.ini | 10 ---------- services/forms/repo_form.go | 2 +- templates/admin/config.tmpl | 4 ++-- templates/admin/cron.tmpl | 2 +- templates/admin/org/list.tmpl | 2 +- templates/admin/packages/list.tmpl | 2 +- templates/admin/repo/list.tmpl | 2 +- templates/package/shared/cleanup_rules/preview.tmpl | 2 +- templates/repo/issue/labels/edit_delete_label.tmpl | 2 +- templates/repo/issue/labels/label_new.tmpl | 2 +- templates/shared/actions/runner_list.tmpl | 2 +- 11 files changed, 11 insertions(+), 21 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9af31f381f25e..b2fea714c33dd 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1544,7 +1544,6 @@ issues.remove_request_review_block=Can't remove review request issues.dismiss_review = Dismiss Review issues.dismiss_review_warning = Are you sure you want to dismiss this review? issues.sign_in_require_desc = Sign in to join this conversation. -issues.label_title = Name issues.label_description = Description issues.label_color = Color issues.label_exclusive = Exclusive @@ -2866,14 +2865,12 @@ emails.change_email_header = Update Email Properties emails.change_email_text = Are you sure you want to update this email address? orgs.org_manage_panel = Organization Management -orgs.name = Name orgs.teams = Teams orgs.new_orga = New Organization repos.repo_manage_panel = Repository Management repos.unadopted = Unadopted Repositories repos.unadopted.no_more = No more unadopted repositories found -repos.name = Name repos.private = Private repos.watches = Watches repos.stars = Stars @@ -2887,7 +2884,6 @@ packages.unreferenced_size = Unreferenced Size: %s packages.cleanup = Clean up expired data packages.cleanup.success = Cleaned up expired data successfully packages.creator = Creator -packages.name = Name packages.type = Type packages.size = Size packages.published = Published @@ -2904,7 +2900,6 @@ systemhooks.update_webhook = Update System Webhook auths.auth_manage_panel = Authentication Source Management auths.new = Add Authentication Source -auths.name = Name auths.type = Type auths.syncenabled = Enable User Synchronization auths.updated = Updated @@ -3057,7 +3052,6 @@ config.lfs_http_auth_expiry = LFS HTTP Auth Expiry config.db_config = Database Configuration config.db_type = Type config.db_host = Host -config.db_name = Name config.db_schema = Schema config.db_ssl_mode = SSL config.db_path = Path @@ -3091,7 +3085,6 @@ config.skip_tls_verify = Skip TLS Verification config.mailer_config = Mailer Configuration config.mailer_enable_helo = Enable HELO -config.mailer_name = Name config.mailer_protocol = Protocol config.mailer_smtp_addr = SMTP Addr config.mailer_smtp_port = SMTP Port @@ -3153,7 +3146,6 @@ config.set_setting_failed = Set setting %s failed monitor.stats = Stats monitor.cron = Cron Tasks -monitor.name = Name monitor.schedule = Schedule monitor.next = Next Time monitor.previous = Previous Time @@ -3173,7 +3165,6 @@ monitor.process.children = Children monitor.queues = Queues monitor.queue = Queue: %s -monitor.queue.name = Name monitor.queue.type = Type monitor.queue.exemplar = Exemplar Type monitor.queue.numberworkers = Number of Workers @@ -3484,7 +3475,6 @@ runners.new = Create new Runner runners.new_notice = How to start a runner runners.status = Status runners.id = ID -runners.name = Name runners.owner_type = Type runners.description = Description runners.labels = Labels diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index e45a2a1695522..810d2e9047448 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -566,7 +566,7 @@ func (f *CreateMilestoneForm) Validate(req *http.Request, errs binding.Errors) b // CreateLabelForm form for creating label type CreateLabelForm struct { ID int64 - Title string `binding:"Required;MaxSize(50)" locale:"repo.issues.label_title"` + Title string `binding:"Required;MaxSize(50)" locale:"name"` Exclusive bool `form:"exclusive"` IsArchived bool `form:"is_archived"` Description string `binding:"MaxSize(200)" locale:"repo.issues.label_description"` diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index e555cab859b42..59b156341d20d 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -110,7 +110,7 @@ {{if not (eq .DbCfg.Type "sqlite3")}}
{{ctx.Locale.Tr "admin.config.db_host"}}
{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}
-
{{ctx.Locale.Tr "admin.config.db_name"}}
+
{{ctx.Locale.Tr "name"}}
{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}
{{ctx.Locale.Tr "username"}}
{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}
@@ -202,7 +202,7 @@
{{ctx.Locale.Tr "enabled"}}
{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if .MailerEnabled}} -
{{ctx.Locale.Tr "admin.config.mailer_name"}}
+
{{ctx.Locale.Tr "name"}}
{{.Mailer.Name}}
{{if eq .Mailer.Protocol "sendmail"}}
{{ctx.Locale.Tr "admin.config.mailer_use_sendmail"}}
diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl index af30cc06e1581..744e90bd0a5f3 100644 --- a/templates/admin/cron.tmpl +++ b/templates/admin/cron.tmpl @@ -9,7 +9,7 @@ - {{ctx.Locale.Tr "admin.monitor.name"}} + {{ctx.Locale.Tr "name"}} {{ctx.Locale.Tr "admin.monitor.schedule"}} {{ctx.Locale.Tr "admin.monitor.next"}} {{ctx.Locale.Tr "admin.monitor.previous"}} diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 281fe1eb0adde..53060f362ac60 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -34,7 +34,7 @@ ID{{SortArrow "oldest" "newest" $.SortType false}} - {{ctx.Locale.Tr "admin.orgs.name"}} + {{ctx.Locale.Tr "name"}} {{SortArrow "alphabetically" "reversealphabetically" $.SortType true}} {{ctx.Locale.Tr "admin.orgs.teams"}} diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index e2fc0d0a70e6f..71ad36652e785 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -34,7 +34,7 @@ {{ctx.Locale.Tr "owner"}} {{ctx.Locale.Tr "admin.packages.type"}} - {{ctx.Locale.Tr "admin.packages.name"}} + {{ctx.Locale.Tr "name"}} {{SortArrow "name_asc" "name_desc" .SortType false}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index d01371ac3e87a..c41b8598179e1 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -16,7 +16,7 @@ ID{{SortArrow "oldest" "newest" $.SortType false}} {{ctx.Locale.Tr "owner"}} - {{ctx.Locale.Tr "admin.repos.name"}} + {{ctx.Locale.Tr "name"}} {{SortArrow "alphabetically" "reversealphabetically" $.SortType false}} {{ctx.Locale.Tr "admin.repos.watches"}} diff --git a/templates/package/shared/cleanup_rules/preview.tmpl b/templates/package/shared/cleanup_rules/preview.tmpl index ada2fdca0847f..394dbc8be0e88 100644 --- a/templates/package/shared/cleanup_rules/preview.tmpl +++ b/templates/package/shared/cleanup_rules/preview.tmpl @@ -7,7 +7,7 @@ {{ctx.Locale.Tr "admin.packages.type"}} - {{ctx.Locale.Tr "admin.packages.name"}} + {{ctx.Locale.Tr "name"}} {{ctx.Locale.Tr "version"}} {{ctx.Locale.Tr "admin.packages.creator"}} {{ctx.Locale.Tr "admin.packages.size"}} diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index 7ddc38a387313..4f8ce244f5030 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -18,7 +18,7 @@ {{.CsrfTokenHtml}}
- +
diff --git a/templates/repo/issue/labels/label_new.tmpl b/templates/repo/issue/labels/label_new.tmpl index 2b2b2336c4338..bf0d91d030b43 100644 --- a/templates/repo/issue/labels/label_new.tmpl +++ b/templates/repo/issue/labels/label_new.tmpl @@ -6,7 +6,7 @@ {{.CsrfTokenHtml}}
- +
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 0d5cebaf888cc..14189544ec5fe 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -49,7 +49,7 @@ {{SortArrow "oldest" "newest" .SortType false}} - {{ctx.Locale.Tr "actions.runners.name"}} + {{ctx.Locale.Tr "name"}} {{SortArrow "alphabetically" "reversealphabetically" .SortType false}} {{ctx.Locale.Tr "version"}} From 9c526d8409b4d1e10abd5d3002c33b4839c008ff Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 20:21:36 +0100 Subject: [PATCH 14/19] deduplicate label(s) translation --- options/locale/locale_en-US.ini | 11 +++-------- routers/web/org/org_labels.go | 2 +- routers/web/org/setting.go | 2 +- routers/web/repo/issue_label.go | 4 ++-- templates/org/settings/navbar.tmpl | 2 +- templates/package/content/container.tmpl | 2 +- templates/repo/issue/filter_actions.tmpl | 2 +- templates/repo/issue/filter_list.tmpl | 4 ++-- .../repo/issue/labels/labels_selector_field.tmpl | 2 +- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/onedev.tmpl | 2 +- templates/shared/actions/runner_edit.tmpl | 2 +- templates/shared/actions/runner_list.tmpl | 2 +- templates/user/settings/appearance.tmpl | 2 +- 20 files changed, 24 insertions(+), 29 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b2fea714c33dd..b39b2f48b82cb 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -162,6 +162,9 @@ filter.private = Private no_results_found = No results found. +label = Label +labels = Labels + [search] search = Search... type_tooltip = Search type @@ -703,7 +706,6 @@ hidden_comment_types_description = Comment types checked here will not be shown hidden_comment_types.ref_tooltip = Comments where this issue was referenced from another issue/commit/… hidden_comment_types.issue_ref_tooltip = Comments where the user changes the branch/tag associated with the issue comment_type_group_reference = Reference -comment_type_group_label = Label comment_type_group_milestone = Milestone comment_type_group_assignee = Assignee comment_type_group_title = Title @@ -1102,7 +1104,6 @@ migrate_options_lfs_endpoint.placeholder = If left blank, the endpoint will be d migrate_items = Migration Items migrate_items_wiki = Wiki migrate_items_milestones = Milestones -migrate_items_labels = Labels migrate_items_pullrequests = Pull Requests migrate_items_merge_requests = Merge Requests migrate_items_releases = Releases @@ -1179,7 +1180,6 @@ pulls = Pull Requests project_board = Projects packages = Packages actions = Actions -labels = Labels org_labels_desc = Organization level labels that can be used with all repositories under this organization org_labels_desc_manage = manage @@ -1382,7 +1382,6 @@ issues.filter_labels = Filter Label issues.filter_reviewers = Filter Reviewer issues.new = New Issue issues.new.title_empty = Title cannot be empty -issues.new.labels = Labels issues.new.no_label = No Label issues.new.clear_labels = Clear labels issues.new.projects = Projects @@ -1442,7 +1441,6 @@ issues.change_ref_at = `changed reference from %s to issues.remove_ref_at = `removed reference %s %s` issues.add_ref_at = `added reference %s %s` issues.delete_branch_at = `deleted branch %s %s` -issues.filter_label = Label issues.filter_label_exclude = `Use alt + click/enter to exclude labels` issues.filter_label_no_select = All labels issues.filter_label_select_no_label = No label @@ -1481,7 +1479,6 @@ issues.filter_sort.mostforks = Most forks issues.filter_sort.fewestforks = Fewest forks issues.action_open = Open issues.action_close = Close -issues.action_label = Label issues.action_milestone = Milestone issues.action_milestone_no_select = No milestone issues.action_assignee = Assignee @@ -3346,7 +3343,6 @@ container.pull = Pull the image from the command line: container.digest = Digest: container.multi_arch = OS / Arch container.layers = Image Layers -container.labels = Labels container.labels.key = Key container.labels.value = Value cran.registry = Setup this registry in your Rprofile.site file: @@ -3477,7 +3473,6 @@ runners.status = Status runners.id = ID runners.owner_type = Type runners.description = Description -runners.labels = Labels runners.last_online = Last Online Time runners.runner_title = Runner runners.task_list = Recent tasks on this runner diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go index 02eae8052ea2a..dffc55fd50c78 100644 --- a/routers/web/org/org_labels.go +++ b/routers/web/org/org_labels.go @@ -33,7 +33,7 @@ func RetrieveLabels(ctx *context.Context) { // NewLabel create new label for organization func NewLabel(ctx *context.Context) { form := web.GetForm(ctx).(*forms.CreateLabelForm) - ctx.Data["Title"] = ctx.Tr("repo.labels") + ctx.Data["Title"] = ctx.Tr("labels") ctx.Data["PageIsLabels"] = true ctx.Data["PageIsOrgSettings"] = true diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 494ada4323a66..4c65f69a4fc9e 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -241,7 +241,7 @@ func DeleteWebhook(ctx *context.Context) { // Labels render organization labels page func Labels(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.labels") + ctx.Data["Title"] = ctx.Tr("labels") ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsOrgSettingsLabels"] = true ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index 81bee4dbb531c..a4a0140ad2df5 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -25,7 +25,7 @@ const ( // Labels render issue's labels page func Labels(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.labels") + ctx.Data["Title"] = ctx.Tr("labels") ctx.Data["PageIsIssueList"] = true ctx.Data["PageIsLabels"] = true ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles @@ -101,7 +101,7 @@ func RetrieveLabels(ctx *context.Context) { // NewLabel create new label for repository func NewLabel(ctx *context.Context) { form := web.GetForm(ctx).(*forms.CreateLabelForm) - ctx.Data["Title"] = ctx.Tr("repo.labels") + ctx.Data["Title"] = ctx.Tr("labels") ctx.Data["PageIsLabels"] = true if ctx.HasError() { diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 9beea72d1a8a3..404217361d2bf 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -10,7 +10,7 @@ {{end}} - {{ctx.Locale.Tr "repo.labels"}} + {{ctx.Locale.Tr "labels"}} {{if .EnableOAuth2}} diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl index fe393f4388968..cd07d1e8f126f 100644 --- a/templates/package/content/container.tmpl +++ b/templates/package/content/container.tmpl @@ -67,7 +67,7 @@
{{end}} {{if .PackageDescriptor.Metadata.Labels}} -

{{ctx.Locale.Tr "packages.container.labels"}}

+

{{ctx.Locale.Tr "labels"}}

diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl index f573b8e09ea2d..0622042767341 100644 --- a/templates/repo/issue/filter_actions.tmpl +++ b/templates/repo/issue/filter_actions.tmpl @@ -15,7 +15,7 @@
- {{ctx.Locale.Tr "repo.issues.action_label"}} + {{ctx.Locale.Tr "label"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index d0086fdf8c2b6..54e5c45f75ec8 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -1,13 +1,13 @@
- {{ctx.Locale.Tr "repo.issues.filter_label"}} + {{ctx.Locale.Tr "label"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{svg "octicon-search" 16}} - +
- {{ctx.Locale.Tr "repo.issues.new.labels"}} + {{ctx.Locale.Tr "labels"}} {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 16110597ed98a..e3b4d9576d73b 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@

- {{ctx.Locale.Tr "repo.labels"}} + {{ctx.Locale.Tr "labels"}} {{ctx.Locale.Tr "repo.milestones"}}

diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl index 226076b3c7129..d1825fe7d3316 100644 --- a/templates/repo/migrate/codebase.tmpl +++ b/templates/repo/migrate/codebase.tmpl @@ -39,7 +39,7 @@
- +
diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl index 4aaf13c2a2ee5..63e7dd6711296 100644 --- a/templates/repo/migrate/gitbucket.tmpl +++ b/templates/repo/migrate/gitbucket.tmpl @@ -44,7 +44,7 @@
- +
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index 587770d39b6eb..1bf75c01b44d1 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -40,7 +40,7 @@
- +
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index 24a95a897e1bc..8f14b09f5441c 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -42,7 +42,7 @@
- +
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 25e53126ec2e3..3c39497efae13 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -39,7 +39,7 @@
- +
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index d0f50d65387f1..c958693b903f7 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -40,7 +40,7 @@
- +
diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl index 685178527fdc5..495666390ff19 100644 --- a/templates/repo/migrate/onedev.tmpl +++ b/templates/repo/migrate/onedev.tmpl @@ -39,7 +39,7 @@
- +
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index b739c04bfdaa5..433fb14fd1e9b 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -16,7 +16,7 @@ {{if .Runner.LastOnline}}{{TimeSinceUnix .Runner.LastOnline ctx.Locale}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}
- + {{range .Runner.AgentLabels}} {{.}} diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 14189544ec5fe..d3b4a34480f76 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -54,7 +54,7 @@
- + diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl index 0997d721e13ac..56877b91d2920 100644 --- a/templates/user/settings/appearance.tmpl +++ b/templates/user/settings/appearance.tmpl @@ -85,7 +85,7 @@
- +
From 21257145a9944de6644ce41f96c4fa3fdc0dd6c3 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 20:25:14 +0100 Subject: [PATCH 15/19] deduplicate milestone(s) translation --- options/locale/locale_en-US.ini | 7 +------ routers/web/repo/milestone.go | 2 +- templates/repo/issue/filter_actions.tmpl | 2 +- templates/repo/issue/filter_list.tmpl | 4 ++-- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 2 +- templates/repo/issue/view_content/sidebar.tmpl | 2 +- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/onedev.tmpl | 2 +- templates/user/settings/appearance.tmpl | 2 +- 15 files changed, 16 insertions(+), 21 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b39b2f48b82cb..650718e2eaa71 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -78,6 +78,7 @@ forks = Forks activities = Activities pull_requests = Pull Requests issues = Issues +milestone = Milestone milestones = Milestones ok = OK @@ -706,7 +707,6 @@ hidden_comment_types_description = Comment types checked here will not be shown hidden_comment_types.ref_tooltip = Comments where this issue was referenced from another issue/commit/… hidden_comment_types.issue_ref_tooltip = Comments where the user changes the branch/tag associated with the issue comment_type_group_reference = Reference -comment_type_group_milestone = Milestone comment_type_group_assignee = Assignee comment_type_group_title = Title comment_type_group_branch = Branch @@ -1103,7 +1103,6 @@ migrate_options_lfs_endpoint.description.local = A local server path is supporte migrate_options_lfs_endpoint.placeholder = If left blank, the endpoint will be derived from the clone URL migrate_items = Migration Items migrate_items_wiki = Wiki -migrate_items_milestones = Milestones migrate_items_pullrequests = Pull Requests migrate_items_merge_requests = Merge Requests migrate_items_releases = Releases @@ -1183,7 +1182,6 @@ actions = Actions org_labels_desc = Organization level labels that can be used with all repositories under this organization org_labels_desc_manage = manage -milestones = Milestones commits = Commits commit = Commit release = Release @@ -1390,7 +1388,6 @@ issues.new.no_projects = No project issues.new.open_projects = Open Projects issues.new.closed_projects = Closed Projects issues.new.no_items = No items -issues.new.milestone = Milestone issues.new.no_milestone = No Milestone issues.new.clear_milestone = Clear milestone issues.new.open_milestone = Open Milestones @@ -1444,7 +1441,6 @@ issues.delete_branch_at = `deleted branch %s %s` issues.filter_label_exclude = `Use alt + click/enter to exclude labels` issues.filter_label_no_select = All labels issues.filter_label_select_no_label = No label -issues.filter_milestone = Milestone issues.filter_milestone_all = All milestones issues.filter_milestone_none = No milestones issues.filter_milestone_open = Open milestones @@ -1479,7 +1475,6 @@ issues.filter_sort.mostforks = Most forks issues.filter_sort.fewestforks = Fewest forks issues.action_open = Open issues.action_close = Close -issues.action_milestone = Milestone issues.action_milestone_no_select = No milestone issues.action_assignee = Assignee issues.action_assignee_no_select = No assignee diff --git a/routers/web/repo/milestone.go b/routers/web/repo/milestone.go index c41b844ce4de8..900d6f71014c3 100644 --- a/routers/web/repo/milestone.go +++ b/routers/web/repo/milestone.go @@ -33,7 +33,7 @@ const ( // Milestones render milestones page func Milestones(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.milestones") + ctx.Data["Title"] = ctx.Tr("milestones") ctx.Data["PageIsIssueList"] = true ctx.Data["PageIsMilestones"] = true diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl index 0622042767341..eb348474ecd98 100644 --- a/templates/repo/issue/filter_actions.tmpl +++ b/templates/repo/issue/filter_actions.tmpl @@ -40,7 +40,7 @@
- {{ctx.Locale.Tr "repo.issues.action_milestone"}} + {{ctx.Locale.Tr "milestone"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index 54e5c45f75ec8..62f34953112a5 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -53,13 +53,13 @@
- {{ctx.Locale.Tr "repo.issues.filter_milestone"}} + {{ctx.Locale.Tr "milestone"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{svg "octicon-search" 16}} - +
{{ctx.Locale.Tr "repo.issues.filter_milestone_all"}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index e3b4d9576d73b..8c06685942150 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@

{{ctx.Locale.Tr "labels"}} - {{ctx.Locale.Tr "repo.milestones"}} + {{ctx.Locale.Tr "milestones"}}

diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index b2b9e308f5fc4..2591de086286a 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -58,7 +58,7 @@
- {{ctx.Locale.Tr "repo.issues.new.milestone"}} + {{ctx.Locale.Tr "milestone"}} {{if .HasIssuesOrPullsWritePermission}} {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index b2d1fdca2b2b9..4d0b3cb251f8e 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -130,7 +130,7 @@
- {{ctx.Locale.Tr "repo.issues.new.milestone"}} + {{ctx.Locale.Tr "milestone"}} {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} {{svg "octicon-gear" 16 "gt-ml-2"}} {{end}} diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl index d1825fe7d3316..c36cc04e0cd59 100644 --- a/templates/repo/migrate/codebase.tmpl +++ b/templates/repo/migrate/codebase.tmpl @@ -35,7 +35,7 @@
- +
diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl index 63e7dd6711296..ee9f0ac197b45 100644 --- a/templates/repo/migrate/gitbucket.tmpl +++ b/templates/repo/migrate/gitbucket.tmpl @@ -66,7 +66,7 @@
- +
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index 1bf75c01b44d1..8354be658638a 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -62,7 +62,7 @@
- +
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index 8f14b09f5441c..8f67d02eb51e7 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -64,7 +64,7 @@
- +
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 3c39497efae13..fcf80dfba6bd3 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -61,7 +61,7 @@
- +
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index c958693b903f7..d0dd017974e38 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -51,7 +51,7 @@
- +
diff --git a/templates/shared/user/org_profile_avatar.tmpl b/templates/shared/user/org_profile_avatar.tmpl index a8846b0abd68e..c32db0c4a3614 100644 --- a/templates/shared/user/org_profile_avatar.tmpl +++ b/templates/shared/user/org_profile_avatar.tmpl @@ -7,7 +7,7 @@ {{.DisplayName}} {{if .Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} - {{if .Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} + {{if .Visibility.IsPrivate}}
{{ctx.Locale.Tr "private"}}
{{end}} diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index af07897e2c8f0..ef7cdf6abe95b 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -7,7 +7,7 @@ {{.ContextUser.ShortName 40}} {{if .ContextUser.Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} - {{if .ContextUser.Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} + {{if .ContextUser.Visibility.IsPrivate}}
{{ctx.Locale.Tr "private"}}
{{end}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -21,7 +21,7 @@ {{.SignedUser.ShortName 40}} {{if .SignedUser.Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} - {{if .SignedUser.Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} + {{if .SignedUser.Visibility.IsPrivate}}
{{ctx.Locale.Tr "private"}}
{{end}} {{range .Orgs}} @@ -30,7 +30,7 @@ {{.ShortName 40}} {{if .Visibility.IsLimited}}
{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} - {{if .Visibility.IsPrivate}}
{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} + {{if .Visibility.IsPrivate}}
{{ctx.Locale.Tr "private"}}
{{end}} {{end}} diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index 9c12ed51cc4d2..ba98fda7060ea 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -12,7 +12,7 @@ const data = { textSearchRepos: {{ctx.Locale.Tr "search.repo_kind"}}, textFilter: {{ctx.Locale.Tr "home.filter"}}, textShowArchived: {{ctx.Locale.Tr "home.show_archived"}}, - textShowPrivate: {{ctx.Locale.Tr "home.show_private"}}, + textShowPrivate: {{ctx.Locale.Tr "private"}}, textShowBothArchivedUnarchived: {{ctx.Locale.Tr "home.show_both_archived_unarchived"}}, textShowOnlyUnarchived: {{ctx.Locale.Tr "home.show_only_unarchived"}}, @@ -37,7 +37,7 @@ const data = { textNewOrg: {{ctx.Locale.Tr "new_org"}}, textOrgVisibilityLimited: {{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}, - textOrgVisibilityPrivate: {{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}, + textOrgVisibilityPrivate: {{ctx.Locale.Tr "private"}}, }; {{if .Team}} diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index d1c68656b6d8f..3230be196e882 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -52,19 +52,19 @@ {{if .SignedUser.Visibility.IsLimited}}{{end}} {{if .SignedUser.Visibility.IsPrivate}}{{end}}
- {{if .SignedUser.Visibility.IsPublic}}{{ctx.Locale.Tr "settings.visibility.public"}}{{end}} + {{if .SignedUser.Visibility.IsPublic}}{{ctx.Locale.Tr "public"}}{{end}} {{if .SignedUser.Visibility.IsLimited}}{{ctx.Locale.Tr "settings.visibility.limited"}}{{end}} - {{if .SignedUser.Visibility.IsPrivate}}{{ctx.Locale.Tr "settings.visibility.private"}}{{end}} + {{if .SignedUser.Visibility.IsPrivate}}{{ctx.Locale.Tr "private"}}{{end}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{range $mode := .AllowedUserVisibilityModes}} {{if $mode.IsPublic}} -
{{ctx.Locale.Tr "settings.visibility.public"}}
+
{{ctx.Locale.Tr "public"}}
{{else if $mode.IsLimited}}
{{ctx.Locale.Tr "settings.visibility.limited"}}
{{else if $mode.IsPrivate}} -
{{ctx.Locale.Tr "settings.visibility.private"}}
+
{{ctx.Locale.Tr "private"}}
{{end}} {{end}}
From e972033fb3bb7c643023f66fb6835f10b94a524b Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 20:43:58 +0100 Subject: [PATCH 17/19] fix broken strings --- templates/org/create.tmpl | 2 +- templates/org/settings/options.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index 1b19994b631cc..01188350e7ed0 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -20,7 +20,7 @@
- +
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 0c71acbcbc144..ecfdbd8324608 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -41,7 +41,7 @@
- +
From f02eee2d2bad395fa5cb6e0f2ed3dcb245b6e86f Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 20:55:54 +0100 Subject: [PATCH 18/19] deduplicate type translation --- options/locale/locale_en-US.ini | 10 ++-------- templates/admin/auth/list.tmpl | 2 +- templates/admin/config.tmpl | 2 +- templates/admin/notice.tmpl | 2 +- templates/admin/packages/list.tmpl | 4 ++-- templates/admin/queue.tmpl | 2 +- templates/admin/queue_manage.tmpl | 2 +- templates/package/shared/cleanup_rules/edit.tmpl | 2 +- templates/package/shared/cleanup_rules/preview.tmpl | 2 +- templates/package/shared/list.tmpl | 2 +- templates/repo/issue/filter_list.tmpl | 2 +- templates/shared/actions/runner_edit.tmpl | 2 +- templates/shared/actions/runner_list.tmpl | 2 +- .../user/notification/notification_subscriptions.tmpl | 2 +- 14 files changed, 16 insertions(+), 22 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 323423faae3a4..8a39ae3bc405d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -167,6 +167,8 @@ no_results_found = No results found. label = Label labels = Labels +type = Type + [search] search = Search... type_tooltip = Search type @@ -1449,7 +1451,6 @@ issues.filter_assginee_no_select = All assignees issues.filter_assginee_no_assignee = No assignee issues.filter_poster = Author issues.filter_poster_no_select = All authors -issues.filter_type = Type issues.filter_type.all_issues = All issues issues.filter_type.assigned_to_you = Assigned to you issues.filter_type.created_by_you = Created by you @@ -2869,7 +2870,6 @@ packages.unreferenced_size = Unreferenced Size: %s packages.cleanup = Clean up expired data packages.cleanup.success = Cleaned up expired data successfully packages.creator = Creator -packages.type = Type packages.size = Size packages.published = Published @@ -2885,7 +2885,6 @@ systemhooks.update_webhook = Update System Webhook auths.auth_manage_panel = Authentication Source Management auths.new = Add Authentication Source -auths.type = Type auths.syncenabled = Enable User Synchronization auths.updated = Updated auths.auth_type = Authentication Type @@ -3035,7 +3034,6 @@ config.lfs_content_path = LFS Content Path config.lfs_http_auth_expiry = LFS HTTP Auth Expiry config.db_config = Database Configuration -config.db_type = Type config.db_host = Host config.db_schema = Schema config.db_ssl_mode = SSL @@ -3150,7 +3148,6 @@ monitor.process.children = Children monitor.queues = Queues monitor.queue = Queue: %s -monitor.queue.type = Type monitor.queue.exemplar = Exemplar Type monitor.queue.numberworkers = Number of Workers monitor.queue.activeworkers = Active Workers @@ -3175,7 +3172,6 @@ notices.deselect_all = Deselect All notices.inverse_selection = Inverse Selection notices.delete_selected = Delete Selected notices.delete_all = Delete All Notices -notices.type = Type notices.type_1 = Repository notices.type_2 = Task notices.desc = Description @@ -3284,7 +3280,6 @@ empty = There are no packages yet. empty.documentation = For more information on the package registry, see the documentation. empty.repo = Did you upload a package, but it's not shown here? Go to package settings and link it to this repo. registry.documentation = For more information on the %s registry, see the documentation. -filter.type = Type filter.type.all = All filter.no_result = Your filter produced no results. filter.container.tagged = Tagged @@ -3459,7 +3454,6 @@ runners.new = Create new Runner runners.new_notice = How to start a runner runners.status = Status runners.id = ID -runners.owner_type = Type runners.description = Description runners.last_online = Last Online Time runners.runner_title = Runner diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index d2ced50156353..37e6acd055d93 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -12,7 +12,7 @@
- + diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 59b156341d20d..3da250f422b17 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -105,7 +105,7 @@
-
{{ctx.Locale.Tr "admin.config.db_type"}}
+
{{ctx.Locale.Tr "type"}}
{{.DbCfg.Type}}
{{if not (eq .DbCfg.Type "sqlite3")}}
{{ctx.Locale.Tr "admin.config.db_host"}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index e0abe4f8c0639..1ea1745d9edb4 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -8,7 +8,7 @@
- + diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 71ad36652e785..352e3c1429eb5 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -16,7 +16,7 @@
{{template "shared/search/input" dict "Value" .Query}}
- + - + diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl index 80214d10214b9..74c5ed3da3836 100644 --- a/templates/admin/queue_manage.tmpl +++ b/templates/admin/queue_manage.tmpl @@ -8,7 +8,7 @@ - + diff --git a/templates/package/shared/cleanup_rules/edit.tmpl b/templates/package/shared/cleanup_rules/edit.tmpl index 138a90791c387..e36f9cc9ab2e3 100644 --- a/templates/package/shared/cleanup_rules/edit.tmpl +++ b/templates/package/shared/cleanup_rules/edit.tmpl @@ -10,7 +10,7 @@
- +
{{ctx.Locale.Tr "version"}} {{ctx.Locale.Tr "actions.runners.owner_type"}}{{ctx.Locale.Tr "actions.runners.labels"}}{{ctx.Locale.Tr "labels"}} {{ctx.Locale.Tr "actions.runners.last_online"}} {{ctx.Locale.Tr "edit"}}
ID {{ctx.Locale.Tr "admin.auths.name"}}{{ctx.Locale.Tr "admin.auths.type"}}{{ctx.Locale.Tr "type"}} {{ctx.Locale.Tr "enabled"}} {{ctx.Locale.Tr "admin.auths.updated"}} {{ctx.Locale.Tr "admin.users.created"}}
ID{{ctx.Locale.Tr "admin.notices.type"}}{{ctx.Locale.Tr "type"}} {{ctx.Locale.Tr "admin.notices.desc"}} {{ctx.Locale.Tr "admin.users.created"}} {{ctx.Locale.Tr "admin.notices.op"}}
ID {{ctx.Locale.Tr "owner"}}{{ctx.Locale.Tr "admin.packages.type"}}{{ctx.Locale.Tr "type"}} {{ctx.Locale.Tr "name"}} {{SortArrow "name_asc" "name_desc" .SortType false}} diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index 1be35cf7659dd..bb885156ee21b 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -8,7 +8,7 @@
{{ctx.Locale.Tr "admin.monitor.queue.name"}}{{ctx.Locale.Tr "admin.monitor.queue.type"}}{{ctx.Locale.Tr "type"}} {{ctx.Locale.Tr "admin.monitor.queue.exemplar"}} {{ctx.Locale.Tr "admin.monitor.queue.numberworkers"}} {{ctx.Locale.Tr "admin.monitor.queue.activeworkers"}}
{{ctx.Locale.Tr "admin.monitor.queue.name"}}{{ctx.Locale.Tr "admin.monitor.queue.type"}}{{ctx.Locale.Tr "type"}} {{ctx.Locale.Tr "admin.monitor.queue.exemplar"}} {{ctx.Locale.Tr "admin.monitor.queue.numberworkers"}} {{ctx.Locale.Tr "admin.monitor.queue.activeworkers"}}
- + diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index a9ee023061ca4..53c978af33682 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -4,7 +4,7 @@
{{template "shared/search/input" dict "Value" .Query "Placeholder" (ctx.Locale.Tr "search.package_kind")}}
- + diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index a37f0c352e046..506e907b6a1fb 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -32,7 +32,7 @@
- {{ctx.Locale.Tr "repo.issues.filter_type"}} + {{ctx.Locale.Tr "type"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
From 105e10e8c35d848b7f15334eac92cb588c0bef3a Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 15 Mar 2024 21:03:18 +0100 Subject: [PATCH 19/19] deduplicate description translation --- options/locale/locale_en-US.ini | 12 +----------- services/forms/repo_form.go | 2 +- templates/admin/notice.tmpl | 2 +- templates/org/settings/options.tmpl | 2 +- templates/org/team/new.tmpl | 2 +- templates/projects/new.tmpl | 4 ++-- templates/repo/create.tmpl | 4 ++-- templates/repo/issue/labels/edit_delete_label.tmpl | 2 +- templates/repo/issue/labels/label_new.tmpl | 2 +- templates/repo/issue/milestone_new.tmpl | 2 +- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/git.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/onedev.tmpl | 2 +- templates/repo/pulls/fork.tmpl | 2 +- templates/repo/settings/options.tmpl | 2 +- templates/shared/actions/runner_edit.tmpl | 2 +- 21 files changed, 23 insertions(+), 33 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8a39ae3bc405d..b10f079cc983a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -147,6 +147,7 @@ download_logs = Download logs confirm_delete_selected = Confirm to delete all selected items? name = Name +description = Description value = Value filter = Filter @@ -992,7 +993,6 @@ download_tar = Download TAR.GZ download_bundle = Download BUNDLE generate_repo = Generate Repository generate_from = Generate From -repo_desc = Description repo_desc_helper = Enter short description (optional) repo_gitignore_helper = Select .gitignore templates. repo_gitignore_helper_desc = Choose which files not to track from a list of templates for common languages. Typical artifacts generated by each language's build tools are included on .gitignore by default. @@ -1331,8 +1331,6 @@ ext_issues.desc = Link to an external issue tracker. projects = Projects projects.desc = Manage issues and pulls in project boards. -projects.description = Description (optional) -projects.description_placeholder = Description projects.create = Create Project projects.title = Title projects.new = New Project @@ -1407,7 +1405,6 @@ issues.no_ref = No Branch/Tag Specified issues.create = Create Issue issues.new_label = New Label issues.new_label_placeholder = Label name -issues.new_label_desc_placeholder = Description issues.create_label = Create Label issues.label_templates.title = Load a predefined set of labels issues.label_templates.info = No labels exist yet. Create a label with 'New Label' or use a predefined label set: @@ -1533,7 +1530,6 @@ issues.remove_request_review_block=Can't remove review request issues.dismiss_review = Dismiss Review issues.dismiss_review_warning = Are you sure you want to dismiss this review? issues.sign_in_require_desc = Sign in to join this conversation. -issues.label_description = Description issues.label_color = Color issues.label_exclusive = Exclusive issues.label_archive = Archive Label @@ -1848,7 +1844,6 @@ milestones.new_subheader = Milestones can help you organize issues and track the milestones.completeness = %d%% Completed milestones.create = Create Milestone milestones.title = Title -milestones.desc = Description milestones.due_date = Due Date (optional) milestones.clear = Clear milestones.invalid_due_date_format = "Due date format must be 'yyyy-mm-dd'." @@ -2580,9 +2575,7 @@ lower_members = members lower_repositories = repositories create_new_team = New Team create_team = Create Team -org_desc = Description 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 @@ -3137,7 +3130,6 @@ monitor.process = Running Processes monitor.stacktrace = Stacktrace monitor.processes_count = %d Processes monitor.download_diagnosis_report = Download diagnosis report -monitor.desc = Description monitor.start = Start Time monitor.execute_time = Execution Time monitor.last_execution_result = Result @@ -3174,7 +3166,6 @@ notices.delete_selected = Delete Selected notices.delete_all = Delete All Notices notices.type_1 = Repository notices.type_2 = Task -notices.desc = Description notices.op = Op. notices.delete_success = The system notices have been deleted. @@ -3454,7 +3445,6 @@ runners.new = Create new Runner runners.new_notice = How to start a runner runners.status = Status runners.id = ID -runners.description = Description runners.last_online = Last Online Time runners.runner_title = Runner runners.task_list = Recent tasks on this runner diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 810d2e9047448..3e20b5e648e14 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -569,7 +569,7 @@ type CreateLabelForm struct { Title string `binding:"Required;MaxSize(50)" locale:"name"` Exclusive bool `form:"exclusive"` IsArchived bool `form:"is_archived"` - Description string `binding:"MaxSize(200)" locale:"repo.issues.label_description"` + Description string `binding:"MaxSize(200)" locale:"description"` Color string `binding:"Required;MaxSize(7)" locale:"repo.issues.label_color"` } diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 1ea1745d9edb4..cacbd56ecaeea 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -9,7 +9,7 @@
- + diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index ecfdbd8324608..0d54c37228c5d 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -23,7 +23,7 @@
- +
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index fb6e7ef2e658b..d3b44806af961 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -20,7 +20,7 @@ {{ctx.Locale.Tr "org.team_name_helper"}}
- + {{ctx.Locale.Tr "org.team_desc_helper"}}
diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index f1efbac89141f..73f7c7fa1d3e8 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -17,8 +17,8 @@
- - + +
{{if not .PageIsEditProjects}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index f4524d476a303..30349684f4df1 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -60,8 +60,8 @@ {{ctx.Locale.Tr "repo.visibility_description"}}
- - + +
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index 4f8ce244f5030..7cb6ff220cf63 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -45,7 +45,7 @@
- +
diff --git a/templates/repo/issue/labels/label_new.tmpl b/templates/repo/issue/labels/label_new.tmpl index bf0d91d030b43..5773b1527a76c 100644 --- a/templates/repo/issue/labels/label_new.tmpl +++ b/templates/repo/issue/labels/label_new.tmpl @@ -20,7 +20,7 @@ {{ctx.Locale.Tr "repo.issues.label_exclusive_desc"}}
- +
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index b1b202edc32cc..05106b6eb469f 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -35,7 +35,7 @@
- +
diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl index c36cc04e0cd59..26045bd20e10f 100644 --- a/templates/repo/migrate/codebase.tmpl +++ b/templates/repo/migrate/codebase.tmpl @@ -98,7 +98,7 @@
- +
diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl index f4db9c7ca4cfd..44955f25fa2ee 100644 --- a/templates/repo/migrate/git.tmpl +++ b/templates/repo/migrate/git.tmpl @@ -72,7 +72,7 @@
- +
diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl index ee9f0ac197b45..1ea3bde56de70 100644 --- a/templates/repo/migrate/gitbucket.tmpl +++ b/templates/repo/migrate/gitbucket.tmpl @@ -114,7 +114,7 @@
- +
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index 8354be658638a..873fd67515182 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -110,7 +110,7 @@
- +
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index 8f67d02eb51e7..cdd72d4f1b957 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -112,7 +112,7 @@
- +
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index fcf80dfba6bd3..3db020deec69c 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -109,7 +109,7 @@
- +
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index d0dd017974e38..741196bf4c5c1 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -112,7 +112,7 @@
- +
diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl index 4336e60aaf9cb..d7ddb62db2b76 100644 --- a/templates/repo/migrate/onedev.tmpl +++ b/templates/repo/migrate/onedev.tmpl @@ -98,7 +98,7 @@
- +
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 54abeaa6f2b29..3fec9701ae7d1 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -72,7 +72,7 @@
- +
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 2434ba8e26bbb..cf027b1c385a6 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -37,7 +37,7 @@ {{end}}
- +
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index 6f019b13a7344..da736fc6c0adf 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -32,7 +32,7 @@
- +
{{ctx.Locale.Tr "admin.packages.type"}}{{ctx.Locale.Tr "type"}} {{ctx.Locale.Tr "name"}} {{ctx.Locale.Tr "version"}} {{ctx.Locale.Tr "admin.packages.creator"}}{{ctx.Locale.Tr "version"}}{{ctx.Locale.Tr "actions.runners.owner_type"}}{{ctx.Locale.Tr "type"}} {{ctx.Locale.Tr "labels"}} {{ctx.Locale.Tr "actions.runners.last_online"}} {{ctx.Locale.Tr "edit"}} ID {{ctx.Locale.Tr "type"}}{{ctx.Locale.Tr "admin.notices.desc"}}{{ctx.Locale.Tr "description"}} {{ctx.Locale.Tr "admin.users.created"}} {{ctx.Locale.Tr "admin.notices.op"}}