summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-23 03:34:43 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-23 03:34:43 +0000
commitbb929f4f7501fc0480e7d8818c89f870d09b5244 (patch)
tree04326bb80f3155e9c1346de9f124632ceb996ecc /app/helpers
parentd67e4ff2f47834026132bf2cc9a743e6f47e669a (diff)
downloadredmine-bb929f4f7501fc0480e7d8818c89f870d09b5244.tar.gz
redmine-bb929f4f7501fc0480e7d8818c89f870d09b5244.zip
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
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/repositories_helper.rb15
1 files changed, 9 insertions, 6 deletions
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index f15980224..71021571c 100644
--- 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)