Skip to content

Commit 556fcf7

Browse files
committed
fix: use translations
1 parent f1e7fff commit 556fcf7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

options/locale/locale_en-US.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2769,6 +2769,10 @@ branch.new_branch_from = Create new branch from "%s"
27692769
branch.renamed = Branch %s was renamed to %s.
27702770
branch.rename_default_or_protected_branch_error = Only admins can rename default or protected branches.
27712771
branch.rename_protected_branch_failed = This branch is protected by glob-based protection rules.
2772+
branch.commits_ahead_1 = %d commit ahead of %s
2773+
branch.commits_ahead_n = %d commits ahead of %s
2774+
branch.commits_behind_1 = %d commit behind %s
2775+
branch.commits_behind_n = %d commits behind %s
27722776
27732777
tag.create_tag = Create tag %s
27742778
tag.create_tag_operation = Create tag

templates/repo/branch/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@
110110
{{if and (not .DBBranch.IsDeleted) $.DefaultBranchBranch}}
111111
<div class="commit-divergence">
112112
<div class="bar-group">
113-
<div class="count count-behind" data-tooltip-content="{{.CommitsBehind}} {{if eq .CommitsBehind 1}}commit{{else}}commits{{end}} behind {{$.DefaultBranchBranch.DBBranch.Name}}">{{.CommitsBehind}}</div>
113+
<div class="count count-behind" data-tooltip-content="{{if eq .CommitsBehind 1}}{{ctx.Locale.Tr "repo.branch.commits_behind_1" .CommitsBehind $.DefaultBranchBranch.DBBranch.Name}}{{else}}{{ctx.Locale.Tr "repo.branch.commits_behind_n" .CommitsBehind $.DefaultBranchBranch.DBBranch.Name}}{{end}}">{{.CommitsBehind}}</div>
114114
{{/* old code bears 0/0.0 = NaN output, so it might output invalid "width: NaNpx", it just works and doesn't caues any problem. */}}
115115
<div class="bar bar-behind" style="width: {{Eval 100 "*" .CommitsBehind "/" "(" .CommitsBehind "+" .CommitsAhead "+" 0.0 ")"}}%"></div>
116116
</div>
117117
<div class="bar-group">
118-
<div class="count count-ahead" data-tooltip-content="{{.CommitsAhead}} {{if eq .CommitsAhead 1}}commit{{else}}commits{{end}} ahead of {{$.DefaultBranchBranch.DBBranch.Name}}">{{.CommitsAhead}}</div>
118+
<div class="count count-ahead" data-tooltip-content="{{if eq .CommitsAhead 1}}{{ctx.Locale.Tr "repo.branch.commits_ahead_1" .CommitsAhead $.DefaultBranchBranch.DBBranch.Name}}{{else}}{{ctx.Locale.Tr "repo.branch.commits_ahead_n" .CommitsAhead $.DefaultBranchBranch.DBBranch.Name}}{{end}}">{{.CommitsAhead}}</div>
119119
<div class="bar bar-ahead" style="width: {{Eval 100 "*" .CommitsAhead "/" "(" .CommitsBehind "+" .CommitsAhead "+" 0.0 ")"}}%"></div>
120120
</div>
121121
</div>

0 commit comments

Comments
 (0)