From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 23 Apr 2011 07:38:32 +0000 (+0000)
Subject: scm: filesystem: use i18n string at 'Root directory' setting.
X-Git-Tag: 1.2.0~323
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=25d6ed38b6f7ab7c4c56ae8f111eb5b1fd518356;p=redmine.git

scm: filesystem: use i18n string at 'Root directory' setting.

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

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index f260320de..10e39c819 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -263,7 +263,8 @@ module RepositoriesHelper
   end
 
   def filesystem_field_tags(form, repository)
-    content_tag('p', form.text_field(:url, :label => 'Root directory',
+    content_tag('p', form.text_field(
+                     :url, :label => l("field_root_directory"),
                      :size => 60, :required => true,
                      :disabled => (repository && !repository.root_url.blank?))) +
     content_tag('p', form.select(
diff --git a/app/models/repository/filesystem.rb b/app/models/repository/filesystem.rb
index acbf41c7f..a6148f26c 100644
--- a/app/models/repository/filesystem.rb
+++ b/app/models/repository/filesystem.rb
@@ -24,11 +24,12 @@ class Repository::Filesystem < Repository
   attr_protected :root_url
   validates_presence_of :url
 
-  ATTRIBUTE_KEY_NAMES = {
-      "url"          => "Root directory",
-    }
   def self.human_attribute_name(attribute_key_name)
-    ATTRIBUTE_KEY_NAMES[attribute_key_name] || super
+    attr_name = attribute_key_name
+    if attr_name == "url"
+      attr_name = "root_directory"
+    end
+    super(attr_name)
   end
 
   def self.scm_adapter_class
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f53a1c1f9..190d333f6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -312,6 +312,7 @@ en:
   field_commit_logs_encoding: Commit messages encoding
   field_scm_path_encoding: Path encoding
   field_path_to_repository: Path to repository
+  field_root_directory: Root directory
 
   setting_app_title: Application title
   setting_app_subtitle: Application subtitle