From a13af4c794bde2d8b31579d61b7fe631beee2c24 Mon Sep 17 00:00:00 2001 From: Wouter Admiraal Date: Fri, 13 Dec 2019 09:14:40 +0100 Subject: [PATCH] SONAR-12608 Update Editions information --- server/sonar-docs/src/images/sonarqube-icon.png | Bin 0 -> 4926 bytes .../src/tooltips/editions/datacenter.md | 10 ++++++++-- .../src/tooltips/editions/developer.md | 14 +++++++++----- .../src/tooltips/editions/enterprise.md | 11 ++++++++--- .../apps/marketplace/components/EditionBox.tsx | 2 +- .../__snapshots__/EditionBox-test.tsx.snap | 2 +- .../resources/org/sonar/l10n/core.properties | 6 +++--- 7 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 server/sonar-docs/src/images/sonarqube-icon.png diff --git a/server/sonar-docs/src/images/sonarqube-icon.png b/server/sonar-docs/src/images/sonarqube-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..375094345b65a9fdd621d553fcd6808c8cebdf6f GIT binary patch literal 4926 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 literal 0 HcmV?d00001 diff --git a/server/sonar-docs/src/tooltips/editions/datacenter.md b/server/sonar-docs/src/tooltips/editions/datacenter.md index 4976256eb49..7b2ee178725 100644 --- 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 74cb8912f2b..8f4d9d3a461 100644 --- 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 a340c70e31d..83bf5c7d1f6 100644 --- 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 9efb90bb83c..a18a3ec259c 100644 --- 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')} 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 5d63a4a3ec2..cfd28f4bc35 100644 --- 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 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 d7338b776ee..87966fac4a9 100644 --- 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} -- 2.39.5