summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-23 07:38:32 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-23 07:38:32 +0000
commit25d6ed38b6f7ab7c4c56ae8f111eb5b1fd518356 (patch)
treeb2662ef27377e82bdb9850bb96570db19fc17088 /app
parent50cb5921b5f279fc49cfa84d54416ff12bbd1191 (diff)
downloadredmine-25d6ed38b6f7ab7c4c56ae8f111eb5b1fd518356.tar.gz
redmine-25d6ed38b6f7ab7c4c56ae8f111eb5b1fd518356.zip
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
Diffstat (limited to 'app')
-rw-r--r--app/helpers/repositories_helper.rb3
-rw-r--r--app/models/repository/filesystem.rb9
2 files changed, 7 insertions, 5 deletions
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