pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make strings translatable (#1188) (#1198)

Browse source 
* Add strings to ini

* Make strings translatable (#1188)
This commit is contained in:
Patrick G 2017-03-11 01:28:25 +00:00 committed by Lunny Xiao
parent 74cde12677
commit ccc15b9e1a
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -837,6 +837,9 @@ settings.add_protected_branch_failed= %s Locked failed
settings.remove_protected_branch_success=%s Unlocked successfully settings.remove_protected_branch_success=%s Unlocked successfully
settings.protected_branch_deletion=To delete a protected branch 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.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.browse_source = Browse Source
diff.parent = parent diff.parent = parent

10
templates/repo/settings/branches.tmpl
View file

@ -14,9 +14,7 @@
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" name="action" value="default_branch"> <input type="hidden" name="action" value="default_branch">
<div class="item"> <div class="item">
The default branch is considered the "base" branch in your repository, {{.i18n.Tr "settings.default_branch_desc"}}
against which all pull requests and code commits are automatically made,
unless you specify a different branch.
</div> </div>
{{if not .Repository.IsBare}} {{if not .Repository.IsBare}}
<div class="ui grid padded"> <div class="ui grid padded">
@ -53,11 +51,11 @@
<div class="ui fluid dropdown selection visible" tabindex="0"> <div class="ui fluid dropdown selection visible" tabindex="0">
<select id="protectedBranch" name="branch" data-url="{{.Repository.Link}}/settings/branches?action=protected_branch"> <select id="protectedBranch" name="branch" data-url="{{.Repository.Link}}/settings/branches?action=protected_branch">
{{range .LeftBranches}} {{range .LeftBranches}}
<option value="">Choose a branch...</option> <option value="">{{.i18n.Tr "settings.choose_branch"}}</option>
<option value="{{.}}">{{.}}</option> <option value="{{.}}">{{.}}</option>
{{end}} {{end}}
</select><i class="dropdown icon"></i> </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;"> <div class="menu transition hidden" tabindex="-1" style="display: block !important;">
{{range .LeftBranches}} {{range .LeftBranches}}
<div class="item" data-value="{{.}}">{{.}}</div> <div class="item" data-value="{{.}}">{{.}}</div>
@ -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> <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> </tr>
{{else}} {{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}} {{end}}
</tbody> </tbody>
</table> </table>