diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-04-23 03:36:52 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-04-23 03:36:52 +0000 |
| commit | 2a2e6d71e38ed0986bbbf81fa85b39dc5b1e78e5 (patch) | |
| tree | 3737a50d137550561f7decf0358da4080cafcd0e | |
| parent | 582b3a0008fa0cd0a201bcd087ccd25ce3ece84a (diff) | |
| download | redmine-2a2e6d71e38ed0986bbbf81fa85b39dc5b1e78e5.tar.gz redmine-2a2e6d71e38ed0986bbbf81fa85b39dc5b1e78e5.zip | |
scm: use i18n string at path encoding setting note (#2274, #2664, #3462, #5251).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5523 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/repositories_helper.rb | 24 | ||||
| -rw-r--r-- | config/locales/en.yml | 3 |
2 files changed, 16 insertions, 11 deletions
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 9f23b7b72..79533efbe 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -213,8 +213,9 @@ module RepositoriesHelper '<br />Local repository (e.g. /hgrepo, c:\hgrepo)' ) + content_tag('p', form.select( :path_encoding, [nil] + Setting::ENCODINGS, - :label => l("field_scm_path_encoding")) + - '<br />Default: UTF-8') + :label => l("field_scm_path_encoding") + ) + + '<br />' + l("text_scm_path_encoding_note")) end def git_field_tags(form, repository) @@ -224,8 +225,9 @@ module RepositoriesHelper '<br />Bare and local repository (e.g. /gitrepo, c:\gitrepo)') + content_tag('p', form.select( :path_encoding, [nil] + Setting::ENCODINGS, - :label => l("field_scm_path_encoding")) + - '<br />Default: UTF-8') + :label => l("field_scm_path_encoding") + ) + + '<br />' + l("text_scm_path_encoding_note")) end def cvs_field_tags(form, repository) @@ -239,9 +241,10 @@ module RepositoriesHelper :log_encoding, [nil] + Setting::ENCODINGS, :label => l("field_commit_logs_encoding"), :required => true)) + content_tag('p', form.select( - :path_encoding, [nil] + Setting::ENCODINGS, - :label => l("field_scm_path_encoding")) + - '<br />Default: UTF-8') + :path_encoding, [nil] + Setting::ENCODINGS, + :label => l("field_scm_path_encoding") + ) + + '<br />' + l("text_scm_path_encoding_note")) end def bazaar_field_tags(form, repository) @@ -258,8 +261,9 @@ module RepositoriesHelper :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?))) + content_tag('p', form.select( - :path_encoding, [nil] + Setting::ENCODINGS, - :label => l("field_scm_path_encoding")) + - '<br />Default: UTF-8') + :path_encoding, [nil] + Setting::ENCODINGS, + :label => l("field_scm_path_encoding") + ) + + '<br />' + l("text_scm_path_encoding_note")) end end diff --git a/config/locales/en.yml b/config/locales/en.yml index ca5d4800a..5eb47d3f8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -936,7 +936,8 @@ en: text_zoom_in: Zoom in text_zoom_out: Zoom out text_warn_on_leaving_unsaved: "The current page contains unsaved text that will be lost if you leave this page." - + text_scm_path_encoding_note: "Default: UTF-8" + default_role_manager: Manager default_role_developer: Developer default_role_reporter: Reporter |