From: Stas Vilchik Date: Fri, 9 Feb 2018 10:24:46 +0000 (+0100) Subject: SONAR-10414 Missing l10n message in Marketplace (#3038) X-Git-Tag: 7.5~1670 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e22000509bf6734f602c21af925ed372ab7b8b8f;p=sonarqube.git SONAR-10414 Missing l10n message in Marketplace (#3038) --- diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx index b73c4267239..e5a5d8dfef4 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx @@ -55,10 +55,10 @@ export default class SettingsEditionsNotif extends React.PureComponent {edition ? translateWithParameters( - 'marketplace.status_x.' + editionStatus.installationStatus, + 'marketplace.edition_status_x.' + editionStatus.installationStatus, edition.name ) - : translate('marketplace.status', editionStatus.installationStatus)} + : translate('marketplace.edition_status', editionStatus.installationStatus)} ); @@ -71,10 +71,10 @@ export default class SettingsEditionsNotif extends React.PureComponent {edition ? translateWithParameters( - 'marketplace.status_x.' + editionStatus.installationStatus, + 'marketplace.edition_status_x.' + editionStatus.installationStatus, edition.name ) - : translate('marketplace.status', editionStatus.installationStatus)} + : translate('marketplace.edition_status', editionStatus.installationStatus)} {edition && edition.key === 'datacenter' && ( @@ -95,7 +95,7 @@ export default class SettingsEditionsNotif extends React.PureComponent )} {!preventRestart && ( - )} @@ -111,10 +111,10 @@ export default class SettingsEditionsNotif extends React.PureComponent {edition ? translateWithParameters( - 'marketplace.status_x.' + editionStatus.installationStatus, + 'marketplace.edition_status_x.' + editionStatus.installationStatus, edition.name ) - : translate('marketplace.status', editionStatus.installationStatus)} + : translate('marketplace.edition_status', editionStatus.installationStatus)} - marketplace.status_x.MANUAL_IN_PROGRESS.Foo + marketplace.edition_status_x.MANUAL_IN_PROGRESS.Foo - marketplace.status.AUTOMATIC_READY + marketplace.edition_status.AUTOMATIC_READY @@ -47,7 +48,7 @@ exports[`should display an in progress notif 1`] = ` className="spinner spacer-right text-bottom" /> - marketplace.status.AUTOMATIC_IN_PROGRESS + marketplace.edition_status.AUTOMATIC_IN_PROGRESS `; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogItem.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogItem.tsx index 0db83778cf1..06a94958835 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogItem.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogItem.tsx @@ -21,7 +21,7 @@ import * as React from 'react'; import DateFormatter from '../../../components/intl/DateFormatter'; import Tooltip from '../../../components/controls/Tooltip'; import { Release, Update } from '../../../api/plugins'; -import { translate, translateWithParameters } from '../../../helpers/l10n'; +import { translate } from '../../../helpers/l10n'; interface Props { release: Release; @@ -37,7 +37,7 @@ export default function PluginChangeLogItem({ release, update }: Props) { {release.version} ) : ( - + {release.version} diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateItem.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateItem.tsx index fcc1611894a..1bbb18782f2 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateItem.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateItem.tsx @@ -57,7 +57,7 @@ export default class PluginUpdateItem extends React.PureComponent {update.status === 'COMPATIBLE' ? ( {release.version} ) : ( - + {release.version} )} 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 7a4fef57e0a..f2c3e7f0571 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2140,10 +2140,10 @@ marketplace.install_pending=Install Pending marketplace.update_pending=Update Pending marketplace.uninstall_pending=Uninstall Pending marketplace.updates=Updates -marketplace.status.COMPATIBLE=Compatible -marketplace.status.INCOMPATIBLE=Incompatible -marketplace.status.REQUIRES_SYSTEM_UPGRADE=Requires system update -marketplace.status.DEPS_REQUIRE_SYSTEM_UPGRADE=Some of dependencies requires system update +marketplace.update_status.COMPATIBLE=Compatible +marketplace.update_status.INCOMPATIBLE=Incompatible +marketplace.update_status.REQUIRES_SYSTEM_UPGRADE=Requires system update +marketplace.update_status.DEPS_REQUIRE_SYSTEM_UPGRADE=Some of dependencies requires system update marketplace.license_preview_status.NO_INSTALL=No installation needed, your license will be updated directly. marketplace.license_preview_status.AUTOMATIC_INSTALL=After clicking on "Install", your {0} will be automatically downloaded and installed, and you'll need to restart your server once it's completed. marketplace.license_preview_status.MANUAL_INSTALL={0} can't automatically be installed because of internet access issues. A manual installation is required. @@ -2154,15 +2154,15 @@ marketplace.i_accept_the=I accept the marketplace.commercial_edition=Commercial Edition marketplace.terms_and_conditions=Terms and Conditions marketplace.editions_unavailable=Explore our Commercial Editions on {url}: advanced feature packs brought to you by SonarSource +marketplace.edition_status.AUTOMATIC_IN_PROGRESS=Installing your new Commercial Edition... Please wait... +marketplace.edition_status.AUTOMATIC_READY=Commercial Edition successfully installed. Please restart the server to activate your new edition. +marketplace.edition_status.UNINSTALL_IN_PROGRESS=Commercial Edition successfully downgraded. Please restart the server to remove the features. +marketplace.edition_status.MANUAL_IN_PROGRESS=Commercial Edition can't automatically be installed because of internet access issues. Please manually install the package. +marketplace.edition_status_x.AUTOMATIC_IN_PROGRESS=Installing your new {0}... Please wait... +marketplace.edition_status_x.AUTOMATIC_READY={0} successfully installed. Please restart the server to activate your new edition. +marketplace.edition_status_x.UNINSTALL_IN_PROGRESS=Successfully downgraded to {0}. Please restart the server to remove the features. +marketplace.edition_status_x.MANUAL_IN_PROGRESS={0} can't automatically be installed because of internet access issues. Please manually install the package. marketplace.release_notes=Release Notes -marketplace.status.AUTOMATIC_IN_PROGRESS=Installing your new Commercial Edition. Please wait... -marketplace.status.AUTOMATIC_READY=Commercial Edition successfully installed. Please restart the server to activate your new edition. -marketplace.status.UNINSTALL_IN_PROGRESS=Commercial Edition successfully downgraded. Please restart the server to remove the features. -marketplace.status.MANUAL_IN_PROGRESS=Commercial Edition can't automatically be installed because of internet access issues. Please manually install the package. -marketplace.status_x.AUTOMATIC_IN_PROGRESS=Installing your new {0}. Please wait... -marketplace.status_x.AUTOMATIC_READY={0} successfully installed. Please restart the server to activate your new edition. -marketplace.status_x.UNINSTALL_IN_PROGRESS=Successfully downgraded to {0}. Please restart the server to remove the features. -marketplace.status_x.MANUAL_IN_PROGRESS={0} can't automatically be installed because of internet access issues. Please manually install the package. marketplace.how_to_install=How to install it? marketplace.see_documentation_to_enable_cluster=See {url} documentation to set up a cluster. marketplace.how_to_setup_cluster_url=Further configuration is required to set up a cluster. See {url} documentation.