diff --git a/webapp/channels/src/components/start_trial_form_modal/index.tsx b/webapp/channels/src/components/start_trial_form_modal/index.tsx index e64ed539a1..13880031c7 100644 --- a/webapp/channels/src/components/start_trial_form_modal/index.tsx +++ b/webapp/channels/src/components/start_trial_form_modal/index.tsx @@ -6,7 +6,7 @@ import {useSelector, useDispatch} from 'react-redux'; import {Modal, Button} from 'react-bootstrap'; import {FormattedMessage, useIntl} from 'react-intl'; import classNames from 'classnames'; - +import {t} from 'utils/i18n'; import {isModalOpen} from 'selectors/views/modals'; import {GlobalState} from 'types/store'; import {closeModal, openModal} from 'actions/views/modals'; @@ -33,8 +33,6 @@ import './start_trial_form_modal.scss'; import useCWSAvailabilityCheck from 'components/common/hooks/useCWSAvailabilityCheck'; import AirGappedModal from './air_gapped_modal'; -// TODO: Handle embargoed entities explicitly https://mattermost.atlassian.net/browse/MM-51470 - const TrialBenefitsModal = makeAsyncComponent('TrialBenefitsModal', React.lazy(() => import('components/trial_benefits_modal/trial_benefits_modal'))); enum TrialLoadStatus { @@ -44,10 +42,21 @@ enum TrialLoadStatus { Failed = 'FAILED' } +// Marker functions so i18n-extract doesn't remove strings +t('ONE_TO_50'); +t('FIFTY_TO_100'); +t('ONE_HUNDRED_TO_500'); +t('FIVE_HUNDRED_TO_1000'); +t('ONE_THOUSAND_TO_2500'); +t('TWO_THOUSAND_FIVE_HUNDRED_AND_UP'); + export enum OrgSize { ONE_TO_50 = '1-50', FIFTY_TO_100 = '51-100', ONE_HUNDRED_TO_500 = '101-500', + FIVE_HUNDRED_TO_1000 = '501-1000', + ONE_THOUSAND_TO_2500 = '1001-2500', + TWO_THOUSAND_FIVE_HUNDRED_AND_UP = '2501+', } type Props = { @@ -209,7 +218,7 @@ function StartTrialFormModal(props: Props): JSX.Element | null { } return { value: orgSize, - label: OrgSize[orgSize as unknown as keyof typeof OrgSize], + label: formatMessage({id: orgSize, defaultMessage: OrgSize[orgSize as unknown as keyof typeof OrgSize]}), }; }; diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json index 46bfe63691..bd5ed43317 100644 --- a/webapp/channels/src/i18n/en.json +++ b/webapp/channels/src/i18n/en.json @@ -3409,6 +3409,7 @@ "feedback.downgradeWorkspace.tellUsWhy": "Please tell us why you are downgrading", "feedback.downgradeWorkspace.tooExpensive": "Too expensive", "feedback.other": "Other", + "FIFTY_TO_100": "51-100", "file_attachment.thumbnail": "file thumbnail", "file_info_preview.size": "Size ", "file_info_preview.type": "File type ", @@ -3438,6 +3439,7 @@ "filtered_user_list.search": "Search users", "filtered_user_list.team": "Team:", "filtered_user_list.userStatus": "User Status:", + "FIVE_HUNDRED_TO_1000": "501-1000", "flag_post.flag": "Save", "flag_post.unflag": "Remove from Saved", "footer_pagination.count": "Showing {startCount, number}-{endCount, number} of {total, number}", @@ -4348,6 +4350,9 @@ "onboardingTour.Playbooks.title": "Build workflows with Playbooks", "onboardingTour.sendMessage.Description": "Start collaborating with others by typing or selecting one of the messages below. You can also drag and drop attachments into the text field or upload them using the paperclip icon.", "onboardingTour.sendMessage.title": "Send messages", + "ONE_HUNDRED_TO_500": "101-500", + "ONE_THOUSAND_TO_2500": "1001-2500", + "ONE_TO_50": "1-50", "password_form.change": "Change my password", "password_form.enter": "Enter a new password for your {siteName} account.", "password_form.pwd": "Password", @@ -5184,6 +5189,7 @@ "tutorial_tip.ok": "Next", "tutorial_tip.out": "Opt out of these tips.", "tutorial_tip.seen": "Seen this before? ", + "TWO_THOUSAND_FIVE_HUNDRED_AND_UP": "2501-5000", "unarchive_channel.cancel": "Cancel", "unarchive_channel.confirm": "Confirm UNARCHIVE Channel", "unarchive_channel.del": "Unarchive",