From 4e193787ac2c987f8c65d44434acf321738ead22 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 4 Dec 2012 18:19:57 +0100 Subject: [PATCH] SONAR-3986 Add a abbreviation metric property in the translation bundle and display it filters --- .../src/main/resources/org/sonar/l10n/core.properties | 3 ++- .../WEB-INF/app/models/measure_filter_display_list.rb | 3 +-- sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) 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 817db507026..e92c669b243 100644 --- 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 @@ -390,7 +390,6 @@ measure_filter.col.short_name=Short Name measure_filter.col.version=Version measure_filter.short_col.language=Lang. measure_filter.short_col.short_name=Name -measure_filter.short_col.metric.alert_status=A measure_filter.missing_name=Name is missing measure_filter.name_too_long=Name is too long measure_filter.sharing=Sharing @@ -1553,6 +1552,7 @@ metric.accessors.description=Accessors metric.alert_status.name=Alert metric.alert_status.description=Alert +metric.alert_status.abbreviation=A metric.classes.name=Classes metric.classes.description=Classes @@ -1592,6 +1592,7 @@ metric.lines.description=Lines metric.ncloc.name=Lines of code metric.ncloc.description=Non Commenting Lines of Code +metric.ncloc.abbreviation=LOC metric.packages.name=Packages metric.packages.description=Packages diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb index 1da65830988..d838db67e9e 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/measure_filter_display_list.rb @@ -35,8 +35,7 @@ class MeasureFilterDisplayList < MeasureFilterDisplay def title_label if @metric - label = Api::Utils.message("measure_filter.short_col.metric.#{@metric.key}", :default => '') - label = Api::Utils.message("metric.#{@metric.key}.name", :default => @metric.short_name) if label=='' + label = @metric.abbreviation else label = Api::Utils.message("measure_filter.short_col.#{@key}", :default => '') label = Api::Utils.message("measure_filter.col.#{@key}", :default => @key) if label=='' diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb index e36b21dabbf..a345b2204e7 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/metric.rb @@ -123,6 +123,12 @@ class Metric < ActiveRecord::Base def short_name=(value) write_attribute(:short_name, value) end + + def abbreviation + label = Api::Utils.message("metric.#{key}.abbreviation", :default => '') + label = Api::Utils.message("metric.#{key}.name", :default => short_name) if label=='' + label + end def description(translate=true) default_string = read_attribute(:description) -- 2.39.5