fix SONAR-6203 Manual Metrics of type Level and Text can't be displayed using 'Custom...

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 4fc10646ce1346dd4eae38b9c870479a78a0d49c..a096f806bfa8e7fc4998bb372e2096d157833662 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -277,7 +277,7 @@ module ApplicationHelper
       if options[:period]
         html=m.format_numeric_value(m.variation(options[:period].to_i))
       elsif m.metric.val_type==Metric::VALUE_TYPE_LEVEL
-        html="<i class=\"icon-alert-#{m.alert_status.downcase}\"></i>" unless m.alert_status.blank?
+        html=message("level.#{m.formatted_value}")
       else
         html=m.formatted_value
       end

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 58d6c50ea0087022c31c6221f7f74c796cb32258..8931869679c614141f83a1f1ab3fedee3587ff17 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -393,6 +393,18 @@ qualifiers.create.DEV=Create Developer
 qualifiers.update.VW=Update View
 qualifiers.update.DEV=Update Developer
 
+#------------------------------------------------------------------------------
+#
+# LEVELS
+#
+#------------------------------------------------------------------------------
+
+level.OK=Ok
+level.WARN=Warning
+level.ERROR=Error
+
+
+
 #------------------------------------------------------------------------------
 #
 # PROJECT LINKS