From 07ff1ad0ff5b2eecedf36d4f00adbc47335fa9c5 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Fri, 25 Mar 2016 14:25:39 +0100 Subject: [PATCH] SONAR-7204 Clean action plans out of localization properties --- .../dashboard/widget/IssueFilterWidget.java | 2 +- .../widget/ProjectIssueFilterWidget.java | 2 +- .../platform/ws/l10n-index-example.json | 3 - .../main/nav/templates/nav-shortcuts-help.hbs | 1 - .../resources/org/sonar/l10n/core.properties | 62 ------------------- 5 files changed, 2 insertions(+), 68 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java index 17f017ee293..fc9ccacf4c2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssueFilterWidget.java @@ -33,7 +33,7 @@ import static org.sonar.api.web.WidgetScope.GLOBAL; @WidgetProperty(key = IssueFilterWidget.FILTER_PROPERTY, type = WidgetPropertyType.ISSUE_FILTER, optional = false), @WidgetProperty(key = IssueFilterWidget.DISTRIBUTION_AXIS_PROPERTY, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "severities", options = {"types", "severities", "resolutions", "statuses", "rules", "tags", "projectUuids", "assignees", "reporters", - "authors", "languages", "actionPlans", "createdAt"}), + "authors", "languages", "createdAt"}), @WidgetProperty(key = IssueFilterWidget.DISPLAY_FILTER_DESCRIPTION, type = WidgetPropertyType.BOOLEAN, defaultValue = "false"), @WidgetProperty(key = IssueFilterWidget.DISPLAY_MODE, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "count", options = {"count", "debt"}) }) diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java index e87b8673bdd..ea6b0fcfe5b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/ProjectIssueFilterWidget.java @@ -33,7 +33,7 @@ import static org.sonar.api.web.WidgetScope.PROJECT; @WidgetProperty(key = ProjectIssueFilterWidget.FILTER_PROPERTY, type = WidgetPropertyType.ISSUE_FILTER, optional = false), @WidgetProperty(key = ProjectIssueFilterWidget.DISTRIBUTION_AXIS_PROPERTY, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "severities", options = {"types", "severities", "resolutions", "statuses", "rules", "tags", "assignees", "reporters", "authors", - "languages", "actionPlans", "createdAt"}), + "languages", "createdAt"}), @WidgetProperty(key = ProjectIssueFilterWidget.DISPLAY_FILTER_DESCRIPTION, type = WidgetPropertyType.BOOLEAN, defaultValue = "false"), @WidgetProperty(key = ProjectIssueFilterWidget.DISPLAY_MODE, type = WidgetPropertyType.SINGLE_SELECT_LIST, defaultValue = "count", options = {"count", "debt"}) }) diff --git a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json index b78aa60b08a..5a5718adc50 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/platform/ws/l10n-index-example.json @@ -8,7 +8,6 @@ "roles.page": "Project Permissions", "metric.package_cycles.abbreviation": "Pkgs cycles", "views.delete_success": "View definition \"{0}\" has been successfully deleted", - "issue.unplan.submit": "Unplan", "project_history.col.month": "Month", "including_abbreviated": "incl.", "coding_rules.filters.activation.help": "Activation criterion is available when a quality profile is selected", @@ -46,7 +45,6 @@ "no_results": "No results", "rule.php.S1808.param.one_space_after": "There should be exactly one space between closing parenthesis and opening curly braces", "result": "Result", - "issue.planned_for": "Planned for", "measure_filter.key_contains": "Key contains", "widget.complexity.description": "Reports on complexity, average complexity and complexity distribution.", "analysis_reports.past_reports": "Past Reports", @@ -90,7 +88,6 @@ "metric.total-useless-lines.name": "Total Useless Code", "dashboard.default_dashboard": "This dashboard is the default one and is displayed when clicking on \"Overview\".", "component_navigation.status.in_progress.admin": "The analysis is in progress.
More details available on the Background Tasks page.", - "issue.unplanned": "Not planned", "metric.public_api.name": "Public API", "widget.measure_filter_treemap.property.heightInPercents.name": "Height", "quality_profiles.rename_x_title": "Rename Profile {0} - {1}", diff --git a/server/sonar-web/src/main/js/main/nav/templates/nav-shortcuts-help.hbs b/server/sonar-web/src/main/js/main/nav/templates/nav-shortcuts-help.hbs index 9329fcb6e76..22356c886e4 100644 --- a/server/sonar-web/src/main/js/main/nav/templates/nav-shortcuts-help.hbs +++ b/server/sonar-web/src/main/js/main/nav/templates/nav-shortcuts-help.hbs @@ -46,7 +46,6 @@
  • f    {{t 'shortcuts.section.issue.do_transition'}}
  • a    {{t 'shortcuts.section.issue.assign'}}
  • m    {{t 'shortcuts.section.issue.assign_to_me'}}
    • -
  • p    {{t 'shortcuts.section.issue.plan'}}
  • i    {{t 'shortcuts.section.issue.change_severity'}}
  • c    {{t 'shortcuts.section.issue.comment'}}
  • ctrl + enter    {{t 'shortcuts.section.issue.submit_comment'}}
    • 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 5571498c912..26c97d51421 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -5,7 +5,6 @@ #------------------------------------------------------------------------------ action=Action -actionPlan=Action Plan activation=Activation active=Active add_verb=Add @@ -459,8 +458,6 @@ sidebar.tools=Tools # #------------------------------------------------------------------------------ -action_plans.page=Action Plans -action_plans.page.description=Create and administer Action Plans for this project. Action Plans allow you to prioritize and group issues, and to monitor progress on those groups. all_rules.page=All Rules analysis_reports.page=Project Computation coding_rules.page=Rules @@ -690,11 +687,6 @@ issue.transition.wontfix.description=This issue can be ignored because the rule issue.set_severity=Change Severity issue.set_severity.submit=Change Severity issue.set_type=Change Type -issue.do_plan=Plan -issue.plan.submit=Plan -issue.unplanned=Not planned -issue.unplan.submit=Unplan -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.type.CODE_SMELL=Code Smell issue.type.BUG=Bug @@ -722,8 +714,6 @@ issue.resolution.REMOVED.description=Either the rule or the resource was changed issue.unresolved.description=Unresolved issues have not been addressed in any way. issue.updated=Updated: -issue.planned_for_x=Planned for {0} -issue.planned_for=Planned for issue.manual.missing_rule=Missing rule 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. @@ -773,13 +763,10 @@ issue.changelog.field.type=Type # #------------------------------------------------------------------------------ issue_filter.new_search=New Search -issue_filter.header.action_plan=Action Plan issue_filter.header.assignee=Assignee issue_filter.header.creation_date=Created issue_filter.header.resolution=Resolution issue_filter.header.update_date=Updated -issue_filter.criteria.actionPlan=Action Plan -issue_filter.criteria.actionPlanNotAvailable=Action Plan criteria is available when only one project is selected issue_filter.criteria.assignee=Assignee issue_filter.criteria.created=Created issue_filter.criteria.created_at=Created at @@ -841,7 +828,6 @@ issues.facet.types=Type issues.facet.severities=Severity issues.facet.projectUuids=Project issues.facet.statuses=Status -issues.facet.actionPlans=Action Plan issues.facet.assignees=Assignee issues.facet.fileUuids=File issues.facet.moduleUuids=Module @@ -905,43 +891,6 @@ comparison.move_up=Move up comparison.version.latest=LATEST -#------------------------------------------------------------------------------ -# -# ACTION PLANS -# -#------------------------------------------------------------------------------ - -action_plans.add_action_plan=Add action plan -action_plans.add_new_action_plan=Create -action_plans.col.status=St. -action_plans.col.name=Name -action_plans.col.due_for=Due for -action_plans.col.progress=Progress -action_plans.col.description=Description -action_plans.col.author=Author -action_plans.col.closed_on=Closed on -action_plans.col.operations=Operations -action_plans.no_action_plan=No action plan -action_plans.confirm_delete=Delete this action plan? Associated issues will not be deleted. -action_plans.confirm_close=Close this action plan? There are still open issues linked to it. -action_plans.create_form_title=Create Action Plan -action_plans.edit_action_plan=Edit Action Plan -action_plans.same_name_in_same_project=An action plan with this name already exists in this project. -action_plans.date_format_help=The date should be entered using the following pattern: "year-month-day". For instance, "2014-12-31". -action_plans.date_not_valid=Date not valid -action_plans.date_cant_be_in_past=The dead-line can't be in the past -action_plans.delete=Delete Action Plan -action_plans.delete_message=Are you sure that you want to delete action plan "{0}"? Associated issues will not be deleted. -action_plans.closed_action_plan=Closed Action Plans -action_plans.no_issues_linked_to_action_plan=No issues linked to this action plan yet. -action_plans.status.OPEN=Open -action_plans.status.CLOSED=Closed -action_plans.resolved_issues_x_percent=Resolved issues - {0}% ({1} issues) -action_plans.unresolved_issues_x_percent=Unresolved issues - {0}% ({1} issues) -action_plans.x_out_of_x_issues_solved={0} of {1} issues resolved -action_plans.reopen=Reopen -action_plans.errors.action_plan_does_not_exist=Action plan with key {0} does not exist - #------------------------------------------------------------------------------ # # DEPENDENCIES @@ -1085,7 +1034,6 @@ shortcuts.section.issue.select=select an issue shortcuts.section.issue.do_transition=do an issue transition shortcuts.section.issue.assign=assign issue shortcuts.section.issue.assign_to_me=assign issue to the current user -shortcuts.section.issue.plan=plan issue shortcuts.section.issue.change_severity=change severity of issue shortcuts.section.issue.comment=comment issue shortcuts.section.issue.submit_comment=submit comment @@ -1335,13 +1283,6 @@ widget.hotspot_metric.property.title.name=Title widget.hotspot_metric.property.metric.name=Metric widget.hotspot_metric.property.numberOfLines.name=Number of lines -widget.action_plans.name=Action Plans -widget.action_plans.description=Shows all the open action plans of the project. -widget.action_plans.property.showResolvedIssues.name=Show Resolved Issues -widget.action_plans.title=Open action plans -widget.action_plans.no_action_plan=No action plan -widget.action_plans.x_unresolved_issues={0} unresolved issues - widget.issue_filter.name=Issue Filter widget.issue_filter.description=Displays the result of a pre-configured issue filter. widget.issue_filter.property.filter.name=Filter @@ -1355,7 +1296,6 @@ widget.issue_filter.property.distributionAxis.option.severities.name=By Severity widget.issue_filter.property.distributionAxis.option.projectUuids.name=By Project widget.issue_filter.property.distributionAxis.option.statuses.name=By Status widget.issue_filter.property.distributionAxis.option.createdAt.name=By Creation Date -widget.issue_filter.property.distributionAxis.option.actionPlans.name=By Action Plan widget.issue_filter.property.distributionAxis.option.assignees.name=By Assignee widget.issue_filter.property.distributionAxis.option.tags.name=By Tag widget.issue_filter.property.distributionAxis.option.rules.name=By Rule @@ -1378,7 +1318,6 @@ widget.project_issue_filter.property.distributionAxis.option.types.name=By Type widget.project_issue_filter.property.distributionAxis.option.severities.name=By Severity widget.project_issue_filter.property.distributionAxis.option.statuses.name=By Status widget.project_issue_filter.property.distributionAxis.option.createdAt.name=By Creation Date -widget.project_issue_filter.property.distributionAxis.option.actionPlans.name=By Action Plan widget.project_issue_filter.property.distributionAxis.option.assignees.name=By Assignee widget.project_issue_filter.property.distributionAxis.option.tags.name=By Tag widget.project_issue_filter.property.distributionAxis.option.rules.name=By Rule @@ -1493,7 +1432,6 @@ resource_viewer.resource_deleted=This resource has been deleted. issues_viewer.issue_filter.false_positives=False positives issues_viewer.issue_filter.unassigned=Not assigned -issues_viewer.issue_filter.unplanned=Unplanned #------------------------------------------------------------------------------ -- 2.39.5