From af7068a7ab88aefb32174d929669fbd23145c3bf Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 31 May 2013 11:24:59 +0200 Subject: [PATCH] SONAR-3755 Update message when no action plan for project, replace all false-positive words by false positive --- .../resources/org/sonar/l10n/core.properties | 44 ++++--------------- .../app/views/issue/_plan_form.html.erb | 7 ++- 2 files changed, 15 insertions(+), 36 deletions(-) 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 f47c1ba034b..1c3502154ad 100644 --- 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 define 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=

Welcome to SonarQube Dashboard

Do you now want to run analysis on a project?\
  • Maybe start customizing dashboards?
    • \
  • Or simply browse the complete documentation?
    • \ -
  • If you have a question or an issue, please report it on the mailing list.
    • \ +
  • If you have a question or an issue, please visit the 'Get Support' page.
    • \ 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 7e19c56cb29..9bb65fc8048 100644 --- 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? %> - <%= message('issue.plan_must_be_created_first') -%> + <% if is_admin? %> + <%= message('issue.plan.error.plan_must_be_created_first_for_admin', + :params => ApplicationController.root_context + '/action_plans/index/' + @issue.projectKey()) -%> + <% else %> + <%= message('issue.plan.error.plan_must_be_created_first_for_other') -%> + <% end %>  <%= link_to_function message('cancel'), 'closeIssueForm(this)' -%> <% else -- 2.39.5