Backports r23191 to 5.1-stable (#37072).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23193 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index d3d00a427eb26e4aa4463454aa6d58a5787f07b4..cee407053293f2d7a5f97c85ea68ec558c0b8cf7 100644 (file)
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -34,13 +34,13 @@
   <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
   <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %>
   <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
-    <%= link_to_function l(:button_save_object, object_name: l(:label_query).downcase),
+    <%= link_to_function l(:button_save_object, object_name: l(:label_query)).capitalize,
                          "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
                          :class => 'icon icon-save' %>
   <% end %>
   <% if !@query.new_record? && @query.editable_by?(User.current) %>
-    <%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :calendar => 1), :class => 'icon icon-edit' %>
-    <%= delete_link query_path(@query, :calendar => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
+    <%= link_to l(:button_edit_object, object_name: l(:label_query)).capitalize, edit_query_path(@query, :calendar => 1), :class => 'icon icon-edit' %>
+    <%= delete_link query_path(@query, :calendar => 1), {}, l(:button_delete_object, object_name: l(:label_query)).capitalize %>
   <% end %>
 </p>
 </div>

diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index a61b951fac1964a4709dc5f2a9519d53437c87e1..910aad664faf46f6f40cf203799b984d2d82aaef 100644 (file)
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -164,7 +164,7 @@
   <li><%= context_menu_link l(:button_copy), bulk_edit_issues_path(:ids => @issue_ids, :copy => '1'),
                           :class => 'icon icon-copy', :disabled => !@can[:copy] %></li>
 <% end %>
-  <li><%= context_menu_link l(:button_delete_object, object_name: (@issue_ids.size > 1 ? l(:label_issue_plural) : l(:label_issue)).downcase), issues_path(:ids => @issue_ids, :back_url => @back),
+  <li><%= context_menu_link l(:button_delete_object, object_name: (@issue_ids.size > 1 ? l(:label_issue_plural) : l(:label_issue))).capitalize, issues_path(:ids => @issue_ids, :back_url => @back),
                             :method => :delete, :data => {:confirm => issues_destroy_confirmation_message(@issues)}, :class => 'icon icon-del', :disabled => !@can[:delete] %></li>
 
   <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>

diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index e3bfa02ae925f28b3d0812297ad87438161d1073..725607b48fd080ebc40346b2a86ae72aeb40f4a3 100644 (file)
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -91,13 +91,13 @@
   <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
               :class => 'icon icon-reload' %>
   <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
-    <%= link_to_function l(:button_save_object, object_name: l(:label_query).downcase),
+    <%= link_to_function l(:button_save_object, object_name: l(:label_query)).capitalize,
                          "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit();",
                          :class => 'icon icon-save' %>
   <% end %>
 <% if !@query.new_record? && @query.editable_by?(User.current) %>
-  <%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
-  <%= delete_link query_path(@query, :gantt => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
+  <%= link_to l(:button_edit_object, object_name: l(:label_query)).capitalize, edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
+  <%= delete_link query_path(@query, :gantt => 1), {}, l(:button_delete_object, object_name: l(:label_query)).capitalize %>
 <% end %>
 </p>
 </div>

diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb
index 1904f21711c8f8c6892caf44d16b67a7e85f5b50..51db51b59ecf2d0bbe85514d5ee036159b1294c1 100644 (file)
--- a/app/views/issues/_action_menu.html.erb
+++ b/app/views/issues/_action_menu.html.erb
@@ -9,7 +9,7 @@
             :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
 <%= actions_dropdown do %>
   <%= copy_object_url_link(issue_url(@issue, only_path: false)) %>
-  <%= link_to l(:button_delete_object, object_name: l(:label_issue).downcase), issue_path(@issue),
+  <%= link_to l(:button_delete_object, object_name: l(:label_issue)).capitalize, issue_path(@issue),
               :data => {:confirm => issues_destroy_confirmation_message(@issue)},
               :method => :delete, :class => 'icon icon-del' if @issue.deletable? %>
 <% end %>

diff --git a/app/views/queries/_query_form.html.erb b/app/views/queries/_query_form.html.erb
index 87e455bd6e50a6790097533c1b57a8d30ac9734b..fda9d80199261ecc506ad88d5fd9b70f610e170f 100644 (file)
--- a/app/views/queries/_query_form.html.erb
+++ b/app/views/queries/_query_form.html.erb
@@ -57,15 +57,15 @@
   <%= link_to l(:button_clear), { :set_filter => 1, :sort => '', :project_id => @project }, :class => 'icon icon-reload'  %>
   <% if @query.new_record? %>
     <% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
-      <%= link_to_function l(:button_save_object, object_name: l(:label_query).downcase),
+      <%= link_to_function l(:button_save_object, object_name: l(:label_query)).capitalize,
                            "$('#query_type').prop('disabled',false);$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
                            :class => 'icon icon-save' %>
     <% end %>
   <% else %>
     <% if @query.editable_by?(User.current) %>
       <% redirect_params = (controller_name == 'admin' && action_name == 'projects') ? {:admin_projects => 1} : {} %>
-      <%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, redirect_params), :class => 'icon icon-edit' %>
-      <%= delete_link query_path(@query, redirect_params), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
+      <%= link_to l(:button_edit_object, object_name: l(:label_query)).capitalize, edit_query_path(@query, redirect_params), :class => 'icon icon-edit' %>
+      <%= delete_link query_path(@query, redirect_params), {}, l(:button_delete_object, object_name: l(:label_query)).capitalize %>
     <% end %>
   <% end %>
 </p>