Update modals labels

11 files changed, 60 insertions, 41 deletions

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 c03688bafa5..647dacca571 100644
--- 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
@@ -359,10 +359,15 @@ global_permissions.page=Global Permissions
 global_permissions.page.description=Grant and revoke permissions to make changes at the global level. These permissions include editing quality profiles, sharing dashboards, and performing global system administration.
 manual_metrics.page=Manual Metrics
 manual_metrics.page.description=These metrics are available for all projects. Manual measures can be set at project level via the configuration interface.
+manual_metrics.add_manual_metric=Add New Manual Metric
+manual_metrics.delete_manual_metric=Delete Manual Metric
+manual_metrics.delete_manual_metric_message=Are you sure that you want to delete manual metric "{0}"? \n Warning: all the associated manual measures will be deleted.
 manual_measures.page=Manual Measures
 manual_measures.page.description=Update the values of manual metrics for this project. Changes will take effect at the project's next analysis. Manual Metrics must be created at the global level.
 manual_rules.page=Manual Rules
 manual_rules.page.description=These rules are available for all projects. Manual issues can be created at project level via the component code viewer.
+manual_rules.delete_manual_rule=Delete Manual Rule
+manual_rules.delete_manual_rule_message=Are you sure that you want to delete manual rule "{0}"?
 roles.page=Project Permissions
 roles.page.description=Grant and revoke project-level permissions to Browse (view a project's metrics), See Source Code, and Administer individual projects. Permissions can be granted to groups or individual users.
 roles.page.description2=Grant and revoke project-level permissions. Permissions can be granted to groups or individual users.
@@ -691,6 +696,7 @@ comparison.version.latest=LATEST
 #------------------------------------------------------------------------------
 
 action_plans.add_action_plan=Add action plan
+action_plans.add_new_action_plan=Add New Action Plan
 action_plans.col.status=St.
 action_plans.col.name=Name
 action_plans.col.due_for=Due for
@@ -705,9 +711,11 @@ action_plans.confirm_close=Close this action plan? There are still open issues l
 action_plans.create_form_title=Create Action Plan
 action_plans.edit_action_plan=Edit Action Plan
 action_plans.same_name_in_same_project=An action plan with this name already exists in this project.
-action_plans.date_format_help=The date should be entered using the following pattern: 'year-month-day'. For instance, '2014-12-31'.
+action_plans.date_format_help=The date should be entered using the following pattern: "year-month-day". For instance, "2014-12-31".
 action_plans.date_not_valid=Date not valid
 action_plans.date_cant_be_in_past=The dead-line can't be in the past
+action_plans.delete=Delete Action Plan
+action_plans.delete_message=Are you sure that you want to delete action plan "{0}"? Associated issues will not be deleted.
 action_plans.closed_action_plan=Closed Action Plans
 action_plans.no_issues_linked_to_action_plan=No issues linked to this action plan yet.
 action_plans.status.OPEN=Open
@@ -1348,8 +1356,8 @@ test_viewer.files_covered_by=Files covered by <b>{0}</b> ({1})
 #
 #------------------------------------------------------------------------------
 
-manual_measures.add_measure_link=Add measure
-manual_measures.manage_metrics_link=Manage metrics
+manual_measures.add_measure=Add Manual Measure
+manual_measures.manage_metrics=Manage Metrics
 manual_measures.col.domain=Domain
 manual_measures.col.metric=Metric
 manual_measures.col.value=Value
@@ -1359,7 +1367,10 @@ manual_measures.col.date=Date
 manual_measures.col.operations=Operations
 manual_measures.col.last_change=Last change
 manual_measures.col.last_change_label=By {0} at {1}
-manual_measures.add_measure_title=Add manual measure
+manual_measures.create_measure=Create Manual Measure
+manual_measures.delete_measure=Delete Manual Measure
+manual_measures.delete_measure.desc=Are you sure that you want to delete manual measure "{0}"?
+manual_measures.edit_measure=Edit Manual Measure: {0}
 manual_measures.save_button=Save
 manual_measures.save_and_add_button=Save & Add new
 manual_measures.pending_message=Pending measures are marked with orange box. Their values will be integrated to project during next analysis.
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb
index d81e89f4a6a..086aab29dfb 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb
@@ -29,7 +29,7 @@
         </div>
 
         <div class="modal-foot">
-            <input type="submit" value="<%= h(message('edit')) -%>"/>
+            <input type="submit" value="<%= h(message('save')) -%>"/>
             <%= link_to message('cancel'), { :controller => 'action_plans', :action => 'index', :id => @resource.id}, { :class => 'action' } %>
         </div>
     </fieldset>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb
index 77153747223..9e7d5e512df 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb
@@ -1,13 +1,16 @@
 <div>
-    <% if profiles_administrator? %>
-      <ul style="float: right" class="horizontal">
-          <li class="marginleft10 add">
-              <a id="create-link-action_plans" href="<%=ApplicationController.root_context-%>/action_plans/create_form/<%= h(@resource.id) -%>"  class="open-modal link-action">Add new action plan</a>
-          </li>
-      </ul>
-    <% end %>
-    <h1 class="admin-page-title"><%= message('action_plans.page') -%></h1>
-    <p class="admin-page-description"><%= message('action_plans.page.description') -%></p>
+  <% if profiles_administrator? %>
+  <ul style="float: right" class="horizontal">
+    <li class="marginleft10 add">
+      <a id="create-link-action_plans"
+         href="<%=ApplicationController.root_context-%>/action_plans/create_form/<%= h(@resource.id) -%>"
+         class="open-modal link-action"><%= message('action_plans.add_new_action_plan') -%></a>
+    </li>
+  </ul>
+  <% end %>
+  <h1 class="admin-page-title"><%= message('action_plans.page') -%></h1>
+
+  <p class="admin-page-description"><%= message('action_plans.page.description') -%></p>
 </div>
 <table width="100%" id="action-plans">
   <tr>
@@ -63,8 +66,8 @@
                                    :class => 'link-action link-red',
                                    :id => "delete_#{h(plan.key)}",
                                    :confirm_button => message('delete'),
-                                   :confirm_title => 'Delete action plan: '+ h(plan.name()),
-                                   :confirm_msg => message('action_plans.confirm_delete'),
+                                   :confirm_title => message('action_plans.delete'),
+                                   :confirm_msg => message('action_plans.delete_message', :params => [h(plan.name)]),
                                    :confirm_msg_params => ''
               -%>
             </td>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb
index 627d2ed4188..83093066d73 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_create_form.html.erb
@@ -10,7 +10,7 @@
     <form action="<%= url_for :action => 'create' -%>" method="POST" id="measure_create_form">
       <fieldset>
         <div class="modal-head">
-          <h2><%= message('manual_measures.add_measure_title') -%></h2>
+          <h2><%= message('manual_measures.create_measure') -%></h2>
         </div>
         <% if @manual_metrics.empty? %>
           <div class="modal-body">
@@ -39,7 +39,7 @@
                 <%= options_grouped_by_domain(@manual_metrics, nil, :include_empty => true) -%>
               </select>
               &nbsp;
-              <%= link_to message('manual_measures.manage_metrics_link'), :controller => 'metrics', :action => 'index' if has_role?(:admin)-%>
+              <%= link_to message('manual_measures.manage_metrics'), :controller => 'metrics', :action => 'index' if has_role?(:admin)-%>
             </div>
             <div class="modal-field">
               <label for="measures[]"><%= message('manual_measures.col.value') -%> <em class="mandatory">*</em></label>
@@ -60,7 +60,7 @@
          <% end %>
         <div class="modal-foot">
           <% if ! @manual_metrics.empty? %>
-            <%= submit_tag 'create' %>
+            <%= submit_tag message('create') %>
           <% end %>
           <%= link_to message('cancel'), :action => 'index', :id => @resource.id -%>
         </div>
@@ -71,4 +71,4 @@
     $j("#measure_create_form").modalForm();
   </script>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb
index e746fadab40..a750e7eaca7 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/_edit_form.html.erb
@@ -1,7 +1,7 @@
 <form action="<%= url_for :action => 'edit' -%>" method="POST" id="measure_edit_form">
     <fieldset>
         <div class="modal-head">
-            <h2>Edit manual measure: <%= h @metric.short_name -%></h2>
+            <h2><%= message('manual_measures.edit_measure', :params => [h(@metric.short_name)]) -%></h2>
         </div>
 
         <div class="modal-body">
@@ -32,7 +32,7 @@
         </div>
 
         <div class="modal-foot">
-          <%= submit_tag 'save'%>
+          <%= submit_tag message('save') %>
           <%= link_to message('cancel'), :action => 'index', :id => @resource.id -%>
         </div>
     </fieldset>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
index 37fef076e42..2e3a5ce3d3b 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb
@@ -14,7 +14,9 @@
   <ul style="float: right" class="horizontal">
     <li class="marginleft10 add">
 
-      <a id="addMeasureLink" href="<%=ApplicationController.root_context-%>/manual_measures/create_form/<%= @resource.id -%>" class="open-modal link-action"><%= message('manual_measures.add_measure_link') -%></a>
+      <a id="addMeasureLink"
+         href="<%=ApplicationController.root_context-%>/manual_measures/create_form/<%= @resource.id -%>"
+         class="open-modal link-action"><%= message('manual_measures.add_measure') -%></a>
 
     </li>
   </ul>
@@ -69,8 +71,8 @@
                            :class => 'link-action link-red',
                            :id => "delete_#{measure.metric.key}",
                            :confirm_button => message('delete'),
-                           :confirm_title => 'Delete measure: '+measure.metric.short_name,
-                           :confirm_msg => 'Are you sure that you want to delete the measure '+measure.metric.short_name+'?'
+                           :confirm_title => message('manual_measures.delete_measure'),
+                           :confirm_msg => message('manual_measures.delete_measure.desc', :params => [measure.metric.short_name])
         -%>
       </td>
     </tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_create_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_create_form.html.erb
index 33ba0337341..11d27c00b6e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_create_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_create_form.html.erb
@@ -21,7 +21,7 @@
           </div>
 
           <div class="modal-foot">
-              <input type="submit" value="Create"/>
+              <input type="submit" value="<%= message('create') -%>">
               <%= link_to 'Cancel', { :controller => 'manual_rules', :action => 'index'}, { :class => 'action' } %><br/>
           </div>
       </fieldset>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_edit_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_edit_form.html.erb
index 620e48f490c..60943af002b 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_edit_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/_edit_form.html.erb
@@ -22,7 +22,7 @@
       </div>
 
       <div class="modal-foot">
-        <input type="submit" value="save"/>
+        <input type="submit" value="<%= message('save') -%>">
         <%= link_to 'Cancel', { :controller => 'manual_rules', :action => 'index'}, { :class => 'action' } %><br/>
       </div>
     </fieldset>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
index da667469921..7183c220507 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb
@@ -40,8 +40,8 @@
                  :class => 'link-action link-red',
                  :id => "delete_#{rule.key.parameterize}",
                  :confirm_button => message('delete'),
-                 :confirm_title => 'Delete rule: '+rule.name,
-                 :confirm_msg => 'Are you sure that you want to delete the rule '+rule.name+'?',
+                 :confirm_title => message('manual_rules.delete_manual_rule'),
+                 :confirm_msg => message('manual_rules.delete_manual_rule_message', :params => [h(rule.name)]),
                  :confirm_msg_params => [rule.name]
               -%>
             </td>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb
index cdcaa48e17b..638a2cc25c7 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/_create_form.html.erb
@@ -24,7 +24,7 @@
     </div>
 
     <div class="modal-foot">
-      <%= submit_tag 'create'%>
+      <%= submit_tag message('create') %>
       <%= link_to message('cancel'), { :controller => 'metrics', :action => 'index', :id => nil}, { :class => 'action' } %>
     </div>
   </fieldset>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
index cf33b999538..f355d2f9793 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
@@ -1,13 +1,16 @@
 <div>
-    <% if profiles_administrator? %>
-      <ul style="float: right" class="horizontal">
-          <li class="marginleft10 add">
-              <a id="create-link-metric" href="<%=ApplicationController.root_context-%>/metrics/create_form" class="open-modal link-action">Add new metric</a>
-          </li>
-      </ul>
-    <% end %>
-    <h1 class="admin-page-title"><%= message('manual_metrics.page') -%></h1>
-    <p class="admin-page-description"><%= message('manual_metrics.page.description') -%> </p>
+  <% if profiles_administrator? %>
+  <ul style="float: right" class="horizontal">
+    <li class="marginleft10 add">
+      <a id="create-link-metric"
+         href="<%=ApplicationController.root_context-%>/metrics/create_form"
+         class="open-modal link-action"><%= message('manual_metrics.add_manual_metric') -%></a>
+    </li>
+  </ul>
+  <% end %>
+  <h1 class="admin-page-title"><%= message('manual_metrics.page') -%></h1>
+
+  <p class="admin-page-description"><%= message('manual_metrics.page.description') -%> </p>
 </div>
 
 <table width="100%">
@@ -45,8 +48,8 @@
                                  :class => 'link-action link-red',
                                  :id => "delete_#{h(metric.short_name)}",
                                  :confirm_button => message('delete'),
-                                 :confirm_title => 'Delete manual metric: '+ metric.key,
-                                 :confirm_msg => 'Warning : all the measures will be deleted.',
+                                 :confirm_title => message('manual_metrics.delete_manual_metric'),
+                                 :confirm_msg => message('manual_metrics.delete_manual_metric_message', :params => [h(metric.key)]),
                                  :confirm_msg_params => [metric.id]
               -%>
             <% end %>