Merged r5950 to r5960 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5961 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index a5f10586c93558bf215adf8cce250231db212d1e..4c7a7c44ee0a72ef44c80e04de11bfd230f17e4c 100644 (file)
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -33,7 +33,9 @@ module SettingsHelper
       choices = [[blank_text.is_a?(Symbol) ? l(blank_text) : blank_text, '']] + choices
     end
     setting_label(setting, options) +
-      select_tag("settings[#{setting}]", options_for_select(choices, Setting.send(setting).to_s), options)
+      select_tag("settings[#{setting}]",
+                 options_for_select(choices, Setting.send(setting).to_s),
+                 options)
   end
 
   def setting_multiselect(setting, choices, options={})
@@ -44,10 +46,15 @@ module SettingsHelper
       hidden_field_tag("settings[#{setting}][]", '') +
       choices.collect do |choice|
         text, value = (choice.is_a?(Array) ? choice : [choice, choice])
-        content_tag('label',
-          check_box_tag("settings[#{setting}][]", value, Setting.send(setting).include?(value)) + text.to_s,
+        content_tag(
+          'label',
+          check_box_tag(
+             "settings[#{setting}][]",
+             value,
+             Setting.send(setting).include?(value)
+           ) + text.to_s,
           :class => 'block'
-        )
+         )
       end.join
   end
 
@@ -64,7 +71,7 @@ module SettingsHelper
   def setting_check_box(setting, options={})
     setting_label(setting, options) +
       hidden_field_tag("settings[#{setting}]", 0) +
-      check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options)
+        check_box_tag("settings[#{setting}]", 1, Setting.send("#{setting}?"), options)
   end
 
   def setting_label(setting, options={})

diff --git a/app/views/projects/settings/_repository.rhtml b/app/views/projects/settings/_repository.rhtml
index 57406a8baccae9f927eb244f6c262a4c557e8fac..3bd3b4338455433d807d9da8c8d722af6b74beb4 100644 (file)
--- a/app/views/projects/settings/_repository.rhtml
+++ b/app/views/projects/settings/_repository.rhtml
@@ -8,12 +8,9 @@
 <div class="box tabular">
 <p>
 <%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %>
-<% if @repository %>
-<br />
-<%= image_tag((@repository.class.scm_available ? 'true.png' : 'exclamation.png'))%>
-<%=  l(:text_scm_command) -%>: <%= @repository.class.scm_command %>
-|
-<%=  l(:text_scm_command_version) -%>: <%= @repository.class.scm_version_string %>
+<% if @repository && ! @repository.class.scm_available %>
+       <br />
+       <em><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em>
 <% end %>
 </p>
 <% button_disabled = true %>

diff --git a/app/views/settings/_repositories.rhtml b/app/views/settings/_repositories.rhtml
index f5fdc154ea37da8f59de128082c222cef9fe9737..b3c252f1680a401c811a673f9c67ba35f2420072 100644 (file)
--- a/app/views/settings/_repositories.rhtml
+++ b/app/views/settings/_repositories.rhtml
@@ -1,41 +1,95 @@
 <% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
 
+<fieldset class="box tabular settings enabled_scm">
+<legend><%= l(:setting_enabled_scm) %></legend>
+<table>
+  <tr>
+    <th></th>
+    <th><%= l(:text_scm_command)         %></th>
+    <th><%= l(:text_scm_command_version) %></th>
+  </tr>
+  <% Redmine::Scm::Base.all.collect do |choice| %>
+    <% scm_class = "Repository::#{choice}".constantize %>
+    <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
+    <% setting = :enabled_scm %>
+    <tr>
+      <td class="scm_name">
+        <%= 
+          check_box_tag(
+              "settings[#{setting}][]",
+               value,
+               Setting.send(setting).include?(value))
+         %>
+        <%= text.to_s %>
+      </td>
+      <td>
+         <%=
+           image_tag(
+              (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
+              :style => "vertical-align:bottom;"
+           )
+           %>
+          <%= scm_class.scm_command %>
+       </td>
+       <td>
+          <%= scm_class.scm_version_string %>
+       </td>
+     </tr>
+  <% end %>
+</table>
+<p class="scm_config">
+<%= l(:text_scm_config) %>
+</p>
+</fieldset>
+
 <div class="box tabular settings">
 <p><%= setting_check_box :autofetch_changesets %></p>
 
 <p><%= setting_check_box :sys_api_enabled,
-         :onclick => "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
+                         :onclick =>
+                             "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
 
-<p><%= setting_text_field :sys_api_key, :size     => 30,
-                                        :id       => 'settings_sys_api_key',
-                                        :disabled => !Setting.sys_api_enabled?,
-                                        :label    => :setting_mail_handler_api_key %>
-  <%= link_to_function l(:label_generate_key), "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
+<p><%= setting_text_field :sys_api_key,
+                          :size     => 30,
+                          :id       => 'settings_sys_api_key',
+                          :disabled => !Setting.sys_api_enabled?,
+                          :label    => :setting_mail_handler_api_key %>
+  <%= link_to_function l(:label_generate_key),
+                       "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
 </p>
 
-<p><%= setting_multiselect(:enabled_scm, Redmine::Scm::Base.all) %></p>
-
 <p><%= setting_text_field :repositories_encodings, :size => 60 %><br />
 <em><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
 </div>
 
-<fieldset class="box tabular settings"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
+<fieldset class="box tabular settings">
+<legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
 <p><%= setting_text_field :commit_ref_keywords, :size => 30 %><br />
 <em><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
-&nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id, [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, :label => false %>
-&nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio, (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }, :blank => :label_no_change_option, :label => false %>
+&nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
+                                                          [["", 0]] +
+                                                              IssueStatus.find(:all).collect{
+                                                                 |status| [status.name, status.id.to_s]
+                                                              },
+                                                          :label => false %>
+&nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio,
+                                                       (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
+                                                       :blank => :label_no_change_option,
+                                                       :label => false %>
 <br /><em><%= l(:text_comma_separated) %></em></p>
 
 <p><%= setting_check_box :commit_logtime_enabled,
-         :onclick => "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
+                         :onclick =>
+                            "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
 
 <p><%= setting_select :commit_logtime_activity_id,
-         [[l(:label_default), 0]] + TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]},
-         :disabled => !Setting.commit_logtime_enabled?%></p>
+                      [[l(:label_default), 0]] +
+                          TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]},
+                      :disabled => !Setting.commit_logtime_enabled?%></p>
 </fieldset>
 
 <%= submit_tag l(:button_save) %>

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 4cdae8f51eb3b02634f452777ac6826a7c9f6c1a..fa5c9308c869169d2ef8fc8ea475a4dfd5a564b0 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -973,3 +973,5 @@ bg:
   enumeration_doc_categories: Категории документи
   enumeration_activities: Дейности (time tracking)
   enumeration_system_activity: Системна активност
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index b14f258663e15a1c9190748e630fb59858c190e0..4dbd8817e5c4006aeb46c954e1f275e0349648b3 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -988,3 +988,5 @@ bs:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index e980e7594056dc1356806363cacec233be10c3ce..b7ee8a0532c2954bd4e27901ffc66f83e2c1bb44 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -977,3 +977,5 @@ ca:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index a990881d4178dfcc08a70926f7b56125e52a5692..baa608f598e1b34904a138278ff9e5035c1263e4 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -978,3 +978,5 @@ cs:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 6d9d5cfbb01d6561ee50718f72f3b4c3812d152a..bd939c683290a95b6e572b088349b672c6cec264 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -991,3 +991,5 @@ da:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2c361bde0419c4971974fb22a056fbe75571fc39..5ce8fddac41b8d65e302603418887e594895abca 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -991,3 +991,5 @@ de:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 8fbb54e90bc3ab14247888be365e4bdc7d27b0a8..a7cfe221691578289903fa32bbd0532d658449a2 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -974,3 +974,5 @@ el:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 8a39e7839fd333c8b117f535f4019ae26472c265..8af3e684d4094890fd4b5bdd82d4adb4c1411d30 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -977,3 +977,5 @@ en-GB:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 40d66093e3147499e67db58f777e924674a5e57c..401d608c8194890dd64d4b0ed5753c5b84ca4022 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -867,17 +867,17 @@ en:
   button_quote: Quote
   button_duplicate: Duplicate
   button_show: Show
-  
+
   status_active: active
   status_registered: registered
   status_locked: locked
-  
+
   version_status_open: open
   version_status_locked: locked
   version_status_closed: closed
 
   field_active: Active
-  
+
   text_select_mail_notifications: Select actions for which email notifications should be sent.
   text_regexp_info: eg. ^[A-Z0-9]+$
   text_min_max_length_info: 0 means no restriction
@@ -946,6 +946,8 @@ en:
   text_mercurial_repository_note: "Local repository (e.g. /hgrepo, c:\hgrepo)"
   text_scm_command: Command
   text_scm_command_version: Version
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
 
   default_role_manager: Manager
   default_role_developer: Developer

diff --git a/config/locales/es.yml b/config/locales/es.yml
index ca4da6811533a9352faf8443808bd9af05e053a6..71a9c1eccca88644ce034faf0a4870b1d676a10b 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1011,3 +1011,5 @@ es:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 29cc10c3c5591db3cd295b7a83ec19c7e13f4b01..296553389cf8da94486043722e08f1262af60838 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -978,3 +978,5 @@ eu:
   text_scm_command: Komandoa
   text_scm_command_version: Bertsioa
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 8805756006325f795a0463ab4a1cf667840f1033..6bba8ab71e04300627512150f3eb571706b2927e 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -977,3 +977,5 @@ fa:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index fc87be145bb3f0d2526eec7836a2f3f6889c3de8..85c2afff613ddd7cf710ec2444ee00642a71b309 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -995,3 +995,5 @@ fi:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e9c2cd2920e7756b9ee9eaac9af66e48fb5766ce..f0fa145ecd21ddfae62033499cce8f2c24414f4a 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -989,3 +989,5 @@ fr:
   text_scm_command: Commande
   text_scm_command_version: Version
   label_git_report_last_commit: Afficher le dernier commit des fichiers et répertoires
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 9e9c52bb49be30578a80ea01c51422522dac6dec..87dacd7e0cce17038b6e7858f8fb2cb2b21b6d53 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -986,3 +986,5 @@ gl:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6d78f736db60fab3def47f39074ede4e5f804b37..cb396537d9816e1d10f86a3375097ce48d973442 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -979,3 +979,5 @@ he:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 9eb8f6e2a419975f6349fbdcd42e44e7a398b24b..67be91a970a8fb956700ea656f23a876087a179d 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -981,3 +981,5 @@ hr:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e9dc9cb5174a110e6c4bd617d7d5151304221ad1..fd79d85c8e2cb1f0a0d77e87fcff888d564260c9 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -993,3 +993,5 @@
   text_scm_command: Parancs
   text_scm_command_version: Verzió
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 580fdce024327124f84ccfcfd6042763e801d9cc..b867c2e131a906e0a677e59fc58bad3ea6704f4f 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -982,3 +982,5 @@ id:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 52b28c664929cb5c626dc802addfb22554401dcf..48dfd17904e2e4eaffef750d5867bdcdf47db63d 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -975,3 +975,5 @@ it:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e6f75d0218236b46a09c0fc98ad2886134bc6b5f..11683d544737d1b3979b2950eee89d2089b069d6 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -392,7 +392,7 @@ ja:
   setting_commit_logtime_enabled: コミット時に作業時間を記録する
   setting_commit_logtime_activity_id: 作業時間の作業分類
   setting_gantt_items_limit: ガントチャート最大表示項目数
-  
+
   permission_add_project: プロジェクトの追加
   permission_add_subprojects: サブプロジェクトの追加
   permission_edit_project: プロジェクトの編集
@@ -448,7 +448,7 @@ ja:
   permission_delete_messages: メッセージの削除
   permission_delete_own_messages: 自身が記入したメッセージの削除
   permission_manage_subtasks: 子チケットの管理
-  
+
   project_module_issue_tracking: チケットトラッキング
   project_module_time_tracking: 時間トラッキング
   project_module_news: ニュース
@@ -459,7 +459,7 @@ ja:
   project_module_boards: フォーラム
   project_module_gantt: ガントチャート
   project_module_calendar: カレンダー
-  
+
   label_user: ユーザ
   label_user_plural: ユーザ
   label_user_new: 新しいユーザ
@@ -950,6 +950,8 @@ ja:
   text_mercurial_repository_note: "ローカルリポジトリ (例: /hgrepo, c:\hgrepo)"
   text_scm_command: コマンド
   text_scm_command_version: バージョン
+  text_scm_config: バージョン管理システムのコマンドをconfig/configuration.ymlで設定できます。設定後、Redmineを再起動してください。
+  text_scm_command_not_available: バージョン管理システムのコマンドが利用できません。管理画面にて設定を確認してください。
 
   default_role_manager: 管理者
   default_role_developer: 開発者

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 7fbe82a263353f436b9f309bdcd99135d5bd738f..e536900f40fe1925a477bbae5da692dbdc4cdd70 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1026,3 +1026,5 @@ ko:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 7004b19a14eabe372d23bb0c4204ddbddf815a4a..9052ae114a29e76d752f27e925c51032a1383783 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1034,3 +1034,5 @@ lt:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index e24763e58a0c5d90db923b20f7c63defa30335b4..c9920d67bb89ced5286977126113dda12cd9f206 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -969,3 +969,5 @@ lv:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 4822a8530dfb136ec0ab90fcbfa94ff7ea52a660..a1ff390eb92c453b9511cadcfbf6ba14259e3050 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -974,3 +974,5 @@ mk:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 6503b3247337f7f9cd778264148c60de302cb13e..29c79eae26a07dc2ed7bd16d6cd27e8e7b8f0f77 100644 (file)
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -975,3 +975,5 @@ mn:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index edea227517b7677d51da8b0062f97a1428e09ef4..ab33895f02a7b0ae64f8230a100779912356b588 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -956,3 +956,5 @@ nl:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/no.yml b/config/locales/no.yml
index 0b6c9e6f47a3a84ca6cb0dad796eb0ad7a06f88b..2bbb77e69ca024abff4c87470c3f1726eda227a9 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -961,3 +961,5 @@
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index dcf42cd8b58b1596199233e6964c13315ee59a6b..c36723c46e1eb8c1d7d4e40041f0be24f18fc74d 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -991,3 +991,5 @@ pl:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 1a64238f1069f2a58067b52ed3e7b35a5d56348a..e320f30daac86d26b13dd95ecccfe1927c804845 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -994,3 +994,5 @@ pt-BR:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 7e690d5a1474c67c565de6317528a101a1630da5..dbae58c3cd23e323fb445df7ecd671cafe065c2e 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -979,3 +979,5 @@ pt:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index eca40d519c07cc34fcae5994c35f0b87c4d63640..492743f727b8bc4b96e09391c758af483d4222c6 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -967,3 +967,5 @@ ro:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index db26b48fc4759bdc7e2b4b637297ed4434514262..1cdbcd589bdf256875b8fe194adb09ff2aa85d71 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1087,3 +1087,5 @@ ru:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a48dc64959e24613f9e7becc2a1e361bbef596b7..7968c470a5aeab3bbf7c1a438a262a395e4df115 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -969,3 +969,5 @@ sk:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 0b5eef0b9e0d97db5b179e26423a841533f4356b..c59e75969be5b595dc1da361468a950970bb81f4 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -970,3 +970,5 @@ sl:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index b434a2d86a8e30e574892b777413eb52aabb861d..e47562cb7eda464435c3666feffb68a45f9ff60c 100644 (file)
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -974,3 +974,5 @@ sr-YU:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 8b5befcf022b719ffab19e7bc3a5aa291702b338..cb3d39777dc149f6dde994ebee88ae541fa9a771 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -975,3 +975,5 @@ sr:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 596f7ce597a854b601749b2494922472732255c7..b8629b359b3ea3fc3872f2c652ba903e74db6b62 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1015,3 +1015,5 @@ sv:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/th.yml b/config/locales/th.yml
index b3fbfb7db2c9410f3820808ea99b9f965829bc95..1cb3b6c81fe55016333dc1c56dd1bfd70a3d26ba 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -971,3 +971,5 @@ th:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 38b0148dd10ddd55c143994e87f761b6a3edf341..c6e017bbb1319f6790112f42a39bbad63d8ad6d4 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -993,3 +993,5 @@ tr:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 6db0524f1dbd30bcaa1ff09ce61cad298316b763..b20806a6f4f20a36287cd821d64eb1bb91382fee 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -970,3 +970,5 @@ uk:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index a986795710158d65c0b7ab764ca72c922d1beaa2..cbac74fb0ebd0e59d1671b6a974650aa9a522b53 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1025,3 +1025,5 @@ vi:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index aa2feb7884bf9362ab0a8e4087ec2e6311ffaa69..474f1fb02952594b3e292678b90d2032a7cf4a24 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1055,3 +1055,5 @@
   enumeration_doc_categories: 文件分類
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 4fde52e730fe499fa819861c29bf936a386e02f9..47b4cb14f03546570e137ae10f1416e634510c4a 100644 (file)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -977,3 +977,5 @@ zh:
   text_scm_command: Command
   text_scm_command_version: Version
   label_git_report_last_commit: Report last commit for files and directories
+  text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+  text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 47eb839c8799d1b1c1be0fe83b032af99d3660c4..d74cba136ab8a7ba4be7c41d45dfc0375396540f 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -434,6 +434,10 @@ input#time_entry_comments { width: 90%;}
 .tabular.settings label{ margin-left: -300px; width: 295px; }
 .tabular.settings textarea { width: 99%; }
 
+.tabular.settings.enabled_scm table {width:100%}
+.tabular.settings.enabled_scm td.scm_name{ font-weight: bold; }
+.tabular.settings.enabled_scm p.scm_config{ padding-left: 8px; font-style:italic;}
+
 fieldset.settings label { display: block; }
 fieldset#notified_events .parent { padding-left: 20px; }
 
@@ -505,6 +509,8 @@ div.flash.warning {
        color: #A6750C;
 }
 
+span.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
+
 #errorExplanation ul { font-size: 0.9em;}
 #errorExplanation h2, #errorExplanation p { display: none; }