From 379503b59111101b096d1ecc82f00d98bc2cb3ae Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 23 Apr 2011 03:35:17 +0000
Subject: [PATCH] scm: use i18n string at path encoding setting (#2274, #2664,
 #3462, #5251).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5520 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/repositories_helper.rb | 12 ++++++------
 config/locales/en.yml              |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 71021571c..9f23b7b72 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -213,7 +213,7 @@ module RepositoriesHelper
                        '<br />Local repository (e.g. /hgrepo, c:\hgrepo)' ) +
     content_tag('p', form.select(
                         :path_encoding, [nil] + Setting::ENCODINGS,
-                        :label => 'Path encoding') +
+                        :label => l("field_scm_path_encoding")) +
                         '<br />Default: UTF-8')
   end
 
@@ -224,7 +224,7 @@ module RepositoriesHelper
                        '<br />Bare and local repository (e.g. /gitrepo, c:\gitrepo)') +
     content_tag('p', form.select(
                         :path_encoding, [nil] + Setting::ENCODINGS,
-                        :label => 'Path encoding') +
+                        :label => l("field_scm_path_encoding")) +
                         '<br />Default: UTF-8')
   end
 
@@ -240,7 +240,7 @@ module RepositoriesHelper
                      :label => l("field_commit_logs_encoding"), :required => true)) +
     content_tag('p', form.select(
                      :path_encoding, [nil] + Setting::ENCODINGS,
-                     :label => 'Path encoding') +
+                     :label => l("field_scm_path_encoding")) +
                      '<br />Default: UTF-8')
   end
 
@@ -258,8 +258,8 @@ module RepositoriesHelper
                      :size => 60, :required => true,
                      :disabled => (repository && !repository.root_url.blank?))) +
     content_tag('p', form.select(
-                        :path_encoding, [nil] + Setting::ENCODINGS,
-                        :label => 'Path encoding') +
-                        '<br />Default: UTF-8')
+                     :path_encoding, [nil] + Setting::ENCODINGS,
+                     :label => l("field_scm_path_encoding")) +
+                     '<br />Default: UTF-8')
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7ea417384..ca5d4800a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -310,6 +310,7 @@ en:
   field_issues_visibility: Issues visibility
   field_is_private: Private
   field_commit_logs_encoding: Commit messages encoding
+  field_scm_path_encoding: Path encoding
 
   setting_app_title: Application title
   setting_app_subtitle: Application subtitle
-- 
2.39.5