Skip to content

Commit 770f948

Browse files
committed
Refine the wording to avoid ambiguity
1 parent 8bb5e53 commit 770f948

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

options/locale/locale_en-US.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,8 @@ fork_to_different_account = Fork to a different account
10321032
fork_visibility_helper = The visibility of a forked repository cannot be changed.
10331033
fork_branch = Branch to be cloned to the fork
10341034
all_branches = All branches
1035-
all_tags = All Tags
1035+
view_all_branches = View all branches
1036+
view_all_tags = View all tags
10361037
fork_no_valid_owners = This repository can not be forked because there are no valid owners.
10371038
fork.blocked_user = Cannot fork the repository because you are blocked by the repository owner.
10381039
use_template = Use this template

templates/repo/branch_dropdown.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
'textCreateBranch': {{ctx.Locale.Tr "repo.branch.create_branch"}},
3030
'textCreateBranchFrom': {{ctx.Locale.Tr "repo.branch.create_from"}},
3131
'textBranches': {{ctx.Locale.Tr "repo.branches"}},
32-
'textAllBranches': {{ctx.Locale.Tr "repo.all_branches"}},
33-
'textAllTags': {{ctx.Locale.Tr "repo.all_tags"}},
32+
'textViewAllBranches': {{ctx.Locale.Tr "repo.view_all_branches"}},
33+
'textViewAllTags': {{ctx.Locale.Tr "repo.view_all_tags"}},
3434
'textTags': {{ctx.Locale.Tr "repo.tags"}},
3535
'textDefaultBranchLabel': {{ctx.Locale.Tr "repo.default_branch_label"}},
3636

3737
'mode': '{{if or .root.IsViewTag .isTag}}tags{{else}}branches{{end}}',
3838
'showBranchesInDropdown': {{$showBranchesInDropdown}},
39-
'showAllBranchsTagsEntry': {{$.showAllBranchsTagsEntry}},
39+
'showViewAllBranchsTagsEntry': {{$.showViewAllBranchsTagsEntry}},
4040
'searchFieldPlaceholder': '{{if $.noTag}}{{ctx.Locale.Tr "repo.pulls.filter_branch"}}{{else if $showBranchesInDropdown}}{{ctx.Locale.Tr "repo.filter_branch_and_tag"}}{{else}}{{ctx.Locale.Tr "repo.find_tag"}}{{end}}...',
4141
'branchForm': {{$.branchForm}},
4242
'disableCreateBranch': {{if .disableCreateBranch}}{{.disableCreateBranch}}{{else}}{{not .root.CanCreateBranch}}{{end}},

templates/repo/home.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
{{$isHomepage := (eq $n 0)}}
4848
<div class="repo-button-row" data-is-homepage="{{$isHomepage}}">
4949
<div class="repo-button-row-left">
50-
{{template "repo/branch_dropdown" dict "root" . "showAllBranchsTagsEntry" true}}
50+
{{template "repo/branch_dropdown" dict "root" . "showViewAllBranchsTagsEntry" true}}
5151
{{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}}
5252
{{$cmpBranch := ""}}
5353
{{if ne .Repository.ID .BaseRepo.ID}}

web_src/js/components/RepoBranchTagSelector.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,9 @@ export default sfc; // activate IDE's Vue plugin
312312
<div class="message" v-if="showNoResults && !isLoading">
313313
{{ noResults }}
314314
</div>
315-
<div v-if="showAllBranchsTagsEntry" class="branch-tag-divider"/>
316-
<a v-if="showAllBranchsTagsEntry && mode === 'branches'" class="item" :href="repoLink + '/branches'">{{ textAllBranches }}</a>
317-
<a v-if="showAllBranchsTagsEntry && mode === 'tags'" class="item" :href="repoLink + '/tags'">{{ textAllTags }}</a>
315+
<div v-if="showViewAllBranchsTagsEntry" class="branch-tag-divider"/>
316+
<a v-if="showViewAllBranchsTagsEntry && mode === 'branches'" class="item" :href="repoLink + '/branches'">{{ textViewAllBranches }}</a>
317+
<a v-if="showViewAllBranchsTagsEntry && mode === 'tags'" class="item" :href="repoLink + '/tags'">{{ textViewAllTags }}</a>
318318
</div>
319319
</div>
320320
</template>

0 commit comments

Comments
 (0)