Makes permission screens localized (#2070).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1943 e93f8b46-1217-0410-a6f0-8f06a7374b81

4 files changed, 8 insertions, 7 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2fdc119c1..c72763dbb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -129,8 +129,9 @@ module ApplicationHelper
     l(:label_added_time_by, author_tag, time_tag)
   end
   
-  def l_or_humanize(s)
-    l_has_string?("label_#{s}".to_sym) ? l("label_#{s}".to_sym) : s.to_s.humanize
+  def l_or_humanize(s, options={})
+    k = "#{options[:prefix]}#{s}".to_sym
+    l_has_string?(k) ? l(k) : s.to_s.humanize
   end
   
   def day_name(day)
diff --git a/app/views/roles/_form.rhtml b/app/views/roles/_form.rhtml
index 4aad45471..a167907e8 100644
--- a/app/views/roles/_form.rhtml
+++ b/app/views/roles/_form.rhtml
@@ -15,11 +15,11 @@
 <div class="box" id="permissions">
 <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
 <% perms_by_module.keys.sort.each do |mod| %>
-    <fieldset><legend><%= mod.blank? ? l(:label_project) : mod.humanize %></legend>
+    <fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
     <% perms_by_module[mod].each do |permission| %>
         <label class="floating">
         <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
-        <%= permission.name.to_s.humanize %>
+        <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
         </label>
     <% end %>
     </fieldset>
diff --git a/app/views/roles/report.rhtml b/app/views/roles/report.rhtml
index 8e254379e..f5ebc8845 100644
--- a/app/views/roles/report.rhtml
+++ b/app/views/roles/report.rhtml
@@ -19,14 +19,14 @@
 <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
 <% perms_by_module.keys.sort.each do |mod| %>
     <% unless mod.blank? %>
-        <tr><%= content_tag('th', mod.humanize, :colspan => (@roles.size + 1), :align => 'left') %></tr>
+        <tr><%= content_tag('th', l_or_humanize(mod, :prefix => 'project_module_'), :colspan => (@roles.size + 1), :align => 'left') %></tr>
     <% end %>
     <% perms_by_module[mod].each do |permission| %>
         <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
         <td>
             <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
                                                                 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
-            <%= permission.name.to_s.humanize %>
+            <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
         </td>
         <% @roles.each do |role| %>
         <td align="center">
diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml
index a9a5f4742..bc0141187 100644
--- a/app/views/settings/_notifications.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -17,7 +17,7 @@
 <fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
 <% @notifiables.each do |notifiable| %>
   <label><%= check_box_tag 'settings[notified_events][]', notifiable, Setting.notified_events.include?(notifiable) %>
-  <%= l_or_humanize(notifiable) %></label><br />
+  <%= l_or_humanize(notifiable, :prefix => 'label_') %></label><br />
 <% end %>
 <%= hidden_field_tag 'settings[notified_events][]', '' %>
 <p><%= check_all_links('notified_events') %></p>