From ccc15b9e1a3ddaa2fdf82970d574c9f84449aa3d Mon Sep 17 00:00:00 2001
From: Patrick G <geek1011@users.noreply.github.com>
Date: Sat, 11 Mar 2017 01:28:25 +0000
Subject: [PATCH] Make strings translatable (#1188) (#1198)

* Add strings to ini

* Make strings translatable (#1188)
---
 options/locale/locale_en-US.ini       |  3 +++
 templates/repo/settings/branches.tmpl | 12 +++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 81e2e9fbc63..1c2d36e01d0 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -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
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 79dd05392e6..46ecac37fc7 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -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">
@@ -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>
@@ -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>
@@ -88,4 +86,4 @@
 		</div>
 	</div>
 </div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}