From bf7918a5968903abf7fce1d92fbb4ea40ae5767b Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 26 May 2014 13:23:15 +0600
Subject: [PATCH] SONAR-5209 Apply feedback on coverage

---
 .../main/hbs/component-viewer/header/_coverage-header.hbs   | 4 ++--
 sonar-server/src/main/hbs/component-viewer/source.hbs       | 6 ++++--
 sonar-server/src/main/js/issues/app.js                      | 4 +++-
 sonar-server/src/main/js/translate.js                       | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs b/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs
index b33187f7952..5df42dc7565 100644
--- a/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs
@@ -7,7 +7,7 @@
       {{{componentViewerHeaderItem coverage 'coverage'}}}
       {{{componentViewerHeaderItem line_coverage 'line_coverage'}}}
       {{{componentViewerHeaderLink lines_to_cover 'lines_to_cover' 'js-filter-lines-to-cover'}}}
-      {{{componentViewerHeaderLink covered_lines 'lines_to_cover' 'js-filter-covered-lines'}}}
+      {{{componentViewerHeaderLink covered_lines 'covered_lines' 'js-filter-covered-lines'}}}
       {{{componentViewerHeaderLink uncovered_lines 'uncovered_lines' 'js-filter-uncovered-lines'}}}
     </ul>
   </div>
@@ -35,7 +35,7 @@
         {{{componentViewerHeaderItem it_coverage 'coverage'}}}
         {{{componentViewerHeaderItem it_line_coverage 'line_coverage'}}}
         {{{componentViewerHeaderLink it_lines_to_cover 'lines_to_cover' 'js-filter-lines-to-cover-it'}}}
-        {{{componentViewerHeaderLink it_covered_lines 'lines_to_cover' 'js-filter-covered-lines-it'}}}
+        {{{componentViewerHeaderLink it_covered_lines 'covered_lines' 'js-filter-covered-lines-it'}}}
         {{{componentViewerHeaderLink it_uncovered_lines 'uncovered_lines' 'js-filter-uncovered-lines-it'}}}
       </ul>
     </div>
diff --git a/sonar-server/src/main/hbs/component-viewer/source.hbs b/sonar-server/src/main/hbs/component-viewer/source.hbs
index 52a6a6a9675..8260193e0e5 100644
--- a/sonar-server/src/main/hbs/component-viewer/source.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/source.hbs
@@ -39,14 +39,16 @@
         {{#if ../../settings.coverage}}
           <td class="stat coverage-tests {{#if coverage}}coverage-{{#if coverage.covered}}green{{else}}red{{/if}}{{/if}}">
             {{#if coverage}}
-              <span>{{coverage.testCases}}</span>
+              <span title="{{tp 'coverage_viewer.line_covered_by_x_tests' coverage.testCases}}">{{coverage.testCases}}</span>
             {{/if}}
           </td>
 
           <td class="stat coverage-branches {{#if coverage}}{{#if coverage.branchCoverageStatus}}coverage-{{coverage.branchCoverageStatus}}{{/if}}{{/if}}">
             {{#if coverage}}
               {{#if coverage.branches}}
-                <span>{{coverage.coveredBranches}}/{{coverage.branches}}</span>
+                <span title="{{tp 'coverage_viewer.x_covered_branches' coverage.coveredBranches}}">
+                  {{coverage.coveredBranches}}/{{coverage.branches}}
+                </span>
               {{/if}}
             {{/if}}
           </td>
diff --git a/sonar-server/src/main/js/issues/app.js b/sonar-server/src/main/js/issues/app.js
index 28c63e3c2b2..31715516a2d 100644
--- a/sonar-server/src/main/js/issues/app.js
+++ b/sonar-server/src/main/js/issues/app.js
@@ -486,6 +486,8 @@ requirejs(
         }
       };
 
-      NavigatorApp.start();
+      window.requestMessages().done(function () {
+        NavigatorApp.start();
+      });
 
     });
diff --git a/sonar-server/src/main/js/translate.js b/sonar-server/src/main/js/translate.js
index e9db1ba8764..ab874d25eb6 100644
--- a/sonar-server/src/main/js/translate.js
+++ b/sonar-server/src/main/js/translate.js
@@ -76,7 +76,7 @@
 
   window.requestMessages = function() {
     var apiUrl = baseUrl + '/api/l10n/index';
-    jQuery.get(apiUrl, function(bundle) {
+    return jQuery.get(apiUrl, function(bundle) {
       for (var message in bundle) {
         if (bundle.hasOwnProperty(message)) {
           var storageKey = 'l10n.' + message;
-- 
2.39.5