[MM-60808] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/admin_console/license_settings/team_edition/team_edition_right_panel.tsx' with FormattedMessage (#28552)

This commit is contained in:
Ivy Gesare 2024-10-11 16:11:30 +03:00 committed by GitHub
parent 87ac98c524
commit 038bb6a2bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 19 deletions

View File

@ -2,14 +2,12 @@
// See LICENSE.txt for license information.
import React from 'react';
import {FormattedMessage} from 'react-intl';
import {FormattedMessage, useIntl} from 'react-intl';
import WomanUpArrowsAndCloudsSvg from 'components/common/svg_images_components/woman_up_arrows_and_clouds_svg';
import FormattedMarkdownMessage from 'components/formatted_markdown_message';
import LoadingWrapper from 'components/widgets/loading/loading_wrapper';
import {format} from 'utils/markdown';
import {localizeMessage} from 'utils/utils';
interface TeamEditionRightPanelProps {
upgradingPercentage: number;
@ -37,6 +35,8 @@ const TeamEditionRightPanel: React.FC<TeamEditionRightPanelProps> = ({
setClickNormalUpgradeBtn,
}: TeamEditionRightPanelProps) => {
let upgradeButton = null;
const intl = useIntl();
const onHandleUpgrade = (e: React.MouseEvent<HTMLButtonElement>) => {
if (!handleUpgrade) {
return;
@ -77,21 +77,24 @@ const TeamEditionRightPanel: React.FC<TeamEditionRightPanelProps> = ({
</button>
</p>
<p className='upgrade-legal-terms'>
<FormattedMarkdownMessage
id='admin.license.enterprise.upgrade.acceptTermsInitial'
defaultMessage='By clicking **Upgrade**, I agree to the terms of the Mattermost '
<FormattedMessage
id='admin.licenseSettings.teamEdition.teamEditionRightPanel.acceptTermsInitial'
defaultMessage='By clicking <b>Upgrade</b>, I agree to the terms of the Mattermost '
values={{
b: (chunks: string) => <b>{chunks}</b>,
}}
/>
<a
role='button'
onClick={openEEModal}
>
<FormattedMarkdownMessage
id='admin.license.enterprise.upgrade.eeLicenseLink'
<FormattedMessage
id='admin.licenseSettings.teamEdition.teamEditionRightPanel.eeLicenseLink'
defaultMessage='Enterprise Edition License'
/>
</a>
<FormattedMarkdownMessage
id='admin.license.enterprise.upgrade.acceptTermsFinal'
<FormattedMessage
id='admin.licenseSettings.teamEdition.teamEditionRightPanel.acceptTermsFinal'
defaultMessage='. Upgrading will download the binary and update your team edition.'
/>
</p>
@ -114,8 +117,8 @@ const TeamEditionRightPanel: React.FC<TeamEditionRightPanelProps> = ({
upgradeButton = (
<div>
<p>
<FormattedMarkdownMessage
id='admin.license.upgraded-restart'
<FormattedMessage
id='admin.licenseSettings.teamEdition.teamEditionRightPanel.upgradedRestart'
defaultMessage='You have upgraded your binary to mattermost enterprise, please restart the server to start using the new binary. You can do it right here:'
/>
</p>
@ -127,13 +130,13 @@ const TeamEditionRightPanel: React.FC<TeamEditionRightPanelProps> = ({
>
<LoadingWrapper
loading={restarting}
text={localizeMessage({
id: 'admin.license.enterprise.restarting',
text={intl.formatMessage({
id: 'admin.licenseSettings.teamEdition.teamEditionRightPanel.restarting',
defaultMessage: 'Restarting',
})}
>
<FormattedMessage
id='admin.license.enterprise.restart'
id='admin.licenseSettings.teamEdition.teamEditionRightPanel.restart'
defaultMessage='Restart Server'
/>
</LoadingWrapper>

View File

@ -1361,11 +1361,8 @@
"admin.license.confirm-license-removal.subtitle": "Removing the license will downgrade your server from {currentSKU} to Free. You may lose information. ",
"admin.license.confirm-license-removal.title": "Are you sure?",
"admin.license.enterprise.license_required_upgrade": "A license is required to unlock enterprise features",
"admin.license.enterprise.restart": "Restart Server",
"admin.license.enterprise.restarting": "Restarting",
"admin.license.enterprise.upgrade": "Upgrade to Enterprise Edition",
"admin.license.enterprise.upgrade.acceptTermsFinal": ". Upgrading will download the binary and update your team edition.",
"admin.license.enterprise.upgrade.acceptTermsInitial": "By clicking **Upgrade**, I agree to the terms of the Mattermost ",
"admin.license.enterprise.upgrade.eeLicenseLink": "Enterprise Edition License",
"admin.license.enterprise.upgrading": "Upgrading {percentage}%",
"admin.license.enterpriseEdition": "Enterprise Edition",
@ -1409,7 +1406,6 @@
"admin.license.upgrade-and-trial-request.accept-terms-final-part": "Also, I agree to the terms of the Mattermost {eeModalTerms}. Upgrading will download the binary and update your Team Edition instance.",
"admin.license.upgrade-and-trial-request.accept-terms-initial-part": "By selecting <strong>Upgrade Server And Start trial</strong>, I agree to the <linkEvaluation>Mattermost Software Evaluation Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy>, and receiving product emails. ",
"admin.license.upgrade-and-trial-request.title": "Upgrade to Enterprise Edition and Experience Mattermost Enterprise Edition for free for the next 30 days. No obligation to buy or credit card required. ",
"admin.license.upgraded-restart": "You have upgraded your binary to mattermost enterprise, please restart the server to start using the new binary. You can do it right here:",
"admin.license.upgradeTitle": "Upgrade to the Professional Plan",
"admin.license.upgradeToEnterprise": "Upgrade to the Enterprise plan",
"admin.license.upgradeToEnterpriseGov": "Upgrade to the Enterprise Gov Plan",
@ -1419,6 +1415,12 @@
"admin.license.upload-modal.successfulUpgradeText": "You have upgraded to the {skuName} plan for {licensedUsersNum, number} seats. This is effective from {startsAt} until {expiresAt}. ",
"admin.license.upload-modal.title": "Upload a License Key",
"admin.license.uploadFile": "Upload File",
"admin.licenseSettings.teamEdition.teamEditionRightPanel.acceptTermsFinal": ". Upgrading will download the binary and update your team edition.",
"admin.licenseSettings.teamEdition.teamEditionRightPanel.acceptTermsInitial": "By clicking <b>Upgrade</b>, I agree to the terms of the Mattermost ",
"admin.licenseSettings.teamEdition.teamEditionRightPanel.eeLicenseLink": "Enterprise Edition License",
"admin.licenseSettings.teamEdition.teamEditionRightPanel.restart": "Restart Server",
"admin.licenseSettings.teamEdition.teamEditionRightPanel.restarting": "Restarting",
"admin.licenseSettings.teamEdition.teamEditionRightPanel.upgradedRestart": "You have upgraded your binary to mattermost enterprise, please restart the server to start using the new binary. You can do it right here:",
"admin.lockTeammateNameDisplay": "Lock Teammate Name Display for all users: ",
"admin.lockTeammateNameDisplayHelpText": "When true, disables users' ability to change settings under <strong>Settings > Display > Teammate Name Display</strong>.",
"admin.log.AdvancedLoggingJSONDescription": "The JSON configuration for Advanced Logging. Please see <link>documentation</link> to learn more about Advanced Logging and the JSON format it uses.",