From f3ad96dc83606a906d3058832cb7a85ee450df3a Mon Sep 17 00:00:00 2001
From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Wed, 26 Jul 2017 11:25:08 +0200
Subject: [PATCH] fix analysis message

---
 .../src/main/js/apps/overview/events/AnalysesList.js     | 5 ++++-
 .../src/main/js/apps/overview/events/Analysis.js         | 9 +++++++--
 server/sonar-web/src/main/js/apps/overview/meta/Meta.js  | 7 ++++++-
 .../src/main/resources/org/sonar/l10n/core.properties    | 3 ++-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/overview/events/AnalysesList.js b/server/sonar-web/src/main/js/apps/overview/events/AnalysesList.js
index c1b78936fce..a52e8fc6a74 100644
--- a/server/sonar-web/src/main/js/apps/overview/events/AnalysesList.js
+++ b/server/sonar-web/src/main/js/apps/overview/events/AnalysesList.js
@@ -31,6 +31,7 @@ import type { History, Metric } from '../types';
 type Props = {
   history: ?History,
   project: string,
+  qualifier: string,
   router: { replace: ({ pathname: string, query?: {} }) => void }
 };
 
@@ -85,7 +86,9 @@ export default class AnalysesList extends React.PureComponent {
 
     return (
       <ul className="spacer-top">
-        {analyses.map(analysis => <Analysis key={analysis.key} analysis={analysis} />)}
+        {analyses.map(analysis =>
+          <Analysis key={analysis.key} analysis={analysis} qualifier={this.props.qualifier} />
+        )}
       </ul>
     );
   }
diff --git a/server/sonar-web/src/main/js/apps/overview/events/Analysis.js b/server/sonar-web/src/main/js/apps/overview/events/Analysis.js
index ba7fc7715d1..ccd0ac4df7d 100644
--- a/server/sonar-web/src/main/js/apps/overview/events/Analysis.js
+++ b/server/sonar-web/src/main/js/apps/overview/events/Analysis.js
@@ -25,7 +25,12 @@ import FormattedDate from '../../../components/ui/FormattedDate';
 import { translate } from '../../../helpers/l10n';
 import type { Analysis as AnalysisType, Event as EventType } from '../../projectActivity/types';
 
-export default function Analysis(props: { analysis: AnalysisType }) {
+type Props = {
+  analysis: AnalysisType,
+  qualifier: string
+};
+
+export default function Analysis(props: Props) {
   const { analysis } = props;
   const sortedEvents: Array<EventType> = sortBy(
     analysis.events,
@@ -48,7 +53,7 @@ export default function Analysis(props: { analysis: AnalysisType }) {
             {sortedEvents.map(event => <Event event={event} key={event.key} />)}
           </div>
         : <span className="note">
-            {translate('project_activity.project_analyzed')}
+            {translate('project_activity.analyzed', props.qualifier)}
           </span>}
     </li>
   );
diff --git a/server/sonar-web/src/main/js/apps/overview/meta/Meta.js b/server/sonar-web/src/main/js/apps/overview/meta/Meta.js
index 689db65fbed..fd849228480 100644
--- a/server/sonar-web/src/main/js/apps/overview/meta/Meta.js
+++ b/server/sonar-web/src/main/js/apps/overview/meta/Meta.js
@@ -56,7 +56,12 @@ const Meta = ({ component, history, measures, areThereCustomOrganizations, route
       {isProject && <MetaTags component={component} />}
 
       {(isProject || isApplication) &&
-        <AnalysesList project={component.key} history={history} router={router} />}
+        <AnalysesList
+          project={component.key}
+          qualifier={component.qualifier}
+          history={history}
+          router={router}
+        />}
 
       {shouldShowQualityGate &&
         <MetaQualityGate
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 d80ae93f259..afa2dbcbfcd 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1286,7 +1286,8 @@ manual_rules.add_manual_rule=Add Manual Rule
 
 project_activity.analysis=Analysis
 project_activity.add_version=Create Version
-project_activity.project_analyzed=Project Analyzed
+project_activity.analyzed.TRK=Project Analyzed
+project_activity.analyzed.APP=Application Analyzed
 project_activity.remove_version=Remove Version
 project_activity.remove_version.question=Are you sure you want to delete this version?
 project_activity.change_version=Change Version
-- 
2.39.5