Minor copy changes #3074
Merged
Minor copy changes #3074
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes #3058
Codecov Report
@@ Coverage Diff @@
## master #3074 +/- ##
==========================================
+ Coverage 33.46% 33.48% +0.02%
==========================================
Files 270 270
Lines 39595 39595
==========================================
+ Hits 13249 13258 +9
+ Misses 24460 24446 -14
- Partials 1886 1891 +5
Continue to review full report at Codecov.
|
tboerger
added
the
lgtm/need 2
|
LGTM |
tboerger
added
lgtm/need 1
lafriks
requested changes
Dec 3, 2017
templates/repo/sub_menu.tmpl
Outdated
| @@ -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> | |||
There was a problem hiding this comment.
Please use TrN for translations that depend on count.
{{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commit") }}
templates/repo/sub_menu.tmpl
Outdated
| </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> |
Fix minor type with branches count
lafriks
approved these changes
Dec 3, 2017
ethantkoenig
approved these changes
Dec 3, 2017
| @@ -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> | |||
There was a problem hiding this comment.
Arguably, the {{.CommitsCount} should be embedded in the locale, instead of hard-coded in front of it, to support languages where cardinal numbers appear after nouns (e.g. https://en.wikipedia.org/wiki/Oromo_language#Number).
But that's probably best left for another day...
There was a problem hiding this comment.
Since this is a new locale string, I'd argue we do that now instead of break all languages in the future.
|
LGTM |
tboerger
added
lgtm/done
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3058