SONAR-3841 In the "Description" widget we should display the the language name and...

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb
index 9368906541d2ca030a1364480a268a521731f35c..26e74cac55fd11937e3f4780e0ae09027195afea 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/description.html.erb
@@ -12,7 +12,7 @@
     <% if @project.language %>
     <tr>
       <td><%= message('widget.description.language') -%>: </td>
-      <td id="resource_language"><%= @project.language -%></td>
+      <td id="resource_language"><%= Api::Utils.language_name(@project.language) -%></td>
     </tr>
     <% end %>
     <%

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 a38b6ba367b4f59f06274799befe7b171e9800f2..e7419d5d5111808a6ffec9f559db3f38cd38e23a 100644 (file)
--- 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
@@ -170,4 +170,13 @@ class Api::Utils
   def self.languages
     java_facade.getLanguages()
   end
+
+  def self.language(key)
+    languages.find {|language| language.key == key}
+  end
+
+  def self.language_name(key)
+    language(key) ? language(key).name : key
+  end
+
 end