From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Wed, 25 Oct 2017 14:49:00 +0000 (+0200)
Subject: Update wording for search engine in system info
X-Git-Tag: 6.7-RC1~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cd1400b1411e039826c8267d135234caf6a71a71;p=sonarqube.git

Update wording for search engine in system info
---

diff --git a/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx b/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx
index 60d9e1ba6aa..c27c7dd4521 100644
--- a/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx
+++ b/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx
@@ -120,7 +120,7 @@ export default class PageActions extends React.PureComponent<Props, State> {
                   id="es-logs-link"
                   download="sonarqube_es.log"
                   target="_blank">
-                  Elasticsearch
+                  Search Engine
                 </a>
               </li>
               <li>
@@ -153,7 +153,7 @@ export default class PageActions extends React.PureComponent<Props, State> {
           </button>
         )}
         {this.props.canRestart &&
-        this.state.openRestartForm && <RestartForm onClose={this.handleServerRestartClose} />}
+          this.state.openRestartForm && <RestartForm onClose={this.handleServerRestartClose} />}
         {this.state.openLogsLevelForm && (
           <ChangeLogLevelForm
             infoMsg={translate(
diff --git a/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/PageActions-test.tsx.snap b/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/PageActions-test.tsx.snap
index 7677001d16f..d665e37ec15 100644
--- a/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/PageActions-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/PageActions-test.tsx.snap
@@ -64,7 +64,7 @@ exports[`should render correctly 1`] = `
           id="es-logs-link"
           target="_blank"
         >
-          Elasticsearch
+          Search Engine
         </a>
       </li>
       <li>
diff --git a/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/StandaloneSysInfos-test.tsx.snap b/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/StandaloneSysInfos-test.tsx.snap
index b7a2d4285c1..ba562c42b3b 100644
--- a/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/StandaloneSysInfos-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/system/components/__tests__/__snapshots__/StandaloneSysInfos-test.tsx.snap
@@ -45,7 +45,7 @@ exports[`should render correctly 1`] = `
     }
   />
   <HealthCard
-    name="Search"
+    name="Search Engine"
     onClick={[Function]}
     open={false}
     sysInfoData={
diff --git a/server/sonar-web/src/main/js/apps/system/utils.ts b/server/sonar-web/src/main/js/apps/system/utils.ts
index 1f5367bd5f9..7048439a678 100644
--- a/server/sonar-web/src/main/js/apps/system/utils.ts
+++ b/server/sonar-web/src/main/js/apps/system/utils.ts
@@ -160,7 +160,7 @@ export function getStandaloneSecondarySections(sysInfoData: SysInfo): SysInfoSec
   return {
     Web: pickBy(sysInfoData, (_, key) => key.startsWith('Web')),
     'Compute Engine': pickBy(sysInfoData, (_, key) => key.startsWith('Compute Engine')),
-    Search: pickBy(sysInfoData, (_, key) => key.startsWith('Search'))
+    'Search Engine': pickBy(sysInfoData, (_, key) => key.startsWith('Search'))
   };
 }
 
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 5533b2f3cc6..dfa7b4532c2 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2184,7 +2184,7 @@ background_tasks.failing_count=Count of projects where processing of most recent
 #------------------------------------------------------------------------------
 system.application_nodes_title=Application Nodes
 system.are_you_sure_to_restart=Are you sure you want to restart the server?
-system.cluster_log_level.info=Changes apply to all Application nodes but not to Search nodes.
+system.cluster_log_level.info=Your selection affect all Application nodes but not the Search nodes.
 system.current_health_of_x=Current health status of {0}
 system.download_logs=Download Logs
 system.download_system_info=Download System Info
@@ -2196,7 +2196,7 @@ system.latest_version=Latest Version
 system.lts_version=LTS Version
 system.log_level.warning=This level has performance impacts, please make sure to get back to INFO level once your investigation is done. Please note that when the server is restarted, logging will revert to the level configured in sonar.properties.
 system.log_level.warning.short=Current logs level has performance impacts, get back to INFO level.
-system.log_level.info=Changes don't apply to Search.
+system.log_level.info=Your selection does not affect the Search Engine.
 system.logs_level=Logs level
 system.new_version_available=A new version of SonarQube is available.
 system.release_notes=Release Notes
diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemInfoTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemInfoTest.java
index 960946d0632..ae11a552e85 100644
--- a/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemInfoTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/SystemInfoTest.java
@@ -76,7 +76,7 @@ public class SystemInfoTest {
       .shouldHaveSection("Compute Engine Logging")
       .shouldHaveSection("Compute Engine Tasks");
 
-    page.getCardItem("Search")
+    page.getCardItem("Search Engine")
       .shouldHaveSection("Search State")
       .shouldHaveSection("Search Indexes");
   }