Skip to content

Make strings translatable (#1188) #1198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2017
Merged

Make strings translatable (#1188) #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcec7c4
Add strings to ini
geek1011 Mar 10, 2017
ad1e53f
Make strings translatable (#1188)
geek1011 Mar 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,9 @@ settings.add_protected_branch_failed= %s Locked failed
settings.remove_protected_branch_success=%s Unlocked successfully
settings.protected_branch_deletion=To delete a protected branch
settings.protected_branch_deletion_desc=Anyone with write permissions will be able to push directly to this branch. Are you sure?
settings.default_branch_desc = The default branch is considered the "base" branch in your repository against which all pull requests and code commits are automatically made, unless you specify a different branch.
settings.choose_branch = Choose a branch...
settings.no_protected_branch = There are no protected branches

diff.browse_source = Browse Source
diff.parent = parent
Expand Down
12 changes: 5 additions & 7 deletions templates/repo/settings/branches.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
{{.CsrfTokenHtml}}
<input type="hidden" name="action" value="default_branch">
<div class="item">
The default branch is considered the "base" branch in your repository,
against which all pull requests and code commits are automatically made,
unless you specify a different branch.
{{.i18n.Tr "settings.default_branch_desc"}}
</div>
{{if not .Repository.IsBare}}
<div class="ui grid padded">
Expand Down Expand Up @@ -53,11 +51,11 @@
<div class="ui fluid dropdown selection visible" tabindex="0">
<select id="protectedBranch" name="branch" data-url="{{.Repository.Link}}/settings/branches?action=protected_branch">
{{range .LeftBranches}}
<option value="">Choose a branch...</option>
<option value="">{{.i18n.Tr "settings.choose_branch"}}</option>
<option value="{{.}}">{{.}}</option>
{{end}}
</select><i class="dropdown icon"></i>
<div class="default text">Choose a branch...</div>
<div class="default text">{{.i18n.Tr "settings.choose_branch"}}</div>
<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
{{range .LeftBranches}}
<div class="item" data-value="{{.}}">{{.}}</div>
Expand All @@ -77,7 +75,7 @@
<td class="right aligned"><button class="rm ui red button" data-url="{{$.Repository.Link}}/settings/branches?action=protected_branch&id={{.ID}}" data-val="{{.BranchName}}">Delete</button></td>
</tr>
{{else}}
<tr class="center aligned"><td>There is no protected branch</td></tr>
<tr class="center aligned"><td>{{.i18n.Tr "settings.no_protected_branch"}}</td></tr>
{{end}}
</tbody>
</table>
Expand All @@ -88,4 +86,4 @@
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "base/footer" .}}