From b8c9c4295342649366dd1c5ac0197386ae7c3d1d Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com>
Date: Thu, 20 Jun 2013 15:40:33 +0200
Subject: [PATCH] SONAR-4136 Fixed missing l10n labels

---
 .../src/main/resources/org/sonar/l10n/core.properties     | 7 +++++--
 .../WEB-INF/app/views/dashboards/_create_form.html.erb    | 8 ++++----
 .../WEB-INF/app/views/dashboards/_delete_form.html.erb    | 7 +++++--
 .../WEB-INF/app/views/dashboards/_edit_form.html.erb      | 6 +++---
 4 files changed, 17 insertions(+), 11 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 f47c3cfb744..7528990291e 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
@@ -646,7 +646,8 @@ dashboard.no_dashboard=No dashboard
 dashboard.do_you_want_to_delete_dashboard=Do you want to delete this dashboard?
 dashboard.available_dashboards=Available Dashboards
 dashboard.shared_dashboards=Shared Dashboards
-dashboard.create_dashboard=New dashboard
+dashboard.new_dashboard=New dashboard
+dashboard.create_dashboard=Create dashboard
 dashboard.create_project_dashboard=Create project dashboard
 dashboard.create_global_dashboard=Create global dashboard
 dashboard.edit_dashboard=Edit dashboard
@@ -661,6 +662,8 @@ dashboard.global_dashboards.description=These dashboards are displayed to anonym
 dashboard.project_dashboards.description=These dashboards are displayed to anonymous users or users who have not customized their dashboards.
 dashboard.shared_dashboards.description=These dashboards can be added to default dashboards.
 dashboard.username.default=[SonarQube]
+dashboard.delete_confirm_title=Delete dashboard
+dashboard.delete_dashboard=Delete dashboard
 
 
 #------------------------------------------------------------------------------
@@ -2200,7 +2203,7 @@ global_role.admin.desc=Ability to perform all administration functions for the i
 global_role.profileadmin=Quality Profile Administration
 global_role.profileadmin.desc=Ability to perform any action on the quality profiles.
 global_role.sharedashboard=Dashboard Sharing
-global_role.sharedashboard.desc=Ability to share eligible dashboards.
+global_role.sharedashboard.desc=Ability to share dashboards that any user will be able to follow.
 
 
 #------------------------------------------------------------------------------
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create_form.html.erb
index 13606eac007..5cee02f7eaf 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_create_form.html.erb
@@ -6,12 +6,12 @@
   <% end %>
   <fieldset>
     <div class="modal-head">
-      <h2><%= message('dashboard.create_dashboard') -%></h2>
+      <h2><%= message('dashboard.new_dashboard') -%></h2>
     </div>
     <div class="modal-body">
       <% if @dashboard %>
-        <% @dashboard.errors.each do |attr, msg| %>
-          <p class="error"><%= h "#{attr} #{msg}" -%></p>
+        <% @dashboard.errors.full_messages.each do |msg| %>
+          <p class="error"><%= h msg -%></p>
         <% end %>
       <% end %>
       <div class="modal-field">
@@ -30,7 +30,7 @@
       <% end %>
     </div>
     <div class="modal-foot">
-      <input type="submit" value="<%= h message('save') -%>" id="save-submit"/>
+      <input type="submit" value="<%= h message('dashboard.create_dashboard') -%>" id="save-submit"/>
       <a href="#" onclick="return closeModalWindow()" id="save-cancel"><%= h message('cancel') -%></a>
     </div>
   </fieldset>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_delete_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_delete_form.html.erb
index 87eb2f68ea2..cdc4ea42cc5 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_delete_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_delete_form.html.erb
@@ -5,13 +5,16 @@
       <h2><%= message 'dashboard.delete_confirm_title' -%></h2>
     </div>
     <div class="modal-body">
+      <% @dashboard.errors.full_messages.each do |msg| %>
+        <p class="error"><%= h msg -%></p>
+      <% end %>
       <div class="info">
         <img src="<%= ApplicationController.root_context -%>/images/information.png" style="vertical-align: text-bottom"/>
-        <%= message 'dashboard.delete_confirm_message' -%>
+        <%= message 'dashboard.do_you_want_to_delete_dashboard' -%>
       </div>
     </div>
     <div class="modal-foot">
-      <input type="submit" value="<%= message 'dashboard.delete_confirm_button' -%>" id="confirm-submit"/>
+      <input type="submit" value="<%= message 'dashboard.delete_dashboard' -%>" id="confirm-submit"/>
       <a href="#" onclick="return closeModalWindow()" id="confirm-cancel"><%= h message('cancel') -%></a>
     </div>
   </fieldset>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit_form.html.erb
index ee8aab60363..a3312878ae5 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_edit_form.html.erb
@@ -10,8 +10,8 @@
       <h2><%= message('dashboard.edit_dashboard') -%></h2>
     </div>
     <div class="modal-body">
-      <% @dashboard.errors.each do |attr, msg| %>
-        <p class="error"><%= h "#{attr} #{msg}" -%></p>
+      <% @dashboard.errors.full_messages.each do |msg| %>
+        <p class="error"><%= h msg -%></p>
       <% end %>
       <div class="modal-field">
         <label for="name"><%= h message('name') -%> <em class="mandatory">*</em></label>
@@ -37,7 +37,7 @@
       <% end %>
     </div>
     <div class="modal-foot">
-      <input type="submit" value="<%= h message('save') -%>" id="save-submit"/>
+      <input type="submit" value="<%= h message('dashboard.update_dashboard') -%>" id="save-submit"/>
       <a href="#" onclick="return closeModalWindow()" id="save-cancel"><%= h message('cancel') -%></a>
     </div>
   </fieldset>
-- 
2.39.5