Add missing translations.

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 db48a0e27f94aaa66092fab35612070f38a775ff..c980f85eb5d6a9c7d897d228f94611c89fd98fbb 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
@@ -414,6 +414,7 @@ measure_filter.criteria.age.days=days
 measure_filter.criteria.components_of=Components of
 measure_filter.criteria.components_of_project=Components of project
 measure_filter.new_search=New search
+measure_filter.favourite_filters=Favourite Filters
 measure_filter.more_criteria=+ More Criteria
 measure_filter.languages=Languages
 measure_filter.col.date=Date

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb
index fa6492a1e3b1e1b8de698e4d2065ad50bb0cd415..77124eb9e981c3fd8e7a5a7bda891cb9abbfb7fd 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_favourites.html.erb
@@ -1,6 +1,6 @@
 <div id="sidebar-favourites">
 <% if logged_in? %>
-  <li class="sidebar-title">Favourite Filters</li>
+  <li class="sidebar-title"><%= message('measure_filter.favourite_filters') -%></li>
   <% current_user.favourited_measure_filters.each do |filter| %>
     <li <%= "class='active'" if @filter && filter.id==@filter.id -%>>
       <a href="<%= ApplicationController.root_context -%>/measures/filter/<%= filter.id -%>"><%= h filter.name -%></a>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
index df581e6d3a39b1dbfb51b67d8ca5dc42d9fba2b6..210e58bdb2c354b627cc122eb510371a4341ccda 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb
@@ -84,7 +84,7 @@
              end
           %>
     <li class="sidebar-title">
-      <%= @filter.name.present? ? h(@filter.name) : 'New Search' -%>
+      <%= @filter.name.present? ? h(@filter.name) : message('measure_filter.new_search') -%>
     </li>
     <li class="marginbottom5">
       <%
@@ -124,8 +124,8 @@
     <% condition_metrics = Metric.all.select { |m| m.numeric? && !m.hidden } %>
     <% for i in 1..3 %>
       <li id="criteria-metric-<%= i -%>" style="<%= "display: none" if hidden_condition_indexes.include?(i) -%>" class="marginbottom5">
-        <%= metric_select_tag "c#{i}_metric", condition_metrics, :allow_empty => true, :selected_key => @filter.criteria("c#{i}_metric"), :width => '100%', :placeholder => 'Metric' -%>
-        <%= select_tag "c#{i}_period", options_for_select([['Value', ''], [Api::Utils.period_label(1), '1'], [Api::Utils.period_label(2), '2'], [Api::Utils.period_label(3), '3']], @filter.criteria("c#{i}_period")) -%>
+        <%= metric_select_tag "c#{i}_metric", condition_metrics, :allow_empty => true, :selected_key => @filter.criteria("c#{i}_metric"), :width => '100%', :placeholder => message('measure_filter.criteria.metric') -%>
+        <%= select_tag "c#{i}_period", options_for_select([[message('value'), ''], [Api::Utils.period_label(1), '1'], [Api::Utils.period_label(2), '2'], [Api::Utils.period_label(3), '3']], @filter.criteria("c#{i}_period")) -%>
         <br>
         <%= select_tag "c#{i}_op", options_for_select([['=', 'eq'], ['<', 'lt'], ['<=', 'lte'], ['>', 'gt'], ['>=', 'gte']], @filter.criteria("c#{i}_op")) -%>
         <input type="text" size="5" name="c<%= i -%>_val" value="<%= h @filter.criteria("c#{i}_val") -%>">