SONAR-21909 Remove "build" from current version information

diff --git a/server/sonar-web/src/main/js/helpers/strings.ts b/server/sonar-web/src/main/js/helpers/strings.ts
index ad92fb85eb4153d3ef52ebd61bd0b0a8bbafcb94..afc008c5ed013fca0ee1407ccc67c8f81b38fa91 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/strings.ts
+++ b/server/sonar-web/src/main/js/helpers/strings.ts
@@ -415,9 +415,8 @@ export function decodeJwt(token: string) {
   return JSON.parse(window.atob(base64));
 }
 
-const VERSION_REGEX = /[\s()]/g;
-const VERSION_BUILD = 'build';
+const VERSION_BUILD = 'build ';
 export function getInstanceVersionNumber(version: string) {
-  // e.g. "10.5 (build 12345)" => "10.5.12345"
-  return version.replace(VERSION_REGEX, '').replace(VERSION_BUILD, '.');
+  // e.g. "10.5 (build 12345)" => "10.5 (12345)"
+  return version.replace(VERSION_BUILD, '');
 }

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 e6c4cc5e3dff0bb5dea51ad4311caee35329e1a1..c124bdc3cacd591f8b0fc2577c0e76aae5f0f568 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -4242,8 +4242,8 @@ footer.security=Security
 footer.status=Status
 footer.terms=Terms
 footer.version=v{version}{status}
-footer.version.status.active=(ACTIVE)
-footer.version.status.inactive=(NO LONGER ACTIVE)
+footer.version.status.active=ACTIVE
+footer.version.status.inactive=NO LONGER ACTIVE
 footer.web_api=Web API