kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Toshi MARUYAMA 2011-04-23 03:35:17 +00:00
parent bb929f4f75
commit 379503b591
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/repositories_helper.rb
View File

@ -213,7 +213,7 @@ module RepositoriesHelper
'<br />Local repository (e.g. /hgrepo, c:\hgrepo)' ) + '<br />Local repository (e.g. /hgrepo, c:\hgrepo)' ) +
content_tag('p', form.select( content_tag('p', form.select(
:path_encoding, [nil] + Setting::ENCODINGS, :path_encoding, [nil] + Setting::ENCODINGS,
:label => 'Path encoding') + :label => l("field_scm_path_encoding")) +
'<br />Default: UTF-8') '<br />Default: UTF-8')
end end
@ -224,7 +224,7 @@ module RepositoriesHelper
'<br />Bare and local repository (e.g. /gitrepo, c:\gitrepo)') + '<br />Bare and local repository (e.g. /gitrepo, c:\gitrepo)') +
content_tag('p', form.select( content_tag('p', form.select(
:path_encoding, [nil] + Setting::ENCODINGS, :path_encoding, [nil] + Setting::ENCODINGS,
:label => 'Path encoding') + :label => l("field_scm_path_encoding")) +
'<br />Default: UTF-8') '<br />Default: UTF-8')
end end
@ -240,7 +240,7 @@ module RepositoriesHelper
:label => l("field_commit_logs_encoding"), :required => true)) + :label => l("field_commit_logs_encoding"), :required => true)) +
content_tag('p', form.select( content_tag('p', form.select(
:path_encoding, [nil] + Setting::ENCODINGS, :path_encoding, [nil] + Setting::ENCODINGS,
:label => 'Path encoding') + :label => l("field_scm_path_encoding")) +
'<br />Default: UTF-8') '<br />Default: UTF-8')
end end
@ -258,8 +258,8 @@ module RepositoriesHelper
:size => 60, :required => true, :size => 60, :required => true,
:disabled => (repository && !repository.root_url.blank?))) + :disabled => (repository && !repository.root_url.blank?))) +
content_tag('p', form.select( content_tag('p', form.select(
:path_encoding, [nil] + Setting::ENCODINGS, :path_encoding, [nil] + Setting::ENCODINGS,
:label => 'Path encoding') + :label => l("field_scm_path_encoding")) +
'<br />Default: UTF-8') '<br />Default: UTF-8')
end end
end end

1
config/locales/en.yml
View File

@ -310,6 +310,7 @@ en:
field_issues_visibility: Issues visibility field_issues_visibility: Issues visibility
field_is_private: Private field_is_private: Private
field_commit_logs_encoding: Commit messages encoding field_commit_logs_encoding: Commit messages encoding
field_scm_path_encoding: Path encoding
setting_app_title: Application title setting_app_title: Application title
setting_app_subtitle: Application subtitle setting_app_subtitle: Application subtitle