SONAR-2589 Modification of all web ruby templates to use bundles

- Fix small bug on filter columns
- Add I18n on violation drilldown
- Add I18n on violation timemachine

diff --git a/plugins/sonar-i18n-en-plugin/src/main/resources/org/sonar/i18n/core.properties b/plugins/sonar-i18n-en-plugin/src/main/resources/org/sonar/i18n/core.properties
index 5ec3792e73c0b6fc18025b64df86d31417f318af..ce0be9f946690395dd22ef831e6b18c1b0bb941a 100644 (file)
--- a/plugins/sonar-i18n-en-plugin/src/main/resources/org/sonar/i18n/core.properties
+++ b/plugins/sonar-i18n-en-plugin/src/main/resources/org/sonar/i18n/core.properties
@@ -18,10 +18,12 @@ bold=Bold
 build_date=Build date
 cancel=Cancel
 category=Category
+calendar=Calendar
 change_verb=Change
 configure=Configure
 class=Class
 classes=Classes
+clear_verb=Clear
 closed=Closed
 code=Code
 color=Color
@@ -44,6 +46,7 @@ file=File
 files=Files
 filter_verb=Filter
 follow=Follow
+hide=Hide
 identifier_abbreviated=Id
 info=Info
 key=Key
@@ -455,6 +458,32 @@ components.explanation_launch_sonar_to_have_results=If Maven and Sonar are insta
 components.note_changes_impact_all_users=Note that these changes will impact all users and all projects.
 
 
+#------------------------------------------------------------------------------
+#
+# DRILLDOWN
+#
+#------------------------------------------------------------------------------
+
+drilldown.click_for_more_on_x=Click for more on {0} : {1}
+drilldown.no_violations=No violations
+drilldown.any_severity=Any severity
+drilldown.any_rule=Any rule
+
+
+#------------------------------------------------------------------------------
+#
+# TIME MACHINE
+#
+#------------------------------------------------------------------------------
+
+time_machine.show_date=Show date
+time_machine.show_event=Show event
+time_machine.distributions=Distributions
+time_machine.distribution_chart=Distribution chart
+time_machine.compare_on_chart=Compare on chart
+time_machine.set_as_default_for_all_users=Set as default (for all users)
+
+
 #------------------------------------------------------------------------------
 #
 # REVIEWS

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb
index 8b014ac9e570a4d488cba20664d74a266dee49b1..fe9d8cd678acbd8e7309e939baf4d879d622885c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb
@@ -39,7 +39,7 @@ class FilterColumn < ActiveRecord::Base
 
   def name
     if on_metric?
-      Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, "metric." + kee + ".name", nil, [].to_java)
+      Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, "metric." + kee + ".name", metric.short_name, [].to_java)
     else
       Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, family, kee, [].to_java)
     end

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/rules_parameter.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/rules_parameter.rb
index f5da840eb288b2edcf66e26384547f43913f0c58..acd78c8ecf21214f5cba86e12a802d54b886fe09 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/rules_parameter.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/rules_parameter.rb
@@ -50,7 +50,7 @@ class RulesParameter < ActiveRecord::Base
     return nil if (rule_plugin_name.nil? or rule_plugin_rule_key.nil?)
     
     i18n_key = 'rule.' + rule_plugin_name + '.' + rule_plugin_rule_key + '.param.' + read_attribute(:name)
-    result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, nil, [].to_java)     
+    result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getI18nMessage(I18n.locale, i18n_key, default_string, [].to_java)     
     result
   end
   

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
index a3d3cb61ca413ba41795f8c91fbea0a0bb8023a0..b15463e7cee7200eae66bda2c8cd3cbd11967a1d 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb
@@ -8,7 +8,7 @@
 
       <select id="select-comparison" name="period" onchange="submit()" class="small">
         <% if @drilldown.display_value? %>
-        <option value="">Time changes...</option>
+        <option value=""><%= message('time_changes') -%>...</option>
         <% end %>
         <% for period_index in 1..5 do %>
           <%= period_select_options(@snapshot, period_index) if @drilldown.display_period?(period_index) -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
index 6efef65afc9af4a22534e569640b4654260d5fdd..081728efc6b0865969b4deca909df46590c4e86f 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
@@ -11,7 +11,7 @@
 <% if @snapshot.project_snapshot.periods? %>
 - <form method="GET" action="<%= url_for :only_path=>true, :overwrite_params => {:period => nil} -%>" style="display: inline">
     <select id="select-comparison" name="period" onchange="submit()" class="small">
-      <option value="">Time changes...</option>
+      <option value=""><%= message('time_changes') -%>...</option>
       <%= violation_period_select_options(@snapshot, 1) -%>
       <%= violation_period_select_options(@snapshot, 2) -%>
       <%= violation_period_select_options(@snapshot, 3) -%>
@@ -49,17 +49,17 @@
            max = value if value && value>max
          end
        %>
-    <h3>Severity</h3>
+    <h3><%= message('severity') -%></h3>
     <table class="spacedicon" style="border: 1px solid #ccc;">
-         <%= render :partial => 'rule_priority', :locals => {:label => 'Blocker', :css => 'even', :priority_id => Sonar::RulePriority::PRIORITY_BLOCKER, :max => max, :measure => blocker_violations }%>
-       <%= render :partial => 'rule_priority', :locals => {:label => 'Critical', :css => 'odd', :priority_id => Sonar::RulePriority::PRIORITY_CRITICAL, :max => max, :measure => critical_violations }%>
-         <%= render :partial => 'rule_priority', :locals => {:label => 'Major', :css => 'even', :priority_id => Sonar::RulePriority::PRIORITY_MAJOR, :max => max, :measure => major_violations }%>
-         <%= render :partial => 'rule_priority', :locals => {:label => 'Minor', :css => 'odd', :priority_id => Sonar::RulePriority::PRIORITY_MINOR, :max => max, :measure => minor_violations }%>
-         <%= render :partial => 'rule_priority', :locals => {:label => 'Info', :css => 'even', :priority_id => Sonar::RulePriority::PRIORITY_INFO, :max => max, :measure => info_violations }%>
+         <%= render :partial => 'rule_priority', :locals => {:label => message('blocker'), :css => 'even', :priority_id => Sonar::RulePriority::PRIORITY_BLOCKER, :max => max, :measure => blocker_violations }%>
+         <%= render :partial => 'rule_priority', :locals => {:label => message('critical'), :css => 'odd', :priority_id => Sonar::RulePriority::PRIORITY_CRITICAL, :max => max, :measure => critical_violations }%>
+         <%= render :partial => 'rule_priority', :locals => {:label => message('major'), :css => 'even', :priority_id => Sonar::RulePriority::PRIORITY_MAJOR, :max => max, :measure => major_violations }%>
+         <%= render :partial => 'rule_priority', :locals => {:label => message('minor'), :css => 'odd', :priority_id => Sonar::RulePriority::PRIORITY_MINOR, :max => max, :measure => minor_violations }%>
+         <%= render :partial => 'rule_priority', :locals => {:label => message('info'), :css => 'even', :priority_id => Sonar::RulePriority::PRIORITY_INFO, :max => max, :measure => info_violations }%>
     </table>
   </td>
   <td class="column" align="left" style="white-space: normal;">
-   <h3>Rule</h3>
+   <h3><%= message('rule') -%></h3>
    <div class="scrollable">
        <table class="spacedicon" width="100%" id="col_rules">
              <%
@@ -97,7 +97,7 @@
                   %>
                <tr class="<%= clazz -%>">
                       <td width="1%" nowrap>
-                    <a id="<%= "rule#{rule_index}" -%>" title="Click for more on <%= rule.plugin_name -%>: <%= rule.plugin_rule_key -%>" onclick="window.open(this.href,'rule','height=800,width=900,scrollbars=1,resizable=1');return false;" href="<%= url_for :controller => 'rules', :action => 'show', :id => rule.key, :layout => 'false' -%>"><img src="<%= ApplicationController.root_context -%>/images/priority/<%= rule_measure.rule_priority -%>.png" /></a>
+                    <a id="<%= "rule#{rule_index}" -%>" title="<%= message('drilldown.click_for_more_on_x', :params => [rule.plugin_name, rule.plugin_rule_key]) -%>" onclick="window.open(this.href,'rule','height=800,width=900,scrollbars=1,resizable=1');return false;" href="<%= url_for :controller => 'rules', :action => 'show', :id => rule.key, :layout => 'false' -%>"><img src="<%= ApplicationController.root_context -%>/images/priority/<%= rule_measure.rule_priority -%>.png" /></a>
                           </td>
                       <td>
                          <%= link_to(rule.name, {:overwrite_params => {:rule => rule.key, :sid => nil, :priority => Sonar::RulePriority.to_s(@priority_id)}}, :title => "#{rule.plugin_name}: #{rule.plugin_rule_key}") %>
@@ -113,7 +113,7 @@
            <% end %>
 
            <% if rule_index==0 %>
-           <tr class="even"><td>No violations</td></tr>
+           <tr class="even"><td><%= message('drilldown.no_violations') -%></td></tr>
            <% end %>
        </table>
    </div>
@@ -174,19 +174,19 @@
 </table>
 <br/>
 <div style="font-size: 85%;background-color: #eee;color: #777;padding: 4px 5px;border: 1px solid #ddd;margin-bottom: 20px;">
-<b>Path:</b>
+<b><%= message('path') -%>:</b>
 <% if @priority_id %>
-<%= Sonar::RulePriority.to_s(@priority_id) %> <%= link_to 'clear', {:overwrite_params => {:priority => nil}} %>
+<%= Sonar::RulePriority.to_s(@priority_id) %> <%= link_to message('clear_verb'), {:overwrite_params => {:priority => nil}} %>
 <% else %>
-Any severity
+<%= message('drilldown.any_severity') -%>
 <% end %>&nbsp;&raquo;&nbsp;
 <% if @rule %>
-<%= h @rule.name %> <%= link_to 'clear', {:overwrite_params => {:rule => nil}} %>
+<%= h @rule.name %> <%= link_to message('clear_verb'), {:overwrite_params => {:rule => nil}} %>
 <% else %>
-Any rule
+<%= message('drilldown.any_rule') -%>
 <% end %>&nbsp;&raquo;&nbsp;
 <% paths.each do |path| %>
-<%= path[0] %> <%= link_to 'clear', {:overwrite_params => {:rids => path[1]}} %>&nbsp;&raquo;&nbsp;
+<%= path[0] %> <%= link_to message('clear_verb'), {:overwrite_params => {:rids => path[1]}} %>&nbsp;&raquo;&nbsp;
 <% end %>
 </div>
 <script>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/timemachine/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/timemachine/index.html.erb
index 752a50ae471459a3069361a2460a51fa851c63d6..a641423752cdde18ff91987b28be0944e61db3bc 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/timemachine/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/timemachine/index.html.erb
@@ -78,16 +78,16 @@
 <thead>
     <tr>
         <th valign="top" nowrap="nowrap" style="text-align: left">
-        Show date
+        <%= message('time_machine.show_date') -%>
         <div class="yui-skin-sam" style="display: inline;">
-            <a href="#" id="calendar_link" class="nolink"><%= image_tag('calendar_view_day.png', :alt => 'Calendar') %></a>
+            <a href="#" id="calendar_link" class="nolink"><%= image_tag('calendar_view_day.png', :alt => message('calendar')) %></a>
             <div id="calContainer"> </div>
         </div><br/>
             <%
                selectable_events = @project.events_with_snapshot.select{|event| !(@sids.include?(event.snapshot_id))}
                unless selectable_events.empty?
             %>
-            Show event
+            <%= message('time_machine.show_event') -%>
             <select id="select_label"  onchange="selectSnapshot(this.options[this.selectedIndex].value, true)">
                 <option value=""> </option>
                 <%
@@ -107,7 +107,7 @@
                     <b><%= event.fullname %></b>
                     <br/>
                 <% end %>
-                <a href="#" onClick="unselectSnapshot(<%= snapshot.id -%>, true)" class="action">hide</a>
+                <a href="#" onClick="unselectSnapshot(<%= snapshot.id -%>, true)" class="action"><%= message('hide').downcase -%></a>
             </th>
         <% end %>
         <th> </th>
@@ -150,7 +150,7 @@
                 </tr>
         <% end %>
       <tr>
-          <td class="title"><br/>Distributions</td>
+          <td class="title"><br/><%= message('time_machine.distributions') -%></td>
           <% @snapshots.each_with_index do |snapshot, index| %>
               <td align="right" valign="bottom">
                   <% current_color = ChartsController::CHART_COLORS[index % ChartsController::CHART_COLORS.size ] %>
@@ -176,7 +176,7 @@
     chart_id = "distribution_#{row.metric.key}"
 %>
 <div style="float:left;width: 400px;text-align:center;padding-bottom: 25px;">
-    <%= chart(chart_url, :id => chart_id, :alt => 'Distribution chart', :width => 360, :height => 150) -%><br/>
+    <%= chart(chart_url, :id => chart_id, :alt => message('time_machine.distribution_chart'), :width => 360, :height => 150) -%><br/>
     <b><%= row.metric.short_name -%></b>
 </div>
 <% end %>
@@ -185,9 +185,9 @@
         <tfoot>
         <tr>
             <td colspan="<%= @snapshots.size + 2 -%>">
-                <input type="submit" value="Compare on chart" />
+                <input type="submit" value="<%= message('time_machine.compare_on_chart') -%>" />
             <% if is_admin? %>
-              <a href="#" onClick="collectSelectedMetrics();$('chart_defaults_form').submit();return false;" class="action">Set as default (for all users)</a>
+              <a href="#" onClick="collectSelectedMetrics();$('chart_defaults_form').submit();return false;" class="action"><%= message('time_machine.set_as_default_for_all_users') -%></a>
             <% end %>
             </td>
         </tr>