From 33e9fb86f0bcb19d50907efb4843414daf966616 Mon Sep 17 00:00:00 2001 From: Joel da Rosa Date: Fri, 13 Jul 2018 16:43:31 -0300 Subject: [PATCH 1/2] Locale for button Edit on protected branch --- options/locale/locale_en-US.ini | 1 + templates/repo/settings/branches.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2420bd66f8a4b..9a618e665412b 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1097,6 +1097,7 @@ settings.protected_branch_deletion_desc = Disabling branch protection allows use settings.default_branch_desc = Select a default repository branch for pull requests and code commits: settings.choose_branch = Choose a branch… settings.no_protected_branch = There are no protected branches. +settings.edit_protected_branch = Edit diff.browse_source = Browse Source diff.parent = parent diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index b685217c87aaf..6e10dfb68533b 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -62,7 +62,7 @@ {{range .ProtectedBranches}}
{{.BranchName}}
- Edit + {{.i18n.Tr "repo.settings.edit_protected_branch"}} {{else}} {{.i18n.Tr "repo.settings.no_protected_branch"}} From a7396e9d7dc4a977d5428f6f34b7347670ae0358 Mon Sep 17 00:00:00 2001 From: Joel da Rosa Date: Fri, 13 Jul 2018 17:46:24 -0300 Subject: [PATCH 2/2] Fix Locale for button Edit on protected branch --- templates/repo/settings/branches.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 6e10dfb68533b..85c186771332b 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -62,7 +62,7 @@ {{range .ProtectedBranches}}
{{.BranchName}}
- {{.i18n.Tr "repo.settings.edit_protected_branch"}} + {{$.i18n.Tr "repo.settings.edit_protected_branch"}} {{else}} {{.i18n.Tr "repo.settings.no_protected_branch"}}