SONAR-2884 "No lines match your filter criteria" is not localized

diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index 48c14535a23621579855c9e63c8b1423a30621ff..c525ec483246a3ae782a26d02f62d83ef145e645 100644 (file)
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -188,6 +188,7 @@ move_right=Move right
 new_violations=New violations
 new_window=New window
 no_data=No data
+no_lines_match_your_filter_criteria=No lines match your filter criteria.
 no_results=No results
 over_x_days=over {0} days
 page_size=Page size

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb
index 81daaa4ca632e0efbd938c91fc2c135185fbb987..7ec54ed21cdea97e89660d8f0c722d1711b06c80 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb
@@ -118,6 +118,6 @@
 </table>
 
   <% if @filtered && !has_displayed_lines %>
-  <p>No lines match your filter criteria.</p>
+  <p><%= message('no_lines_match_your_filter_criteria') -%></p>
   <% end %>
 <% end %>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/source/_source.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/source/_source.html.erb
index d146d350da25ae5ba9a5b93ac0bd42312bfb3380..3a1b1cd94323a7a06605f3f95fcaa74b05e0915a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/source/_source.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/source/_source.html.erb
@@ -32,25 +32,6 @@
         if line.highlighted
           status='ko'
         end
-#        if @display_coverage && line.hits
-#          hits_status=(line.hits>0 ? 'ok' : 'ko')
-#          if line.conditions && line.conditions>0 && line.covered_conditions
-#            if line.covered_conditions==0
-#              status='ko'
-#              conditions_status='ko'
-#            elsif line.covered_conditions==line.conditions
-#              status=''
-#              conditions_status='ok'
-#            else
-#              conditions_status='warn'
-#              status='warn'
-#            end
-#          elsif line.hits
-#            status=(line.hits>0 ? '' : 'ko')
-#          end
-#        elsif @display_violations && line.violations?
-#          status="ko"
-#        end
       end
   %>
   <tr>
@@ -78,6 +59,6 @@
 </table>
 
   <% if panel.filtered && !has_displayed_lines %>
-    <p>No lines match your filter criteria.</p>
+    <p><%= message('no_lines_match_your_filter_criteria') -%></p>
   <% end %>
 <% end %>
\ No newline at end of file