From c2681dbce1c7a81d41dd7f28b4f93cb031d09994 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 5 Mar 2015 11:21:29 +0100 Subject: [PATCH] SONAR-5884 update coverage tooltips --- .../main/hbs/source-viewer/source-viewer-coverage-popup.hbs | 4 ++-- .../src/main/js/source-viewer/popups/coverage-popup.js | 1 + .../src/main/resources/org/sonar/l10n/core.properties | 6 ++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/sonar-web/src/main/hbs/source-viewer/source-viewer-coverage-popup.hbs b/server/sonar-web/src/main/hbs/source-viewer/source-viewer-coverage-popup.hbs index cea9ae48f3c..df7cfc0388a 100644 --- a/server/sonar-web/src/main/hbs/source-viewer/source-viewer-coverage-popup.hbs +++ b/server/sonar-web/src/main/hbs/source-viewer/source-viewer-coverage-popup.hbs @@ -1,12 +1,12 @@
{{#if row.lineHits}} - {{t 'source_viewer.covered'}} + {{t 'source_viewer' tests 'covered'}} {{#if row.conditions}} ({{default row.coveredConditions 0}} of {{row.conditions}} {{t 'source_viewer.conditions'}}) {{/if}} {{else}} - {{t 'source_viewer.not_covered'}} + {{t 'source_viewer' tests 'not_covered'}} {{#if row.conditions}} ({{row.conditions}} {{t 'source_viewer.conditions'}}) {{/if}} diff --git a/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js b/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js index 593b9f1d1d1..96afb6ff4ed 100644 --- a/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js +++ b/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js @@ -60,6 +60,7 @@ define([ }); return { testFiles: testFiles, + tests: this.options.tests, row: row }; } 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 64dfc204c92..b783bf27f13 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2895,8 +2895,10 @@ component_viewer.workspace.tooltip=Keeps track of history of navigation component_viewer.workspace.show_workspace=Show workspace component_viewer.workspace.hide_workspace=Hide workspace -source_viewer.covered=Covered -source_viewer.not_covered=Not covered +source_viewer.ut.covered=Covered by unit tests +source_viewer.ut.not_covered=Not covered by unit tests +source_viewer.it.covered=Covered by integration tests +source_viewer.it.not_covered=Not covered by integration tests source_viewer.conditions=conditions source_viewer.tooltip.duplicated_line=This line is duplicated. Click to see duplicated blocks. -- 2.39.5