tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Minor copy changes (#3074)

Browse source 
* Minor copy changes
Fixes #3058

* Use TrN for translations that depend on count
Fix minor type with branches count
This commit is contained in:
techknowlogick 2017-12-03 15:52:30 -05:00 committed by Lauris BH
parent ab62da283a
commit 993b86628b
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/context/repo.go
View file

@ -407,7 +407,7 @@ func RepoAssignment() macaron.Handler {
return return
} }
ctx.Data["Branches"] = brs ctx.Data["Branches"] = brs
ctx.Data["BrancheCount"] = len(brs) ctx.Data["BranchesCount"] = len(brs)
// If not branch selected, try default one. // If not branch selected, try default one.
// If default branch doesn't exists, fall back to some other branch. // If default branch doesn't exists, fall back to some other branch.

1
options/locale/locale_en-US.ini
View file

@ -539,6 +539,7 @@ pulls = Pull Requests
labels = Labels labels = Labels
milestones = Milestones milestones = Milestones
commits = Commits commits = Commits
commit = Commit
releases = Releases releases = Releases
file_raw = Raw file_raw = Raw
file_history = History file_history = History

4
templates/repo/sub_menu.tmpl
View file

@ -2,12 +2,12 @@
<div class="ui two horizontal center link list"> <div class="ui two horizontal center link list">
{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo)}} {{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo)}}
<div class="item{{if .PageIsCommits}} active{{end}}"> <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> </div>
{{end}} {{end}}
{{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo) }} {{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo) }}
<div class="item{{if .PageIsBranches}} active{{end}}"> <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> </div>
{{end}} {{end}}
</div> </div>