SONAR-7345 Rename Issue debt to effort in UI

diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssuesWidget.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssuesWidget.java
index 899b2cabce94af14b586ffe7c7468e882d3f4f41..6d428f0dcd1687129db48e1cb1999b3575cc606a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssuesWidget.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/widget/IssuesWidget.java
@@ -25,6 +25,6 @@ import org.sonar.api.web.WidgetCategory;
 public class IssuesWidget extends CoreWidget {
 
   public IssuesWidget() {
-    super("rules", "Issues and Technical Debt", "/org/sonar/server/dashboard/widget/issues.html.erb");
+    super("rules", "Issues and Effort", "/org/sonar/server/dashboard/widget/issues.html.erb");
   }
 }

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 eb7071f7e9dcf07778f93f2b4b9ab140e3b14ec0..b78aa60b08a59bc0d2aeac92101f2896809a9e79 100644 (file)
--- 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
@@ -65,7 +65,7 @@
   "coverage_viewer.overall_tests": "All Tests",
   "metric.test_failures.description": "Number of unit test failures",
   "dashboard.error_unshare_default": "This dashboard can't be unshared as long as it's defined as a default dashboard",
-  "issue.technical_debt": "Technical Debt:",
+  "issue.effort": "Effort:",
   "background_tasks.failures": "failures",
   "property.category.exclusions.duplications.description": "Configure the files that should be ignored by duplication detection.",
   "widget.treemap-widget.name": "Treemap of Components",

diff --git a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-mode-facet.hbs b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-mode-facet.hbs
index ea2f7433c8b7148a3b56d41199bb0950c2dbc821..6e8ec1de40f9266202ffa09c87152db4f4d8f070 100644 (file)
--- a/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-mode-facet.hbs
+++ b/server/sonar-web/src/main/js/apps/issues/templates/facets/issues-mode-facet.hbs
@@ -8,7 +8,7 @@
     <li>
       <input type="radio" name="issues-page-mode" value="debt" id="issues-page-mode-debt"
              {{#eq mode 'debt'}}checked{{/eq}}>
-      <label for="issues-page-mode-debt">Debt</label>
+      <label for="issues-page-mode-debt">Effort</label>
     </li>
   </ul>
 </div>

diff --git a/server/sonar-web/src/main/js/components/issue/templates/issue.hbs b/server/sonar-web/src/main/js/components/issue/templates/issue.hbs
index 37a11c86c5c53745db44d2d48b0480a88af2ab2e..c8d76d6773430871ad85aab468f8dff25757607d 100644 (file)
--- a/server/sonar-web/src/main/js/components/issue/templates/issue.hbs
+++ b/server/sonar-web/src/main/js/components/issue/templates/issue.hbs
@@ -111,7 +111,7 @@
           {{#if debt}}
             <li class="issue-meta">
               <span class="issue-meta-label">
-                {{tp 'issue.x_debt' debt}}
+                {{tp 'issue.x_effort' debt}}
               </span>
             </li>
           {{/if}}

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/issue.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/issue.rb
index 1af6920069ac2bfc7779e4cb2c6253d9c9a82f02..75494d5575776d37d2de9992b9676c57baf01cc2 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/issue.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/issue.rb
@@ -34,7 +34,8 @@ class Issue
     hash[:message] = issue.message if issue.message
     hash[:line] = issue.line.to_i if issue.line
     hash[:effortToFix] = issue.effortToFix.to_f if issue.effortToFix
-    hash[:debt] = Internal.durations.encode(issue.debt) if issue.debt
+    hash[:debt] = Internal.durations.encode(issue.effort) if issue.effort
+    hash[:effort] = Internal.durations.encode(issue.effort) if issue.effort
     hash[:reporter] = issue.reporter if issue.reporter
     hash[:assignee] = issue.assignee if issue.assignee
     hash[:author] = issue.authorLogin if issue.authorLogin

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 8fb828e6c230fadcfa32ce6aea6c8bca154c8c0b..270bf9c9a6228f6868fc29aa343a00b2f7b360a5 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -679,13 +679,13 @@ issue.transition.unconfirm.description=This issue should be reviewed again to de
 issue.transition.resolve=Resolve as fixed
 issue.transition.resolve.description=This issue has been fixed in the code and is waiting for the next analysis to close it - or reopen it if it was not actually fixed.
 issue.transition.falsepositive=Resolve as false positive
-issue.transition.falsepositive.description=This issue can be ignored because it is due to a limitation of the analysis engine. Its technical debt won't be counted.
+issue.transition.falsepositive.description=This issue can be ignored because it is due to a limitation of the analysis engine. Its effort won't be counted.
 issue.transition.reopen=Reopen
 issue.transition.reopen.description=This issue is not resolved, and should be reviewed again.
 issue.transition.close=Close
 issue.transition.close.description=
 issue.transition.wontfix=Resolve as won't fix
-issue.transition.wontfix.description=This issue can be ignored because the rule is irrelevant in this context. Its technical debt won't be counted.
+issue.transition.wontfix.description=This issue can be ignored because the rule is irrelevant in this context. Its effort won't be counted.
 issue.set_severity=Change Severity
 issue.set_severity.submit=Change Severity
 issue.set_type=Change Type
@@ -711,11 +711,11 @@ issue.status.CLOSED=Closed
 issue.status.CLOSED.description=Non-active and no longer requiring attention.
 
 issue.resolution.FALSE-POSITIVE=False Positive
-issue.resolution.FALSE-POSITIVE.description=Issues that manual review determined were False Positives. Technical debt from these issues is ignored.
+issue.resolution.FALSE-POSITIVE.description=Issues that manual review determined were False Positives. Effort from these issues is ignored.
 issue.resolution.FIXED=Fixed
 issue.resolution.FIXED.description=Issues that were corrected in code and reanalyzed.
 issue.resolution.WONTFIX=Won't fix
-issue.resolution.WONTFIX.description=Issues that are accepted in this context. They and their technical debt will be ignored.
+issue.resolution.WONTFIX.description=Issues that are accepted in this context. They and their effort will be ignored.
 issue.resolution.REMOVED=Removed
 issue.resolution.REMOVED.description=Either the rule or the resource was changed (removed, relocated, parameters changed, etc.) so that analysis no longer finds these issues.
 issue.unresolved.description=Unresolved issues have not been addressed in any way.
@@ -729,11 +729,8 @@ issue.manual.no_rules.non_admin=At least one manual rule must exist before manua
 issue.reported_by=Reported by
 issue.authorLogin=Author:
 issue.component_deleted=Removed
-issue.debt=Debt:
-issue.x_debt={0} debt
-issue.technical_debt=Technical Debt:
-issue.technical_debt_short=Debt
-issue.technical_debt_deleted=Rule not configured to generate technical debt estimate.
+issue.effort=Effort:
+issue.x_effort={0} effort
 issue.creation_date=Created
 issue.filter_similar_issues=Filter Similar Issues
 issues.return_to_list=Return to List
@@ -1219,10 +1216,9 @@ widget.events.all=All
 widget.events.no_event=No event
 widget.events.show_all=Show All
 
-widget.rules.name=Issues and Technical Debt
-widget.rules.description=Reports issues and technical debt.
+widget.rules.name=Issues and Effort
+widget.rules.description=Reports issues and effort.
 widget.rules.issues=Issues
-widget.rules.technical_debt=Technical Debt
 widget.rules.added=Added:
 widget.rules.removed=Removed:
 
@@ -1367,7 +1363,7 @@ widget.issue_filter.property.distributionAxis.option.languages.name=By Language
 widget.issue_filter.property.distributionAxis.option.reporters.name=By Reporter
 widget.issue_filter.property.distributionAxis.option.authors.name=By Author
 widget.issue_filter.property.displayMode.option.count.name=Issues
-widget.issue_filter.property.displayMode.option.debt.name=Technical Debt
+widget.issue_filter.property.displayMode.option.debt.name=Effort
 
 widget.project_issue_filter.name=Project Issue Filter
 widget.project_issue_filter.description=Displays the result of a pre-configured issue filter applied to the project.