SONAR-3986 Add a abbreviation metric property in the translation bundle and display...

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 817db5070269c57eed934690d1fd7a05271eda2f..e92c669b243ab2a58c54e4c445be08dd0bd15399 100644 (file)
--- 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 1da65830988c0c4199e1a4b5f0c03cbcc9b91437..d838db67e9e8b97281fd642b97004a03f2dc9548 100644 (file)
--- 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 e36b21dabbfc944dae8fb67958d933b157110cb9..a345b2204e7d72de7e7cabc36f16e7d69d13ea02 100644 (file)
--- 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)