diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index abe76c79..b66851ee 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -95,6 +95,10 @@ module ApplicationHelper
l(:label_added_time_by, author || 'Anonymous', time_tag)
end
+ def l_or_humanize(s)
+ l_has_string?("label_#{s}".to_sym) ? l("label_#{s}".to_sym) : s.to_s.humanize
+ end
+
def day_name(day)
l(:general_day_names).split(',')[day-1]
end
diff --git a/app/views/projects/settings/_modules.rhtml b/app/views/projects/settings/_modules.rhtml
index 2ecdaf7e..d600f209 100644
--- a/app/views/projects/settings/_modules.rhtml
+++ b/app/views/projects/settings/_modules.rhtml
@@ -3,7 +3,7 @@
:html => {:id => 'modules-form'} do |f| %>
-
Select modules to enable for this project:
+
<%= l(:text_select_project_modules) %>
<% Redmine::AccessControl.available_project_modules.each do |m| %>
diff --git a/app/views/projects/settings/_repository.rhtml b/app/views/projects/settings/_repository.rhtml
index 10530a29..95830ab9 100644
--- a/app/views/projects/settings/_repository.rhtml
+++ b/app/views/projects/settings/_repository.rhtml
@@ -1,11 +1,12 @@
<% remote_form_for :repository, @repository,
:url => { :controller => 'repositories', :action => 'edit', :id => @project },
- :builder => TabularFormBuilder do |f| %>
+ :builder => TabularFormBuilder,
+ :lang => current_language do |f| %>
<%= error_messages_for 'repository' %>
-
<%= scm_select_tag(@repository) %>
+
<%= scm_select_tag(@repository) %>
<%= repository_field_tags(f, @repository) if @repository %>
diff --git a/app/views/projects/settings/_wiki.rhtml b/app/views/projects/settings/_wiki.rhtml
index 267c077e..00da9303 100644
--- a/app/views/projects/settings/_wiki.rhtml
+++ b/app/views/projects/settings/_wiki.rhtml
@@ -1,6 +1,7 @@
<% remote_form_for :wiki, @wiki,
:url => { :controller => 'wikis', :action => 'edit', :id => @project },
- :builder => TabularFormBuilder do |f| %>
+ :builder => TabularFormBuilder,
+ :lang => current_language do |f| %>
<%= error_messages_for 'wiki' %>
diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml
index ca04352f..ac321385 100644
--- a/app/views/settings/_notifications.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -12,7 +12,7 @@