From: Toshi MARUYAMA Date: Sat, 23 Apr 2011 09:24:23 +0000 (+0000) Subject: scm: mercurial: use i18n text of repository note in setting. X-Git-Tag: 1.2.0~314 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7fe397e8fd0bea4f223ae71e0f83fbd9f2391a15;p=redmine.git scm: mercurial: use i18n text of repository note in setting. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5541 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 1a8247795..793302e25 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -213,7 +213,7 @@ module RepositoriesHelper :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?) ) + - '
Local repository (e.g. /hgrepo, c:\hgrepo)' ) + + '
' + l("text_mercurial_repository_note")) + content_tag('p', form.select( :path_encoding, [nil] + Setting::ENCODINGS, :label => l("field_scm_path_encoding") diff --git a/config/locales/en.yml b/config/locales/en.yml index 69fe30ae6..f441b5bcd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -942,6 +942,7 @@ en: 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" text_git_repository_note: "Bare and local repository (e.g. /gitrepo, c:\gitrepo)" + text_mercurial_repository_note: "Local repository (e.g. /hgrepo, c:\hgrepo)" default_role_manager: Manager default_role_developer: Developer