From 8e11156c406debc6c3020be03215a2fba86bb434 Mon Sep 17 00:00:00 2001 From: Fabrice Bellingard Date: Fri, 15 Jul 2011 18:39:07 +0200 Subject: [PATCH] SONAR-2589 Modification of web ruby templates to use bundles - Added i18n to core tabs of the resource viewer (coverage, source, violations) --- .../resources/org/sonar/i18n/core.properties | 56 ++++++++++++++++--- .../WEB-INF/app/helpers/dashboard_helper.rb | 10 ++-- .../views/resource/_header_coverage.html.erb | 16 +++--- .../views/resource/_header_source.html.erb | 40 ++++++------- .../resource/_header_violations.html.erb | 24 ++++---- .../app/views/resource/_options.html.erb | 14 ++--- .../app/views/resource/_rules_filter.html.erb | 18 +++--- .../WEB-INF/app/views/resource/_tabs.html.erb | 8 +-- .../app/views/resource/_violation.html.erb | 24 ++++---- 9 files changed, 126 insertions(+), 84 deletions(-) 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 f3f0233862e..ecfe127b689 100755 --- 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 @@ -25,8 +25,10 @@ view.size.paragraphs_suffix=\ paragraphs add_verb=Add and=And +assign=Assign author=Author ascending=Ascending +blocker=Blocker build_date=Build date cancel=Cancel change_verb=Change @@ -34,6 +36,7 @@ class=Class classes=Classes color=Color criteria=Criteria +critical=Critical date=Date days=Days delete=Delete @@ -44,13 +47,16 @@ display=Display edit=Edit file=File files=Files +info=Info key=Key language=Language library=Library links=Links login=Login +major=Major max=Max min=Min +minor=Minor name=Name none=None operations=Operations @@ -66,8 +72,16 @@ search_verb=Search shared=Shared view=View views=Views +raw=Raw +reassign=Reassign +reopen=Reopen +reopened=Reopened +resolve=Resolve result=Result +rule=Rule +review_verb=Review select_verb=Select +severity=Severity size=Size sub_project=Sub-project sub_projects=Sub-projects @@ -80,6 +94,7 @@ unit_test=Unit test unit_tests=Unit tests value=Value variarion=Variation +violations=Violations version=Version @@ -89,18 +104,31 @@ version=Version # #------------------------------------------------------------------------------ +add_comment=Add comment +added_over_x_days=Added over {0} days +added_since=Added since {0} +added_since_previous_analysis=Added since previous analysis +added_since_previous_analysis_detailed=Added since previous analysis ({0}) +added_since_version=Added since version {0} alerts_feed=Alerts feed +all_violations=All violations +assigned_to=Assigned to delta_since_previous_analysis=Δ since previous analysis delta_over_x_days=Δ over {0} days delta_since=Δ since {0} delta_since_version=Δ since version {0} equals=Equals +false_positive=False-Positive +false_positives_only=False-Positives only +full_source=Full source greater_or_equals=Greater or equals greater_than=Greater than less_or_equals=Less or equals less_than=Less than move_left=Move left move_right=Move right +new_violations=New violations +new_window=New window no_results=No results page_size=Page size remove_column=Remove this column @@ -137,17 +165,14 @@ sidebar.system=System #------------------------------------------------------------------------------ # -# PAGES +# PAGES, sorted alphabetically # #------------------------------------------------------------------------------ +backup.page=Backup clouds.page=Clouds - components.page=Components -components.size=Size -components.color=Color - -backup.page=Backup +coverage.page=Coverage default_dashboards.page=Default dashboards default_filters.page=Default filters dependencies.page=Dependencies @@ -163,13 +188,17 @@ project_settings.page=Settings quality_profiles.page=Quality profiles reviews.page=Reviews settings.page=Settings +source.page=Source +system_info.page=System Info timemachine.page=Time Machine user_groups.page=Groups users.page=Users +violations.page=Violations violations_drilldown.page=Violations drilldown -system_info.page=System Info update_center.page=Update Center + org.sonar.plugins.core.hotspots.GwtHotspots.page=Hotspots +org.sonar.plugins.core.duplicationsviewer.DuplicationsViewer.page=Duplications #------------------------------------------------------------------------------ @@ -214,6 +243,19 @@ filters.shared_filters=Shared filters filters.shared_filters_description=These filters are shared by administrators and can be followed without copying them. +#------------------------------------------------------------------------------ +# +# REVIEWS +# +#------------------------------------------------------------------------------ + +reviews.do_you_want_to_reopen=Do you want to reopen this review? +reviews.do_you_want_to_resolve=Do you want to resolve this review? +reviews.flag_as_false_positive=Flag as false-positive +reviews.unflag_as_false_positive=Unflag as false-positive +reviews.do_you_want_to_delete_comment=Do you want to delete this comment? + + #------------------------------------------------------------------------------ # # METRIC DOMAINS diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb index 9e258c7e108..f86d510e0bb 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb @@ -46,17 +46,17 @@ module DashboardHelper if mode if mode=='days' - label = "Added over %s days" % mode_param + label = message('added_over_x_days', :params => mode_param.to_s) elsif mode=='version' - label = "Added since version %s" % mode_param + label = message('added_since_version', :params => mode_param.to_s) elsif mode=='previous_analysis' if !date.nil? - label = "Added since previous analysis (%s)" % date.strftime("%Y %b. %d") + label = message('added_since_previous_analysis_detailed', :params => date.strftime("%Y %b. %d").to_s) else - label = "Added since previous analysis" + label = message('added_since_previous_analysis') end elsif mode=='date' - label = "Added since #{date.strftime("%Y %b %d")}" + label = message('added_since', :params => date.strftime("%Y %b %d").to_s) end if label selected=(params[:period]==index.to_s ? 'selected' : '') diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb index 96c67ece219..d3fc617b3c1 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb @@ -8,7 +8,7 @@ <% if m=measure('new_line_coverage') %> - Line coverage: + <%= message('metric.line_coverage.name') -%>: <%= format_variation(m, :period => @period, :style => 'none') -%> <% else %> @@ -16,7 +16,7 @@ <% if m=measure('new_branch_coverage') %> - Branch coverage: + <%= message('metric.branch_coverage.name') -%>: <%= format_variation(m, :period => @period, :style => 'none') -%> <% else %> @@ -25,7 +25,7 @@ <% if m=measure('new_uncovered_lines') %> - Uncovered lines: + <%= message('metric.uncovered_lines.name') -%>: <%= format_variation(m, :period => @period, :style => 'none') -%>/<%= format_variation('new_lines_to_cover', :period => @period, :style => 'none') -%> <% else %> @@ -33,7 +33,7 @@ <% if m=measure('new_uncovered_conditions') %> - Uncovered conditions: + <%= message('metric.uncovered_conditions.name') -%>: <%= format_variation(m, :period => @period, :style => 'none') -%>/<%= format_variation('new_conditions_to_cover', :period => @period, :style => 'none') -%> <% else %> @@ -45,16 +45,16 @@ <%= format_measure('coverage', :default => '-') -%> - <%= render :partial => 'measure', :locals => {:measure => measure('line_coverage'), :title => 'Line coverage'} -%> + <%= render :partial => 'measure', :locals => {:measure => measure('line_coverage'), :title => message('metric.line_coverage.name')} -%> - <%= render :partial => 'measure', :locals => {:measure => measure('branch_coverage'), :title => 'Branch coverage'} -%> + <%= render :partial => 'measure', :locals => {:measure => measure('branch_coverage'), :title => message('metric.branch_coverage.name')} -%> - <%= render :partial => 'measure', :locals => {:measure => measure('uncovered_lines'), :title => 'Uncovered lines', :ratio => measure('lines_to_cover')} -%> + <%= render :partial => 'measure', :locals => {:measure => measure('uncovered_lines'), :title => message('metric.uncovered_lines.name'), :ratio => measure('lines_to_cover')} -%> - <%= render :partial => 'measure', :locals => {:measure => measure('uncovered_conditions'), :title => 'Uncovered conditions', :ratio => measure('conditions_to_cover')} -%> + <%= render :partial => 'measure', :locals => {:measure => measure('uncovered_conditions'), :title => message('metric.uncovered_conditions.name'), :ratio => measure('conditions_to_cover')} -%> <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_source.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_source.html.erb index de5451252c1..e825e52289d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_source.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_source.html.erb @@ -5,31 +5,31 @@ <% if m=measure('lines') %> - + <% end %> <% if m=measure('ncloc') %> - + <% end %> <% if m=measure('functions') %> - + <% end %> <% if m=measure('accessors') %> - + <% end %> <% if m=measure('paragraphs') %> - + <% end %> @@ -39,25 +39,25 @@
Lines:<%= message('metric.lines.name') -%>: <%= format_measure(m) -%>
Lines of code:<%= message('metric.ncloc.name') -%>: <%= format_measure(m) -%>
Methods:<%= message('metric.functions.name') -%>: <%= format_measure(m) -%>
Accessors:<%= message('metric.accessors.name') -%>: <%= format_measure(m) -%>
Paragraphs:<%= message('metric.paragraphs.name') -%>: <%= format_measure(m) -%>
<% if m=measure('statements') %> - + <% end %> <% if m=measure('complexity') %> - + <% end %> <% if m=measure('function_complexity') %> - + <% end %> <% if m=measure('paragraph_complexity') %> - + <% end %> @@ -67,25 +67,25 @@
Statements:<%= message('metric.statements.name') -%>: <%= format_measure(m) -%>
Complexity:<%= message('metric.complexity.name') -%>: <%= format_measure(m) -%>
Complexity/method:<%= message('metric.function_complexity.name') -%>: <%= format_measure(m) -%>
Complexity/paragraph:<%= message('metric.paragraph_complexity.name') -%>: <%= format_measure(m) -%>
<% if m=measure('comment_lines_density') %> - + <% end %> <% if m=measure('comment_lines') %> - + <% end %> <% if m=measure('commented_out_code_lines') %> - + <% end %> <% if m=measure('comment_blank_lines') %> - + <% end %> @@ -95,19 +95,19 @@
Comments:<%= message('metric.comment_lines_density.name') -%>: <%= format_measure(m) -%>
Comment lines:<%= message('metric.comment_lines.name') -%>: <%= format_measure(m) -%>
Commented-out LOC:<%= message('metric.commented_out_code_lines.name') -%>: <%= format_measure(m) -%>
Blank comments:<%= message('metric.comment_blank_lines.name') -%>: <%= format_measure(m) -%>
<% if m=measure('public_documented_api_density') %> - + <% end %> <% if m=measure('public_undocumented_api') %> - + <% end %> <% if m=measure('public_api') %> - + <% end %> @@ -117,25 +117,25 @@
Public documented API:<%= message('metric.public_documented_api_density.name') -%>: <%= format_measure(m) -%>
Public undocumented API:<%= message('metric.public_undocumented_api.name') -%>: <%= format_measure(m) -%>
Public API:<%= message('metric.public_api.name') -%>: <%= format_measure(m) -%>
<% if m=measure('classes') %> - + <% end %> <% if m=measure('noc') %> - + <% end %> <% if m=measure('dit') %> - + <% end %> <% if m=measure('rfc') %> - + <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_violations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_violations.html.erb index 9e6522c5f88..58ed8b42cc9 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_violations.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_violations.html.erb @@ -2,31 +2,31 @@ <% if @period && measure('new_violations') %>
Classes:<%= message('metric.classes.name') -%>: <%= format_measure(m) -%>
Number of Children:<%= message('metric.noc.name') -%>: <%= format_measure(m) -%>
Depth in Tree:<%= message('metric.dit.name') -%>: <%= format_measure(m) -%>
Response for Class (RFC):<%= message('metric.rfc.name') -%>: <%= format_measure(m) -%>
- + - + - + - + - + - +
<%= format_variation('new_violations', :default => 0, :period => @period, :style => 'none') -%> new violations<%= format_variation('new_violations', :default => 0, :period => @period, :style => 'none') -%> <%= message('new_violations').downcase -%> <%= image_tag 'priority/BLOCKER.png' -%>Blocker:<%= message('blocker') -%>: <%= format_variation('new_blocker_violations', :default => 0, :period => @period, :style => 'none') -%> <%= image_tag 'priority/CRITICAL.png' -%>Critical:<%= message('critical') -%>: <%= format_variation('new_critical_violations', :default => 0, :period => @period, :style => 'none') -%> <%= image_tag 'priority/MAJOR.png' -%>Major:<%= message('major') -%>: <%= format_variation('new_major_violations', :default => 0, :period => @period, :style => 'none') -%> <%= image_tag 'priority/MINOR.png' -%>Minor:<%= message('minor') -%>: <%= format_variation('new_minor_violations', :default => 0, :period => @period, :style => 'none') -%> <%= image_tag 'priority/INFO.png' -%>Info:<%= message('info') -%>: <%= format_variation('new_info_violations', :default => 0, :period => @period, :style => 'none') -%>
@@ -34,31 +34,31 @@ <% else %> - + - + - + - + - + - +
<%= format_measure('violations', :default => 0) -%> violations<%= format_measure('violations', :default => 0) -%> <%= message('violations').downcase -%> <%= image_tag 'priority/BLOCKER.png' -%>Blocker:<%= message('blocker') -%>: <%= format_measure('blocker_violations', :default => 0) -%> <%= image_tag 'priority/CRITICAL.png' -%>Critical:<%= message('critical') -%>: <%= format_measure('critical_violations', :default => 0) -%> <%= image_tag 'priority/MAJOR.png' -%>Major:<%= message('major') -%>: <%= format_measure('major_violations', :default => 0) -%> <%= image_tag 'priority/MINOR.png' -%>Minor:<%= message('minor') -%>: <%= format_measure('minor_violations', :default => 0) -%> <%= image_tag 'priority/INFO.png' -%>Info:<%= message('info') -%>: <%= format_measure('info_violations', :default => 0) -%>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_options.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_options.html.erb index 7e765102206..df02860d42c 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_options.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_options.html.erb @@ -28,7 +28,7 @@ if @expandable %> onclick="applyOptions()"/> - + <% first=false end %> @@ -36,7 +36,7 @@ <% if @scm_available && !@display_violations && @snapshot.project_snapshot.periods? %> - + <%= violation_period_select_options(@snapshot, 1) -%> <%= violation_period_select_options(@snapshot, 2) -%> <%= violation_period_select_options(@snapshot, 3) -%> @@ -67,10 +67,10 @@ <% if @display_coverage %> <% first=false diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_rules_filter.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_rules_filter.html.erb index 06d89dc5414..5546d9d64ce 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_rules_filter.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_rules_filter.html.erb @@ -32,14 +32,14 @@ end %> \ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb index 3374fc037fc..9c629eaad77 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb @@ -13,22 +13,22 @@ first=true if @snapshot.source %> -
  • Raw
    • +
  • <%= message('raw') -%>
    • <% first=false end if request.xhr? %> -
  • New Window
    • +
  • <%= message('new_window') -%>
    • <% end %>