From 6e343b341c799a593df4de2154764afdda0713e1 Mon Sep 17 00:00:00 2001 From: Fabrice Bellingard Date: Mon, 17 Oct 2011 16:57:54 +0200 Subject: [PATCH] SONAR-2884 "No lines match your filter criteria" is not localized --- .../resources/org/sonar/l10n/core.properties | 1 + .../WEB-INF/app/views/resource/index.html.erb | 2 +- .../WEB-INF/app/views/source/_source.html.erb | 21 +------------------ 3 files changed, 3 insertions(+), 21 deletions(-) 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 48c14535a23..c525ec48324 100644 --- 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 81daaa4ca63..7ec54ed21cd 100644 --- 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 @@ <% if @filtered && !has_displayed_lines %> -

No lines match your filter criteria.

+

<%= message('no_lines_match_your_filter_criteria') -%>

<% 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 d146d350da2..3a1b1cd9432 100644 --- 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 %> @@ -78,6 +59,6 @@ <% if panel.filtered && !has_displayed_lines %> -

No lines match your filter criteria.

+

<%= message('no_lines_match_your_filter_criteria') -%>

<% end %> <% end %> \ No newline at end of file -- 2.39.5