SONAR-10656 Remove SonarQube occurences when SonarCloud is enabled

4 files changed, 13 insertions, 5 deletions

diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx
index eacbe1883b0..5baa8f12be9 100644
--- a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx
+++ b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx
@@ -22,6 +22,7 @@ import * as PropTypes from 'prop-types';
 import { Link } from 'react-router';
 import GlobalFooterSonarCloud from './GlobalFooterSonarCloud';
 import GlobalFooterBranding from './GlobalFooterBranding';
+import InstanceMessage from '../../components/common/InstanceMessage';
 import { translate, translateWithParameters } from '../../helpers/l10n';
 
 interface Props {
@@ -48,7 +49,9 @@ export default class GlobalFooter extends React.PureComponent<Props> {
             <p className="big" id="evaluation_warning">
               {translate('footer.production_database_warning')}
             </p>
-            <p>{translate('footer.production_database_explanation')}</p>
+            <p>
+              <InstanceMessage message={translate('footer.production_database_explanation')} />
+            </p>
           </div>
         )}
 
diff --git a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap
index b7069f5b1cb..7b42faddf53 100644
--- a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap
@@ -236,7 +236,9 @@ exports[`should show the db warning message 1`] = `
     footer.production_database_warning
   </p>
   <p>
-    footer.production_database_explanation
+    <InstanceMessage
+      message="footer.production_database_explanation"
+    />
   </p>
 </div>
 `;
diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/PendingPluginsActionNotif.tsx b/server/sonar-web/src/main/js/app/components/nav/settings/PendingPluginsActionNotif.tsx
index 72658160bfb..5f475b3d27a 100644
--- a/server/sonar-web/src/main/js/app/components/nav/settings/PendingPluginsActionNotif.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/settings/PendingPluginsActionNotif.tsx
@@ -19,11 +19,12 @@
  */
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
+import InstanceMessage from '../../../../components/common/InstanceMessage';
+import NavBarNotif from '../../../../components/nav/NavBarNotif';
 import RestartForm from '../../../../components/common/RestartForm';
 import { cancelPendingPlugins, PluginPendingResult } from '../../../../api/plugins';
 import { Button } from '../../../../components/ui/buttons';
 import { translate } from '../../../../helpers/l10n';
-import NavBarNotif from '../../../../components/nav/NavBarNotif';
 
 interface Props {
   pending: PluginPendingResult;
@@ -59,7 +60,7 @@ export default class PendingPluginsActionNotif extends React.PureComponent<Props
     return (
       <NavBarNotif className="alert alert-info js-pending">
         <span className="little-spacer-right">
-          {translate('marketplace.sonarqube_needs_to_be_restarted_to')}
+          <InstanceMessage message={translate('marketplace.instance_needs_to_be_restarted_to')} />
         </span>
         {[
           { length: installing.length, msg: 'marketplace.install_x_plugins' },
diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/PendingPluginsActionNotif-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/PendingPluginsActionNotif-test.tsx.snap
index 2a461de7565..404b2a96734 100644
--- a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/PendingPluginsActionNotif-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/PendingPluginsActionNotif-test.tsx.snap
@@ -7,7 +7,9 @@ exports[`should display pending actions 1`] = `
   <span
     className="little-spacer-right"
   >
-    marketplace.sonarqube_needs_to_be_restarted_to
+    <InstanceMessage
+      message="marketplace.instance_needs_to_be_restarted_to"
+    />
   </span>
   <span
     key="marketplace.install_x_plugins"