SONAR-12608 Update Editions information

diff --git a/server/sonar-docs/src/images/sonarqube-icon.png b/server/sonar-docs/src/images/sonarqube-icon.png
new file mode 100644 (file)
index 0000000..3750943
Binary files /dev/null and b/server/sonar-docs/src/images/sonarqube-icon.png differ

diff --git a/server/sonar-docs/src/tooltips/editions/datacenter.md b/server/sonar-docs/src/tooltips/editions/datacenter.md
index 4976256eb493ea19e98f94d3c6acc3620ab677b1..7b2ee1787254f5c6f15a0629b240b0c4ad8fbcf7 100644 (file)
--- a/server/sonar-docs/src/tooltips/editions/datacenter.md
+++ b/server/sonar-docs/src/tooltips/editions/datacenter.md
@@ -1,3 +1,9 @@
-### ![SonarSource logo](/images/sonarsource-icon.png) Data Center Edition
+### ![SonarQube logo](/images/sonarqube-icon.png) Data Center Edition
 
-Support for High-Availability. Allow every node of SonarQube to be redundant, in order to keep the service up at all times without worrying about downtime or interruption.
+*Designed for High Availability and Scalability*
+
+Enterprise Edition functionality plus:
+
+* Component redundancy
+* Data resiliency
+* Horizontal scalability

diff --git a/server/sonar-docs/src/tooltips/editions/developer.md b/server/sonar-docs/src/tooltips/editions/developer.md
index 74cb8912f2b2acbf2d55f16466a369ef0136f553..8f4d9d3a46164499449d1bccbfeb9a003a6c7628 100644 (file)
--- a/server/sonar-docs/src/tooltips/editions/developer.md
+++ b/server/sonar-docs/src/tooltips/editions/developer.md
@@ -1,7 +1,11 @@
-### ![SonarSource logo](/images/sonarsource-icon.png) Developer Edition
+### ![SonarQube logo](/images/sonarqube-icon.png) Developer Edition
 
-* Branch and Pull Requests analysis
-* Analysis of additional languages: C/C++, Objective-C, PL/SQL, ABAP , TSQL , Swift
-* Detection of security vulnerabilities
-* SonarLint notifications
+*Built for Developers by Developers*
+
+Community Edition functionality plus:
 
+* Branch analysis
+* Pull Request Decoration
+* Injection flaw detection
+* SonarLint notifications
+* Additional language analysis: C, C++, Obj-C, PS/SQL, ABAP, TSQL & Swift

diff --git a/server/sonar-docs/src/tooltips/editions/enterprise.md b/server/sonar-docs/src/tooltips/editions/enterprise.md
index a340c70e31d50637d88230ab260da4b7278d6f76..83bf5c7d1f6c7b701eef7499fee98efba3120423 100644 (file)
--- a/server/sonar-docs/src/tooltips/editions/enterprise.md
+++ b/server/sonar-docs/src/tooltips/editions/enterprise.md
@@ -1,7 +1,12 @@
-### ![SonarSource logo](/images/sonarsource-icon.png) Enterprise Edition
+### ![SonarQube logo](/images/sonarqube-icon.png) Enterprise Edition
+
+*Designed to Meet Enterprise Requirements*
+
+Developer Edition functionality plus:
 
 * Portfolio management
+* OWASP/SANS security reports
 * Executive reporting
-* Analysis of additional languages: Apex, COBOL, PL/I, RPG & VB6
-* Parallel processing of analysis reports
 * Project transfer
+* Compute Engine parallel processing
+* Additional language analysis: Apex, COBOL, PL/I, RPG & VB6

diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx
index 9efb90bb83c67aa93ca278e0e76f78b893f57a21..a18a3ec259c16b8f73b30716107ac73c5ca2628c 100644 (file)
--- a/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx
@@ -46,7 +46,7 @@ export default function EditionBox({ edition, ncloc, serverId, currentEdition }:
           href={getEditionUrl(edition, { ncloc, serverId, sourceEdition: currentEdition })}
           rel="noopener noreferrer"
           target="_blank">
-          {translate('marketplace.ask_for_information')}
+          {translate('marketplace.request_free_trial')}
         </a>
       </div>
     </div>

diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBox-test.tsx.snap b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBox-test.tsx.snap
index 5d63a4a3ec2deff3d69dc384046504fce3e0d6d1..cfd28f4bc3564b8199df6a97225b59f1c90be8b1 100644 (file)
--- a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBox-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBox-test.tsx.snap
@@ -13,7 +13,7 @@ exports[`should display the edition 1`] = `
       rel="noopener noreferrer"
       target="_blank"
     >
-      marketplace.ask_for_information
+      marketplace.request_free_trial
     </a>
   </div>
 </div>

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 d7338b776eefff7075de7203b65d44fc121530db..87966fac4a97ea7c274c50ed9ed49095d6de9dd4 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2390,8 +2390,8 @@ workspace.no_rule=The rule has been removed or never existed.
 #
 #------------------------------------------------------------------------------
 marketplace.page=Marketplace
-marketplace.page.description=Discover more features with SonarSource Editions:
-marketplace.page.description_best_edition=This Edition gives you access to all features of the SonarQube-SonarLint ecosystem, including all SonarSource code analyzers!
+marketplace.page.description=Discover the additional benefits offered in SonarQube Commercial Editions
+marketplace.page.description_best_edition=This edition includes access to all the SonarQube-SonarLint Ecosystem features!
 marketplace.page.you_are_running.community=You are currently running a Community Edition.
 marketplace.page.you_are_running.developer=You are currently running a Developer Edition.
 marketplace.page.you_are_running.enterprise=You are currently running an Enterprise Edition.
@@ -2418,7 +2418,7 @@ marketplace.checking_license=Checking your license...
 marketplace._installed=installed
 marketplace.available_under_commercial_license=Available under our commercial editions
 marketplace.learn_more=Learn more
-marketplace.ask_for_information=Ask for more information
+marketplace.request_free_trial=Request a free trial
 marketplace.homepage=Homepage
 marketplace.issue_tracker=Issue Tracker
 marketplace.licensed_under_x=Licensed under {license}