From 3c57a6205056a4e144f138d838684fea1d88b8dd Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Sat, 23 Mar 2024 17:27:31 +0100 Subject: [PATCH] Restore the "repo.pulls.no_results" translation key The previous (cherry picked) commit changed a translation key, from `repo.pulls.no_results` to `common.no_results_found`. This would break existing translations, and will have to be handled differently, if at all. This changes the affected code to continue using the old key. Signed-off-by: Gergely Nagy --- options/locale/locale_en-US.ini | 3 +-- templates/repo/branch_dropdown.tmpl | 2 +- templates/repo/diff/compare.tmpl | 2 +- templates/repo/issue/branch_selector_field.tmpl | 6 +++--- templates/repo/issue/view_title.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d046b247b9..50871be86d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -156,8 +156,6 @@ filter.not_template = Not Template filter.public = Public filter.private = Private -no_results_found = No results found. - [aria] navbar = Navigation Bar footer = Footer @@ -1776,6 +1774,7 @@ pulls.compare_compare = pull from pulls.switch_comparison_type = Switch comparison type pulls.switch_head_and_base = Switch head and base pulls.filter_branch = Filter branch +pulls.no_results = No results found. pulls.show_all_commits = Show all commits pulls.show_changes_since_your_last_review = Show changes since your last review pulls.showing_only_single_commit = Showing only changes of commit %[1]s diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 367c6aab98..8a5cdc7cc7 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -56,7 +56,7 @@ 'repoLink': {{.root.RepoLink}}, 'treePath': {{.root.TreePath}}, 'branchNameSubURL': {{.root.BranchNameSubURL}}, - 'noResults': {{ctx.Locale.Tr "no_results_found"}}, + 'noResults': {{ctx.Locale.Tr "repo.pulls.no_results"}}, }; {{if .release}} data.release = { diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 32d0dc9858..cd56ebfcb2 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -29,7 +29,7 @@ {{- end -}}
{{svg "octicon-git-compare"}} -
+
{{if $.PageIsComparePull}}{{ctx.Locale.Tr "repo.pulls.compare_base"}}{{else}}{{ctx.Locale.Tr "repo.compare.compare_base"}}{{end}}: {{$BaseCompareName}}:{{$.BaseBranch}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 4160e47465..3974dec2e4 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -5,7 +5,7 @@ {{$.CsrfTokenHtml}} {{/* TODO: share this branch selector dropdown with the same in repo page */}} -
+
{{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}} {{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}} @@ -39,7 +39,7 @@ {{range .Branches}}
{{.}}
{{else}} -
{{ctx.Locale.Tr "no_results_found"}}
+
{{ctx.Locale.Tr "repo.pulls.no_results"}}
{{end}}
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 5a9fcb014a..764a8b01ab 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -88,7 +88,7 @@
{{svg "octicon-arrow-right"}} -
+
{{ctx.Locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 19da3fd199..541b1e9b42 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -5,7 +5,7 @@
-
+
{{ctx.Locale.Tr "repo.wiki.page"}}: