From 720c197ccfe45ce3755c9549b337f4efbce2b381 Mon Sep 17 00:00:00 2001
From: Matti R <matti@mdranta.net>
Date: Sun, 3 Dec 2017 02:04:04 -0500
Subject: [PATCH 1/2] Minor copy changes Fixes #3058

---
 options/locale/locale_en-US.ini | 1 +
 templates/repo/sub_menu.tmpl    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index c69a5941be559..b22bcf3c28ec0 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -539,6 +539,7 @@ pulls = Pull Requests
 labels = Labels
 milestones = Milestones
 commits = Commits
+commit = Commit
 releases = Releases
 file_raw = Raw
 file_history = History
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl
index e9f74209d67ea..2f52c08653f25 100644
--- a/templates/repo/sub_menu.tmpl
+++ b/templates/repo/sub_menu.tmpl
@@ -2,12 +2,12 @@
 	<div class="ui two horizontal center link list">
 		{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo)}}
 			<div class="item{{if .PageIsCommits}} active{{end}}">
-				<a href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{.i18n.Tr "repo.commits"}}</a>
+				<a href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{if eq .CommitsCount 1}}{{.i18n.Tr "repo.commit"}}{{else}}{{.i18n.Tr "repo.commits"}}{{end}}</a>
 			</div>
 		{{end}}
 		{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo) }}
 			<div class="item{{if .PageIsBranches}} active{{end}}">
-				<a href="{{.RepoLink}}/branches/"><i class="octicon octicon-git-branch"></i> <b>{{.BrancheCount}}</b> {{.i18n.Tr "repo.branches"}}</a>
+				<a href="{{.RepoLink}}/branches/"><i class="octicon octicon-git-branch"></i> <b>{{.BrancheCount}}</b> {{if eq .BrancheCount 1}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.branches"}}{{end}}</a>
 			</div>
 		{{end}}
 	</div>

From a66f4e3b4132a10184b17cd8b9862406b74d750f Mon Sep 17 00:00:00 2001
From: Matti R <matti@mdranta.net>
Date: Sun, 3 Dec 2017 11:18:03 -0500
Subject: [PATCH 2/2] Use TrN for translations that depend on count Fix minor
 type with branches count

---
 modules/context/repo.go      | 2 +-
 templates/repo/sub_menu.tmpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/context/repo.go b/modules/context/repo.go
index e8d084c342a16..66250a0f3eb8f 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -407,7 +407,7 @@ func RepoAssignment() macaron.Handler {
 			return
 		}
 		ctx.Data["Branches"] = brs
-		ctx.Data["BrancheCount"] = len(brs)
+		ctx.Data["BranchesCount"] = len(brs)
 
 		// If not branch selected, try default one.
 		// If default branch doesn't exists, fall back to some other branch.
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl
index 2f52c08653f25..cd37f80b70e81 100644
--- a/templates/repo/sub_menu.tmpl
+++ b/templates/repo/sub_menu.tmpl
@@ -2,12 +2,12 @@
 	<div class="ui two horizontal center link list">
 		{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo)}}
 			<div class="item{{if .PageIsCommits}} active{{end}}">
-				<a href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{if eq .CommitsCount 1}}{{.i18n.Tr "repo.commit"}}{{else}}{{.i18n.Tr "repo.commits"}}{{end}}</a>
+				<a href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commits") }}</a>
 			</div>
 		{{end}}
 		{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo) }}
 			<div class="item{{if .PageIsBranches}} active{{end}}">
-				<a href="{{.RepoLink}}/branches/"><i class="octicon octicon-git-branch"></i> <b>{{.BrancheCount}}</b> {{if eq .BrancheCount 1}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.branches"}}{{end}}</a>
+				<a href="{{.RepoLink}}/branches/"><i class="octicon octicon-git-branch"></i> <b>{{.BranchesCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .BranchesCount "repo.branch" "repo.branches") }}</a>
 			</div>
 		{{end}}
 	</div>