diff options
| author | techknowlogick <techknowlogick@users.noreply.github.com> | 2017-12-03 15:52:30 -0500 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-12-03 22:52:30 +0200 |
| commit | 993b86628bdf62c0565c2a57a73561bb2d535b22 (patch) | |
| tree | a4775e86f296baa31d8462ab185c963c4c75df52 | |
| parent | ab62da283aa20475109eba907324f55123d7e3c6 (diff) | |
| download | gitea-993b86628bdf62c0565c2a57a73561bb2d535b22.tar.gz gitea-993b86628bdf62c0565c2a57a73561bb2d535b22.zip | |
Minor copy changes (#3074)
* Minor copy changes
Fixes #3058
* Use TrN for translations that depend on count
Fix minor type with branches count
| -rw-r--r-- | modules/context/repo.go | 2 | ||||
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 | ||||
| -rw-r--r-- | templates/repo/sub_menu.tmpl | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/modules/context/repo.go b/modules/context/repo.go index e8d084c342..66250a0f3e 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/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c69a5941be..b22bcf3c28 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 e9f74209d6..cd37f80b70 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> {{.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> {{.i18n.Tr "repo.branches"}}</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> |