From 8f154c24609f7f1c0b3970f5102b3007013ccf52 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 24 Aug 2023 02:15:10 +0000 Subject: [PATCH 1/4] add --- options/locale/locale_en-US.ini | 2 ++ templates/repo/branch_dropdown.tmpl | 1 + web_src/js/components/RepoBranchTagSelector.vue | 1 + 3 files changed, 4 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 587a2b14bcf21..82abee6591615 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -138,6 +138,8 @@ confirm_delete_selected = Confirm to delete all selected items? name = Name value = Value +default = Default + [aria] navbar = Navigation Bar footer = Footer diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index a011111d5b7cb..f631db477c6b6 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -30,6 +30,7 @@ 'textCreateBranchFrom': {{.root.locale.Tr "repo.branch.create_from"}}, 'textBranches': {{.root.locale.Tr "repo.branches"}}, 'textTags': {{.root.locale.Tr "repo.tags"}}, + 'textDefault': {{.root.locale.Tr "default"}}, 'mode': '{{if or .root.IsViewTag .isTag}}tags{{else}}branches{{end}}', 'showBranchesInDropdown': {{$showBranchesInDropdown}}, diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index 07fbd634fd54c..9ef5347b06f51 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -30,6 +30,7 @@
{{ item.name }} +
{{ textDefault }}
From a32abd158e5489faba415d375a6960a03c270a1e Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 24 Aug 2023 03:01:27 +0000 Subject: [PATCH 2/4] add comment --- web_src/js/components/RepoBranchTagSelector.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index 9ef5347b06f51..9024c13b30303 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -30,7 +30,10 @@
{{ item.name }} -
{{ textDefault }}
+ +
+ {{ textDefault }} +
From 905b8116312de5735d9b298c05717a72d4cf28b5 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 28 Aug 2023 00:55:07 +0000 Subject: [PATCH 3/4] use default branch name --- web_src/js/components/RepoBranchTagSelector.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index 9024c13b30303..c70df70d5bd4b 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -30,8 +30,7 @@
{{ item.name }} - -
+
{{ textDefault }}
From 284d6449fcae8f1f2c9f54bedd657a9a850d99f9 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 28 Aug 2023 00:59:44 +0000 Subject: [PATCH 4/4] improve --- options/locale/locale_en-US.ini | 3 +-- templates/repo/branch_dropdown.tmpl | 2 +- web_src/js/components/RepoBranchTagSelector.vue | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 82abee6591615..459a71fd302bf 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -138,8 +138,6 @@ confirm_delete_selected = Confirm to delete all selected items? name = Name value = Value -default = Default - [aria] navbar = Navigation Bar footer = Footer @@ -972,6 +970,7 @@ trust_model_helper_collaborator_committer = Collaborator+Committer: Trust signat trust_model_helper_default = Default: Use the default trust model for this installation create_repo = Create Repository default_branch = Default Branch +default_branch_label = default default_branch_helper = The default branch is the base branch for pull requests and code commits. mirror_prune = Prune mirror_prune_desc = Remove obsolete remote-tracking references diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index f631db477c6b6..79eff1c53a900 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -30,7 +30,7 @@ 'textCreateBranchFrom': {{.root.locale.Tr "repo.branch.create_from"}}, 'textBranches': {{.root.locale.Tr "repo.branches"}}, 'textTags': {{.root.locale.Tr "repo.tags"}}, - 'textDefault': {{.root.locale.Tr "default"}}, + 'textDefaultBranchLabel': {{.root.locale.Tr "repo.default_branch_label"}}, 'mode': '{{if or .root.IsViewTag .isTag}}tags{{else}}branches{{end}}', 'showBranchesInDropdown': {{$showBranchesInDropdown}}, diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index c70df70d5bd4b..1889bfb2221eb 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -31,7 +31,7 @@
{{ item.name }}
- {{ textDefault }} + {{ textDefaultBranchLabel }}