From 7a0dde084ca28a3ff51768960e4c18a047d0a528 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 4 Feb 2014 18:08:58 +0600
Subject: [PATCH] New Issues Page: update labels

---
 .../WEB-INF/app/views/issues/search.html.erb     | 16 ++++++++--------
 .../issues/templates/_issue_detail_inner.hbs.erb |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

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 10ca6b2f58e..323d8885145 100644
--- 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 8cdf47fa24a..16fa75c3e88 100644
--- 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}}
 
 
-- 
2.39.5