fix: requested changes

Author: ajmeese7

options/locale/locale_en-US.ini

@@ -2769,8 +2769,8 @@ branch.new_branch_from = Create new branch from "%s"
 branch.renamed = Branch %s was renamed to %s.
 branch.rename_default_or_protected_branch_error = Only admins can rename default or protected branches.
 branch.rename_protected_branch_failed = This branch is protected by glob-based protection rules.
-branch.commits_ahead_1 = %d commit ahead of %s
-branch.commits_ahead_n = %d commits ahead of %s
+branch.commits_ahead_1 = %d commit ahead
+branch.commits_ahead_n = %d commits ahead
 branch.commits_behind_1 = %d commit behind %s
 branch.commits_behind_n = %d commits behind %s
 

templates/repo/branch/list.tmpl

@@ -108,14 +108,14 @@
 							</td>
 							<td class="two wide ui">
 								{{if and (not .DBBranch.IsDeleted) $.DefaultBranchBranch}}
-								<div class="commit-divergence">
+								<div class="commit-divergence" data-tooltip-content="{{ctx.Locale.TrN .CommitsBehind "repo.branch.commits_behind_1" "repo.branch.commits_behind_n" .CommitsBehind $.DefaultBranchBranch.DBBranch.Name}}, {{ctx.Locale.TrN .CommitsAhead "repo.branch.commits_ahead_1" "repo.branch.commits_ahead_n" .CommitsAhead}}">
 									<div class="bar-group">
-										<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>
+										<div class="count count-behind">{{.CommitsBehind}}</div>
 										{{/* old code bears 0/0.0 = NaN output, so it might output invalid "width: NaNpx", it just works and doesn't caues any problem. */}}
 										<div class="bar bar-behind" style="width: {{Eval 100 "*" .CommitsBehind "/" "(" .CommitsBehind "+" .CommitsAhead "+" 0.0 ")"}}%"></div>
 									</div>
 									<div class="bar-group">
-										<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>
+										<div class="count count-ahead">{{.CommitsAhead}}</div>
 										<div class="bar bar-ahead" style="width: {{Eval 100 "*" .CommitsAhead "/" "(" .CommitsBehind "+" .CommitsAhead "+" 0.0 ")"}}%"></div>
 									</div>
 								</div>