SONAR-3517 Fix issue linked to ERB file trimming done at build time

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 7a7d91c3bc6b91511679681aa083b2e7e5243598..e869ba2ecb73fe10ba580a4f2771019e313eeee8 100644 (file)
--- 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
@@ -981,9 +981,10 @@ update_key.are_you_sure_to_bulk_rename_x_into_x=Are you sure you want to rename
 # PROJECT QUALITY PROFILE PAGE
 #
 #------------------------------------------------------------------------------
-project_quality_profile.current_profile_for_x=Current quality profile for "{0}":
+project_quality_profile.select_profile_for_x=Select the quality profile to be used when analyzing the "{0}" project:
 project_quality_profile.project_cannot_be_update_with_profile_x=The current project can not be updated with the following profile: "{0}".
 project_quality_profile.profile_successfully_updated=Quality profile successfully updated.
+project_quality_profile.default_profile=default
 
 
 #------------------------------------------------------------------------------

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/quality_profile.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/quality_profile.html.erb
index 078956f8bb406143a50768a7802107c0d08fb907..f75218f7db9a9a06f8a291e71c71f1cbe3a05044 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/quality_profile.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/quality_profile.html.erb
@@ -5,12 +5,16 @@
      project_profile = @project.profile 
 %>
 
-  <span style= "padding-right: 10px"><%= message('project_quality_profile.current_profile_for_x', :params => @project.name) -%></span>
+  <span style= "padding-right: 10px"><%= message('project_quality_profile.select_profile_for_x', :params => @project.name) -%></span>
 
   <select name="quality_profile" id="quality_profile">
-    <% @profiles.each do |profile| %>
-      <option <%= 'selected' if (project_profile && project_profile==profile) || (!project_profile && profile.default_profile) -%> 
-              value="<%= profile.id -%>"><%= profile.name -%></option>
+    <% 
+       @profiles.each do |profile| 
+         should_be_selected = (project_profile && project_profile==profile) || (!project_profile && profile.default_profile)
+         label = profile.name
+         label += ' (' + message('project_quality_profile.default_profile') + ')' if profile.default_profile
+    %>
+      <option <%= 'selected' if should_be_selected -%> value="<%= profile.id -%>"><%= label -%></option>
     <% end %>
   </select>