diff options
author | Stas Vilchik <stas.vilchik@sonarsource.com> | 2018-02-09 11:24:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 11:24:46 +0100 |
commit | 32ba839a03dc21fc2139bb8bf17ff7cb0855dc57 (patch) | |
tree | 19205e5cbdac108f29ea2380a60d5f0c45756168 /server | |
parent | e7da1120eb453923f613d191da9f6886f9169d24 (diff) | |
download | sonarqube-32ba839a03dc21fc2139bb8bf17ff7cb0855dc57.tar.gz sonarqube-32ba839a03dc21fc2139bb8bf17ff7cb0855dc57.zip |
SONAR-10414 Missing l10n message in Marketplace (#3038)
Diffstat (limited to 'server')
4 files changed, 12 insertions, 12 deletions
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 d2e8548ff72..d99659c1f26 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,11 +55,11 @@ export default class SettingsEditionsNotif extends React.PureComponent<Props, St <span> {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) )} </span> </NavBarNotif> @@ -73,11 +73,11 @@ export default class SettingsEditionsNotif extends React.PureComponent<Props, St <span> {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) )} </span> {edition && @@ -115,11 +115,11 @@ export default class SettingsEditionsNotif extends React.PureComponent<Props, St <NavBarNotif className="alert alert-danger"> {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) )} <a className="spacer-left" diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsEditionsNotif-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsEditionsNotif-test.tsx.snap index dcef4f6806f..fb5a78f952c 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsEditionsNotif-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/__snapshots__/SettingsEditionsNotif-test.tsx.snap @@ -4,7 +4,7 @@ exports[`should display a manual installation notification 1`] = ` <NavBarNotif className="alert alert-danger" > - marketplace.status_x.MANUAL_IN_PROGRESS.Foo + marketplace.edition_status_x.MANUAL_IN_PROGRESS.Foo <a className="spacer-left" href="https://redirect.sonarsource.com/doc/how-to-install-an-edition.html" @@ -28,7 +28,7 @@ exports[`should display a ready notification 1`] = ` className="alert alert-success" > <span> - marketplace.status.AUTOMATIC_READY + marketplace.edition_status.AUTOMATIC_READY </span> <button className="js-restart spacer-left" @@ -47,7 +47,7 @@ exports[`should display an in progress notif 1`] = ` className="spinner spacer-right text-bottom" /> <span> - marketplace.status.AUTOMATIC_IN_PROGRESS + marketplace.edition_status.AUTOMATIC_IN_PROGRESS </span> </NavBarNotif> `; 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 e3b927807cb..9199cf8790c 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} </span> ) : ( - <Tooltip overlay={translateWithParameters('marketplace.status', update.status)}> + <Tooltip overlay={translate('marketplace.update_status', update.status)}> <span className="js-plugin-changelog-version badge badge-warning spacer-right"> {release.version} </span> 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 bcfb3560527..66b3e9a1d70 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<Props, State> {update.status === 'COMPATIBLE' ? ( <span className="js-update-version badge badge-success">{release.version}</span> ) : ( - <Tooltip overlay={translate('marketplace.status', update.status)}> + <Tooltip overlay={translate('marketplace.update_status', update.status)}> <span className="js-update-version badge badge-warning">{release.version}</span> </Tooltip> )} |