scm: use i18n string at commit log encoding setting (#1735).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5519 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index f15980224e9b74be6fe333f103afbd4e36b23aa7..71021571cbee129443cc77618f0174e933cc7cf8 100644 (file)
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -201,8 +201,9 @@ module RepositoriesHelper
     content_tag('p', form.text_field(:url, :label => 'Root directory',
                      :size => 60, :required => true,
                      :disabled => (repository && !repository.new_record?))) +
-    content_tag('p', form.select(:log_encoding, [nil] + Setting::ENCODINGS,
-                                 :label => 'Commit messages encoding', :required => true))
+    content_tag('p', form.select(
+                     :log_encoding, [nil] + Setting::ENCODINGS,
+                     :label => l("field_commit_logs_encoding"), :required => true))
   end
 
   def mercurial_field_tags(form, repository)
@@ -234,8 +235,9 @@ module RepositoriesHelper
     content_tag('p', form.text_field(:url, :label => 'Module',
                      :size => 30, :required => true,
                      :disabled => !repository.new_record?)) +
-    content_tag('p', form.select(:log_encoding, [nil] + Setting::ENCODINGS,
-                                 :label => 'Commit messages encoding', :required => true)) +
+    content_tag('p', form.select(
+                     :log_encoding, [nil] + Setting::ENCODINGS,
+                     :label => l("field_commit_logs_encoding"), :required => true)) +
     content_tag('p', form.select(
                      :path_encoding, [nil] + Setting::ENCODINGS,
                      :label => 'Path encoding') +
@@ -246,8 +248,9 @@ module RepositoriesHelper
     content_tag('p', form.text_field(:url, :label => 'Root directory',
                      :size => 60, :required => true,
                      :disabled => (repository && !repository.new_record?))) +
-    content_tag('p', form.select(:log_encoding, [nil] + Setting::ENCODINGS,
-                                 :label => 'Commit messages encoding', :required => true))
+    content_tag('p', form.select(
+                     :log_encoding, [nil] + Setting::ENCODINGS,
+                     :label => l("field_commit_logs_encoding"), :required => true))
   end
 
   def filesystem_field_tags(form, repository)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 5cb27c920856b4f46287c5df2faf936ea25522ef..3a0b6f9117c4a0cddf55608dc77faf5d04fb9ec2 100644 (file)
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -30,6 +30,14 @@ class Repository < ActiveRecord::Base
   # Checks if the SCM is enabled when creating a repository
   validate_on_create { |r| r.errors.add(:type, :invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
 
+  def self.human_attribute_name(attribute_key_name)
+    attr_name = attribute_key_name
+    if attr_name == "log_encoding"
+      attr_name = "commit_logs_encoding"
+    end
+    super(attr_name)
+  end
+
   # Removes leading and trailing whitespace
   def url=(arg)
     write_attribute(:url, arg ? arg.to_s.strip : nil)

diff --git a/app/models/repository/bazaar.rb b/app/models/repository/bazaar.rb
index 3ae8b28fed01f80bb78fd77a048716b1f10cf259..481c5203392b4152dbd9f6daa556dd70c515e4ab 100644 (file)
--- a/app/models/repository/bazaar.rb
+++ b/app/models/repository/bazaar.rb
@@ -23,7 +23,6 @@ class Repository::Bazaar < Repository
 
   ATTRIBUTE_KEY_NAMES = {
       "url"          => "Root directory",
-      "log_encoding" => "Commit messages encoding",
     }
   def self.human_attribute_name(attribute_key_name)
     ATTRIBUTE_KEY_NAMES[attribute_key_name] || super

diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index 4c8d8034fae695daac99e15d291e73fcacda2338..84f61760038ff8c3273c50368b73a2fb3089a5a3 100644 (file)
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -24,7 +24,6 @@ class Repository::Cvs < Repository
   ATTRIBUTE_KEY_NAMES = {
       "root_url"     => "CVSROOT",
       "url"          => "Module",
-      "log_encoding" => "Commit messages encoding",
     }
   def self.human_attribute_name(attribute_key_name)
     ATTRIBUTE_KEY_NAMES[attribute_key_name] || super

diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb
index e1f9f7eea73709350f783338ccd621ed1ccd6ddb..ca38be4daa45bc4963b8acea6370a4ea9b6d912f 100644 (file)
--- a/app/models/repository/darcs.rb
+++ b/app/models/repository/darcs.rb
@@ -22,7 +22,6 @@ class Repository::Darcs < Repository
 
   ATTRIBUTE_KEY_NAMES = {
       "url"          => "Root directory",
-      "log_encoding" => "Commit messages encoding",
     }
   def self.human_attribute_name(attribute_key_name)
     ATTRIBUTE_KEY_NAMES[attribute_key_name] || super