SONAR-3392 Applied normalization rules to modal windows labels

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 4a32ebe769a64403acaa9c8709d7926efa4319aa..38febb529309841b6dbac4af4760afb1aa753933 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -2261,7 +2261,7 @@ projects_role.codeviewer=Code Viewers
 projects_role.codeviewer.desc=Ability to view the source code of the project.
 projects_role.bulk_change=Bulk Change
 projects_role.apply_template=Apply Permission Template
-projects_role.apply_template_to_xxx=Apply Permission Template to "{0}"
+projects_role.apply_template_to_xxx=Apply Permission Template To "{0}"
 projects_role.no_projects=There are currently no results to apply the permission template to.
 
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb
index 950a07da449a19ebc3e87e426ef34c60d007f53c..b7d7f2be32e149f7a3fa08e0a0df49f2433f62b7 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/_default_templates_form.html.erb
@@ -7,7 +7,7 @@
       <div class="modal-error"/>
       <% @root_qualifiers.each do |qualifier| %>
         <div class="modal-field">
-          <%= label_tag("default_template_#{qualifier}", " For #{message('qualifier.' + qualifier).downcase}s:") %>
+          <%= label_tag("default_template_#{qualifier}", " For #{message('qualifier.' + qualifier).downcase}s") %>
           <%= select_tag("default_template_#{qualifier}", options_for_select(@permission_templates_options, @default_templates[qualifier])) %>
         </div>
       <% end %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb
index 4b9d4d4c5a5f80246faf0c1f81edd6122bda32e1..bab848223da398830cb6ea23e82a34335946e6fa 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_apply_template_form.html.erb
@@ -19,7 +19,7 @@
         </div>
       <% else %>
         <div class="modal-field">
-          <%= label_tag 'template_key', 'Permission Template:' %>
+          <%= label_tag 'template_key', 'Permission Template' %>
           <%= select_tag('template_key', options_for_select(@permission_templates, -1), :style => 'width: 250px;') %>
           <% unless params[:project_name] %>
             <span style="float:right" class="note">(<%= "#{components.size} #{message('qualifier.' + qualifier)}s" %>)</span><br/>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb
index 0a060683c5d156ec388a990c3d7937a32f52c378..b33f02316b62df1da8e3d2c0eb5149a11bff546c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_groups.html.erb
@@ -8,7 +8,7 @@
   <input name="role" value="<%= @role -%>" type="hidden"/>
   <fieldset>
     <div class="modal-head">
-      <h2><%= @project ? 'Edit Permissions for: ' + h(@project.name) : "Edit Global Permission: #{message("global_permissions.#{@role}")}" -%></h2>
+      <h2><%= @project ? 'Edit Permissions For: ' + h(@project.name) : "Edit Global Permission: #{message("global_permissions.#{@role}")}" -%></h2>
     </div>
     <div class="modal-body">
       <div class="modal-error"/>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb
index c2703c220dbf2fc1d7ad1cd20fbc68946f07fac3..07a4e2bf1f99d029735e0da7786f1f77780a1597 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_edit_users.html.erb
@@ -8,7 +8,7 @@
   <input name="role" value="<%= @role -%>" type="hidden" />
   <fieldset>
     <div class="modal-head">
-      <h2><%= @project ? 'Edit Permissions for: ' + h(@project.name) : "Edit Global Permission: #{message("global_permissions.#{@role}")}" -%></h2>
+      <h2><%= @project ? 'Edit Permissions For: ' + h(@project.name) : "Edit Global Permission: #{message("global_permissions.#{@role}")}" -%></h2>
     </div>
     <div class="modal-body">
       <div class="modal-error"/>