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

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
This commit is contained in:
Toshi MARUYAMA 2011-04-23 03:36:52 +00:00
parent 582b3a0008
commit 2a2e6d71e3
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/helpers/repositories_helper.rb
View File

@ -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

3
config/locales/en.yml
View File

@ -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