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

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 71021571cbee129443cc77618f0174e933cc7cf8..9f23b7b722c302cb0cec3dfc5972083c966a6f23 100644 (file)
--- 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 7ea4173847ff9f1473d48ba87cdc886815e0f67a..ca5d4800a101d6f9e44a5340bc721579ba9c2ec2 100644 (file)
--- 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