New Issues Page: update labels

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index 10ca6b2f58e410f4fd37815158a8a68ce2448475..323d8885145e7e7edb6b45f0091a6c0109b77474 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -60,11 +60,11 @@
       },
       'status':        '<%= escape_javascript message('issue_filter.criteria.status') -%>',
       'statuses': {
-        open:          '<%= escape_javascript message('issue.status.OPEN') -%>',
-        confirmed:     '<%= escape_javascript message('issue.status.CONFIRMED') -%>',
-        reopened:      '<%= escape_javascript message('issue.status.REOPENED') -%>',
-        resolved:      '<%= escape_javascript message('issue.status.RESOLVED') -%>',
-        closed:        '<%= escape_javascript message('issue.status.CLOSED') -%>'
+        OPEN:          '<%= escape_javascript message('issue.status.OPEN') -%>',
+        CONFIRMED:     '<%= escape_javascript message('issue.status.CONFIRMED') -%>',
+        REOPENED:      '<%= escape_javascript message('issue.status.REOPENED') -%>',
+        RESOLVED:      '<%= escape_javascript message('issue.status.RESOLVED') -%>',
+        CLOSED:        '<%= escape_javascript message('issue.status.CLOSED') -%>'
       },
       'actions': {
         comment:        '<%= escape_javascript message('issue.comment.formlink') -%>',
@@ -89,9 +89,9 @@
       assignee:        '<%= escape_javascript message('issue_filter.criteria.assignee') -%>',
       resolution:      '<%= escape_javascript message('issue_filter.criteria.resolution') -%>',
       resolutions: {
-        falsePositive: '<%= escape_javascript message('issue.resolution.FALSE-POSITIVE') -%>',
-        fixed:         '<%= escape_javascript message('issue.resolution.FIXED') -%>',
-        removed:       '<%= escape_javascript message('issue.resolution.REMOVED') -%>'
+        'FALSE-POSITIVE': '<%= escape_javascript message('issue.resolution.FALSE-POSITIVE') -%>',
+        'FIXED':       '<%= escape_javascript message('issue.resolution.FIXED') -%>',
+        'REMOVED':     '<%= escape_javascript message('issue.resolution.REMOVED') -%>'
       },
       reporter:        '<%= escape_javascript message('issue_filter.criteria.reporter') -%>',
       created:         '<%= escape_javascript message('issue_filter.criteria.created') -%>',

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
index 8cdf47fa24aa6ad582f5665934257e16c1d7fd80..16fa75c3e88fb199f10718f3d9c86d8ac7519e49 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
@@ -120,10 +120,10 @@
       {{/inArray}}
 
 
-      <li>{{statusIcon status}}{{capitalize status}}</li>
+      <li>{{statusIcon status}}{{translate "statuses" status}}</li>
 
       {{#if resolution}}
-        <li>{{resolutionIcon resolution}}{{capitalize resolution}}</li>
+        <li>{{resolutionIcon resolution}}{{translate "resolutions" resolution}}</li>
       {{/if}}