SONAR-4427 Update message when no manual rules exist while creating manual issue

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 04d6d869e574ddfe1d011b3268636c90624f01b9..aca30d943bae5e13bf28372ef5cac3ac1460c4b1 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
@@ -502,7 +502,8 @@ issue.resolution.REMOVED=Removed
 issue.planned_for_x=Planned for {0}
 issue.planned_for=Planned for
 issue.manual.missing_rule=Missing rule
-issue.manual.no_rules=No rules.
+issue.manual.no_rules.admin=Manual rules must be defined before manual issues can be created.
+issue.manual.no_rules.non_admin=At least one manual rule must exist before manual issues can be created. Please contact your project administrator.
 issue.reported_by=Reported by
 issue.component_deleted=Removed
 issue.changelog.changed_to={0} changed to {1}

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_create_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_create_form.html.erb
index 9f6d311bfcf944d50542a94bad3dbfbf9ac0d16e..c60a534c505cc9438342736f7afc55b2c1e58f0f 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_create_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_create_form.html.erb
@@ -10,11 +10,11 @@
   %>
     <div class="warning" style="margin: 10px">
 
-      <%= message('issue.manual.no_rules') -%>
       <% if is_admin %>
+        <%= message('issue.manual.no_rules.admin') -%>
         <a href="<%= ApplicationController.root_context -%>/manual_rules/index"><%= message('manage') -%></a>
       <% else %>
-        <%= message('contact_admin') -%>
+        <%= message('issue.manual.no_rules.non_admin') -%>
       <% end %>
 
       &nbsp;<%= link_to_function message('cancel'), 'closeCreateIssueForm(this)' -%>
@@ -51,4 +51,4 @@
       </div>
     </div>
   <% end %>
-</form>
\ No newline at end of file
+</form>