diff options
5 files changed, 18 insertions, 22 deletions
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/code_coverage.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/code_coverage.html.erb index 1df37a0994d..d63b82f1b41 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/code_coverage.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/code_coverage.html.erb @@ -10,7 +10,7 @@ <tr> <td valign="top" width="50%" nowrap> <div class="dashbox"> - <p class="title"><%= message('widget.code_coverage.title') -%></p> + <p class="title"><%= message('widget.code_coverage.name') -%></p> <p> <span class="big"><%= format_measure(code_coverage_measure, :suffix => '', :url => url_for_drilldown('coverage'), :default => '-') %></span> <%= dashboard_configuration.selected_period? ? format_variation(code_coverage_measure) : trend_icon(code_coverage_measure) -%> diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb index fee7fef495e..a40542f0852 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb @@ -13,7 +13,7 @@ complexity=measure('complexity') <tr> <td valign="top" width="50%"> <div class="dashbox" > - <h3><%= message('widget.complexity.title') -%></h3> + <h3><%= message('widget.complexity.name') -%></h3> <% if function_complexity %> <p> <span class="big"><%= format_measure(function_complexity, :suffix => '', :url => url_for_drilldown(function_complexity)) %></span><%= message('widget.complexity.per_method.suffix') -%> 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 d0228a89edd..7ef9e62d4d1 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 @@ -437,7 +437,7 @@ widget.comments_duplications.docu_api.suffix=\ docu. API widget.comments_duplications.undocu_api.suffix=\ undocu. API widget.comments_duplications.commented_locs.suffix=\ commented LOCs widget.comments_duplications.duplications=Duplications -widget.comments_duplications.blocks.suffix=\ blocs +widget.comments_duplications.blocks.suffix=\ blocks widget.comments_duplications.files.suffix=\ files widget.complexity.name=Complexity @@ -489,7 +489,7 @@ widget.ckjm.description=Reports on LCOM4 and RFC average and distribution. widget.ckjm.lcom4=LCOM4 widget.ckjm.per_class.suffix=\ /class widget.ckjm.files_having_lcom_greater_than_one=\ files having LCOM4>1 -widget.ckjm.rfc=RFC +widget.ckjm.rfc=Response for Class widget.file_design.name=File design widget.file_design.description=Reports on files dependency cycles and tangle index. @@ -958,17 +958,17 @@ metric.new_line_coverage.description=Line coverage of added/changed code metric.coverage_line_hits_data.name=Coverage hits by line metric.coverage_line_hits_data.description=Coverage hits by line -metric.conditions_to_cover.name=Conditions to cover -metric.conditions_to_cover.description=Conditions to cover +metric.conditions_to_cover.name=Branches to cover +metric.conditions_to_cover.description=Branches to cover -metric.new_conditions_to_cover.name=New conditions to cover -metric.new_conditions_to_cover.description=New conditions to cover +metric.new_conditions_to_cover.name=New branches to cover +metric.new_conditions_to_cover.description=New branches to cover -metric.uncovered_conditions.name=Uncovered conditions -metric.uncovered_conditions.description=Uncovered conditions +metric.uncovered_conditions.name=Uncovered branches +metric.uncovered_conditions.description=Uncovered branches -metric.new_uncovered_conditions.name=New uncovered conditions -metric.new_uncovered_conditions.description=New uncovered conditions +metric.new_uncovered_conditions.name=New uncovered branches +metric.new_uncovered_conditions.description=New uncovered branches metric.branch_coverage.name=Branch coverage metric.branch_coverage.description=Branch coverage @@ -979,11 +979,11 @@ metric.new_branch_coverage.description=Branch coverage of new/changed code metric.branch_coverage_hits_data.name=Branch coverage hits metric.branch_coverage_hits_data.description=Branch coverage hits -metric.conditions_by_line.name=Conditions by line -metric.conditions_by_line.description=Conditions by line +metric.conditions_by_line.name=Branches by line +metric.conditions_by_line.description=Branches by line -metric.covered_conditions_by_line.name=Covered conditions by line -metric.covered_conditions_by_line.description=Covered conditions by line +metric.covered_conditions_by_line.name=Covered branches by line +metric.covered_conditions_by_line.description=Covered branches by line #-------------------------------------------------------------------------------------------------------------------- # @@ -1090,7 +1090,7 @@ metric.dit.description=Depth in Inheritance Tree metric.noc.name=Number of Children metric.noc.description=Number of Children -metric.rfc.name=RFC +metric.rfc.name=Response for Class metric.rfc.description=Response for Class metric.rfc_distribution.name=Class distribution /RFC diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/gwt.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/gwt.properties index 2302d571fac..e6a3c88a448 100644 --- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/gwt.properties +++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/gwt.properties @@ -64,5 +64,4 @@ unittest.duration=Duration unittest.name=Unit test name unittest.skipped=skipped unittest.tests=Tests -unittest.duration=Duration unittest.failures=Failures/Errors
\ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/api/utils.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/api/utils.rb index 8f5d33436a6..9e213019a6c 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/api/utils.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/api/utils.rb @@ -63,10 +63,7 @@ class Api::Utils # Since 2.10 def self.message(key, options={}) default = options[:default] - params = options[:params] - if params.nil? - params=[] - end + params = options[:params]||[] Java::OrgSonarServerUi::JRubyFacade.getInstance().getMessage(I18n.locale, key, default, params.to_java) end end |