summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-26 05:11:01 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-26 05:11:01 +0000
commit2816ec98974a69d92313fa6e73ef02fa43bfa44b (patch)
treea6559f09aec585820d96447be5d56895f25b7e39
parente20a817d206223d8a94644504b652e31e0de245f (diff)
downloadredmine-2816ec98974a69d92313fa6e73ef02fa43bfa44b.tar.gz
redmine-2816ec98974a69d92313fa6e73ef02fa43bfa44b.zip
improve git repository note at project setting (#9129).
Contributed by Tomas Pospisek. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6638 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/repositories_helper.rb2
-rw-r--r--config/locales/en.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 6a1a4cc53..533a77630 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -228,7 +228,7 @@ module RepositoriesHelper
:disabled => (repository && !repository.root_url.blank?)
) +
'<br />' +
- 'Repository is bare and local (e.g. /gitrepo, c:\gitrepo)') +
+ l(:text_git_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 55b74a38e..e1bfce95e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -945,6 +945,7 @@ en:
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"
+ text_git_repository_note: "Repository is bare and local (e.g. /gitrepo, c:\gitrepo)"
text_mercurial_repository_note: "Local repository (e.g. /hgrepo, c:\hgrepo)"
text_scm_command: Command
text_scm_command_version: Version