From 608bbedee1960e4fbf60d4757cb9d1ee94ab294e Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 12 Mar 2017 21:50:26 +0800
Subject: [PATCH] fix 500 caused by branches settings introduced by #1198
 (#1214)

---
 templates/repo/settings/branches.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 46ecac37fc..2a55691efc 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -14,7 +14,7 @@
 						{{.CsrfTokenHtml}}
 						<input type="hidden" name="action" value="default_branch">
 						<div class="item">
-							{{.i18n.Tr "settings.default_branch_desc"}}
+							{{.i18n.Tr "repo.settings.default_branch_desc"}}
 						</div>
 						{{if not .Repository.IsBare}}
 						<div class="ui grid padded">
@@ -51,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="">{{.i18n.Tr "settings.choose_branch"}}</option>
+										<option value="">{{$.i18n.Tr "repo.settings.choose_branch"}}</option>
 										<option value="{{.}}">{{.}}</option>
 									{{end}}
 								</select><i class="dropdown icon"></i>
-								<div class="default text">{{.i18n.Tr "settings.choose_branch"}}</div>
+								<div class="default text">{{.i18n.Tr "repo.settings.choose_branch"}}</div>
 								<div class="menu transition hidden" tabindex="-1" style="display: block !important;">
 									{{range .LeftBranches}}
 										<div class="item" data-value="{{.}}">{{.}}</div>
@@ -75,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>{{.i18n.Tr "settings.no_protected_branch"}}</td></tr>
+										<tr class="center aligned"><td>{{.i18n.Tr "repo.settings.no_protected_branch"}}</td></tr>
 									{{end}}
 								</tbody>
 							</table>