SONAR-3755 Update message when no action plan for project, replace all false-positive...

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 f47c1ba034bc7d096e8a65de872564c2385d70fb..1c3502154ada686f26329eefd3c28bad25f260b9 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
@@ -187,8 +187,8 @@ default_sort_on=Default sort on
 disable_treemap=Disable treemap
 enable_treemap=Enable treemap
 equals=Equals
-false_positive=False-positive
-false_positives_only=False-positives only
+false_positive=False positive
+false_positives_only=False positives only
 full_source=Full source
 greater_or_equals=Greater or equals
 greater_than=Greater than
@@ -538,7 +538,7 @@ issue.comment.delete_confirm_button=Delete
 issue.transition.confirm=Confirm
 issue.transition.unconfirm=Unconfirm
 issue.transition.resolve=Resolve
-issue.transition.falsepositive=False-Positive
+issue.transition.falsepositive=False positive
 issue.transition.reopen=Reopen
 issue.transition.close=Close
 issue.set_severity=Change Severity
@@ -547,13 +547,14 @@ issue.do_plan=Plan
 issue.plan.submit=Plan
 issue.unplanned=Unplanned
 issue.unplan.submit=Unplan
-issue.plan_must_be_created_first=An action plan should be first created to plan the remediation effort of this issue.
+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.status.REOPENED=Reopened
 issue.status.RESOLVED=Resolved
 issue.status.OPEN=Open
 issue.status.CONFIRMED=Confirmed
 issue.status.CLOSED=Closed
-issue.resolution.FALSE-POSITIVE=False-positive
+issue.resolution.FALSE-POSITIVE=False positive
 issue.resolution.FIXED=Fixed
 issue.resolution.REMOVED=Removed
 issue.planned_for_x=Planned for {0}
@@ -1095,7 +1096,7 @@ widget.welcome.html=<h3 class="marginbottom5">Welcome to SonarQube Dashboard</h3
                       <li>Do you now want to <a href="http://redirect.sonarsource.com/1">run analysis</a> on a project?</li>\
                       <li>Maybe start <a href="http://redirect.sonarsource.com/2">customizing dashboards</a>?</li>\
                       <li>Or simply browse the <a href="http://redirect.sonarsource.com/3">complete documentation</a>?</li>\
-                      <li>If you have a question or an issue, please report it on the <a href="http://redirect.sonarsource.com/4">mailing list</a>.</li>\
+                      <li>If you have a question or an issue, please visit the '<a href="http://www.sonarsource.org/get-support/">Get Support</a>' page.</li>\
                     </ul>
 
 widget.measure_filter_list.name=Measure Filter as List
@@ -2220,33 +2221,6 @@ metric.profile_version.name=Profile version
 metric.profile_version.description=Selected quality profile version
 
 
-#--------------------------------------------------------------------------------------------------------------------
-#
-# REVIEWS METRICS
-#
-#--------------------------------------------------------------------------------------------------------------------
-metric.unreviewed_violations.name=Unreviewed violations
-metric.unreviewed_violations.description=Violations that have not been reviewed yet
-
-metric.new_unreviewed_violations.name=New unreviewed violations
-metric.new_unreviewed_violations.description=New violations that have not been reviewed yet
-
-metric.false_positive_reviews.name=False-positive reviews
-metric.false_positive_reviews.description=Active false-positive reviews
-metric.false_positive_reviews.abbreviation=False-positive rws
-
-metric.active_reviews.name=Active reviews
-metric.active_reviews.description=Active open and reopened reviews
-metric.active_reviews.abbreviation=Active rws
-
-metric.unassigned_reviews.name=Unassigned reviews
-metric.unassigned_reviews.description=Active unassigned reviews
-metric.unassigned_reviews.abbreviation=Unassigned rws
-
-metric.unplanned_reviews.name=Unplanned reviews
-metric.unplanned_reviews.description=Active unplanned reviews
-metric.unplanned_reviews.abbreviation=Unplanned rws
-
 #--------------------------------------------------------------------------------------------------------------------
 #
 # ISSUES METRICS
@@ -2296,8 +2270,8 @@ metric.new_minor_issues.description=New Minor issues
 metric.new_info_issues.name=New Info issues
 metric.new_info_issues.description=New Info issues
 
-metric.false_positive_issues.name=False-positive issues
-metric.false_positive_issues.description=Active false-positive issues
+metric.false_positive_issues.name=False positive issues
+metric.false_positive_issues.description=Active false positive issues
 
 metric.unassigned_issues.name=Unassigned issues
 metric.unassigned_issues.description=Active unassigned issues

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb
index 7e19c56cb29cb59e3757b9e0f82b1f34bf2a3247..9bb65fc8048b47405781535c28dbcfe4643e2e5e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_plan_form.html.erb
@@ -5,7 +5,12 @@
 
    if plans.empty?
 %>
-  <span class="error"><%= message('issue.plan_must_be_created_first') -%></span>
+  <% if is_admin? %>
+    <span class="error"><%= message('issue.plan.error.plan_must_be_created_first_for_admin',
+                                    :params => ApplicationController.root_context + '/action_plans/index/' + @issue.projectKey()) -%></span>
+  <% else %>
+    <span class="error"><%= message('issue.plan.error.plan_must_be_created_first_for_other') -%></span>
+  <% end %>
   &nbsp;<%= link_to_function message('cancel'), 'closeIssueForm(this)' -%>
 <%
    else