Issue when trying to plan an issue and no action plan exists

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 caee16801248491b2410dd91dc92ce839cb478c2..a7ee0612df57314e8a172666504d5952fc68faa5 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -634,8 +634,7 @@ issue.do_plan=Plan
 issue.plan.submit=Plan
 issue.unplanned=Unplanned
 issue.unplan.submit=Unplan
-issue.plan.error.plan_must_be_created_first_for_admin=You must <a href="{0}">define</a> at least one action plan on this project.
-issue.plan.error.plan_must_be_created_first_for_other=At least one action plan must be created on this project. Please contact your project administrator.
+issue.plan.error.plan_must_be_created_first=At least one action plan must be created on this project. Please contact your project administrator if you don't have the permission to do it.
 issue.status.REOPENED=Reopened
 issue.status.RESOLVED=Resolved
 issue.status.OPEN=Open

diff --git a/sonar-server/src/main/hbs/issues/plan-form.hbs b/sonar-server/src/main/hbs/issues/plan-form.hbs
index 3d96e6e6a7294b201f4f810a149e007c7293e1e4..341068e5a96345ea1e0a8d6d9b3c17b1c5b461f1 100644 (file)
--- a/sonar-server/src/main/hbs/issues/plan-form.hbs
+++ b/sonar-server/src/main/hbs/issues/plan-form.hbs
@@ -11,10 +11,6 @@
   </select>
   <input id="issue-plan-submit" type="submit" value="{{t 'issue.plan.submit'}}">&nbsp;
 {{else}}
-  <% if is_admin? %>
-    <span class="error">{{t 'issue.plan.error.plan_must_be_created_first_for_admin'}}</span>
-  <% else %>
-    <span class="error">{{t 'issue.plan.error.plan_must_be_created_first_for_other'}}</span>
-  <% end %>
+  <span class="error">{{t 'issue.plan.error.plan_must_be_created_first'}}</span>
 {{/if}}
-<a id="issue-plan-cancel" class="action">{{t 'cancel'}}</a>
\ No newline at end of file
+<a id="issue-plan-cancel" class="action">{{t 'cancel'}}</a>