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
'
Local repository (e.g. /hgrepo, c:\hgrepo)' ) +
content_tag('p', form.select(
:path_encoding, [nil] + Setting::ENCODINGS,
- :label => l("field_scm_path_encoding")) +
- '
Default: UTF-8')
+ :label => l("field_scm_path_encoding")
+ ) +
+ '
' + l("text_scm_path_encoding_note"))
end
def git_field_tags(form, repository)
@@ -224,8 +225,9 @@ module RepositoriesHelper
'
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")) +
- '
Default: UTF-8')
+ :label => l("field_scm_path_encoding")
+ ) +
+ '
' + 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")) +
- '
Default: UTF-8')
+ :path_encoding, [nil] + Setting::ENCODINGS,
+ :label => l("field_scm_path_encoding")
+ ) +
+ '
' + 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")) +
- '
Default: UTF-8')
+ :path_encoding, [nil] + Setting::ENCODINGS,
+ :label => l("field_scm_path_encoding")
+ ) +
+ '
' + 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