Merge branch 'develop' into omnichannel/chats-onHold-action-consolida…

…tion
RocketChat · Nov 1, 2023 · 31427d2 · 31427d2
2 parents a4857b1 + 7342800
commit 31427d2
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 49 deletions.
diff --git a/.changeset/sour-hotels-flash.md b/.changeset/sour-hotels-flash.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Replace the old Enterprise labels to newest Premium
diff --git a/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx b/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx
@@ -29,7 +29,7 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }):
 		<Modal data-qa-id='enterprise-departments-modal' ref={ref}>
 			<Modal.Header>
 				<Modal.HeaderText>
-					<Modal.Tagline>{t('Enterprise_capability')}</Modal.Tagline>
+					<Modal.Tagline>{t('Premium_capability')}</Modal.Tagline>
 					<Modal.Title>{t('Departments')}</Modal.Title>
 				</Modal.HeaderText>
 				<Modal.Close onClick={onClose} data-qa='modal-close' />
@@ -39,7 +39,7 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }):
 				<Box fontScale='h3' mbe={28}>
 					{t('Enterprise_Departments_title')}
 				</Box>
-				{t('Enterprise_Departments_description_upgrade')}
+				{t('Premium_Departments_description_upgrade')}
 			</Modal.Content>
 			<Modal.Footer>
 				{hasPermission('view-statistics') ? (

diff --git a/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx b/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx
@@ -28,7 +28,7 @@ const PreferencesConversationTranscript = () => {
 							<Box display='flex' alignItems='center'>
 								{t('Omnichannel_transcript_pdf')}
 								<Box marginInline={4}>
-									{!hasLicense && <Tag variant='featured'>{t('Enterprise')}</Tag>}
+									{!hasLicense && <Tag variant='featured'>{t('Premium')}</Tag>}
 									{!canSendTranscriptPDF && hasLicense && <Tag>{t('No_permission')}</Tag>}
 								</Box>
 							</Box>

diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx
@@ -11,16 +11,17 @@ import {
 	StatesSubtitle,
 	ToggleSwitch,
 } from '@rocket.chat/fuselage';
-import { useEndpoint, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSetting } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import React from 'react';
+import { Trans, useTranslation } from 'react-i18next';
 
 import { ContextualbarContent, ContextualbarFooter } from '../../../components/Contextualbar';
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
 import { useActiveConnections } from '../../hooks/useActiveConnections';
 
 const CustomUserStatusService = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const result = useActiveConnections();
 	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
 	const togglePresenceServiceEndpoint = useEndpoint('POST', '/v1/presence.enableBroadcast');
@@ -81,13 +82,16 @@ const CustomUserStatusService = () => {
 					{license?.isEnterprise ? (
 						<>
 							<Box fontScale='p2' mb={8}>
-								{t('Enterprise_cap_description')}
+								{t('Premium_cap_description')}
 							</Box>
 							<Box fontScale='p2' mb={8}>
-								{t('Larger_amounts_of_active_connections')}{' '}
-								<Box is='a' href='https://docs.rocket.chat/deploy/scaling-rocket.chat' target='_blank' color='info'>
-									{t('multiple_instance_solutions')}
-								</Box>
+								<Trans i18nKey='Larger_amounts_of_active_connections'>
+									For larger amounts of active connections you can consider our
+									<Box is='a' href='https://docs.rocket.chat/deploy/scaling-rocket.chat' target='_blank' color='info'>
+										multiple instance solutions
+									</Box>
+									.
+								</Trans>
 							</Box>
 						</>
 					) : (
@@ -96,7 +100,7 @@ const CustomUserStatusService = () => {
 								{t('Community_cap_description')}
 							</Box>
 							<Box fontScale='p2' mb={8}>
-								{t('Enterprise_cap_description')}
+								{t('Premium_cap_description')}
 							</Box>
 						</>
 					)}
@@ -106,7 +110,7 @@ const CustomUserStatusService = () => {
 				<ContextualbarFooter borderBlockStartWidth='default' borderBlockColor='extra-light'>
 					<ButtonGroup stretch vertical>
 						<Button primary width='100%' is='a' href='https://www.rocket.chat/enterprise' target='_blank'>
-							{t('More_about_Enterprise_Edition')}
+							{t('More_about_Premium_plans')}
 						</Button>
 					</ButtonGroup>
 				</ContextualbarFooter>

diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx
@@ -23,7 +23,7 @@ const VideoConfConfigModal = ({ onClose, onConfirm, isAdmin }: VideoConfConfigMo
 			</Modal.Header>
 			<Modal.Content>
 				<Modal.HeroImage maxHeight='initial' src='/images/conf-call-config.svg' />
-				<Box fontScale='h3'>{t('Enterprise_capabilities')}</Box>
+				<Box fontScale='h3'>{t('Premium_capabilities')}</Box>
 				<Box withRichContent>
 					<Box is='ul' pis={24}>
 						<li>{t('Ringtones_and_visual_indicators_notify_people_of_incoming_calls')}</li>
@@ -35,10 +35,10 @@ const VideoConfConfigModal = ({ onClose, onConfirm, isAdmin }: VideoConfConfigMo
 					<Callout icon='team' title={isAdmin ? t('Jitsi_included_with_Community') : 'Jitsi'}>
 						{t('Open-source_conference_call_solution')}
 					</Callout>
-					<Callout icon='lightning' title={t('Pexip_Enterprise_only')}>
+					<Callout icon='lightning' title={t('Pexip_Premium_only')}>
 						{t('A_secure_and_highly_private_self-managed_solution_for_conference_calls')}
 					</Callout>
-					<Callout icon='lightning' title={t('Google_Meet_Enterprise_only')}>
+					<Callout icon='lightning' title={t('Google_Meet_Premium_only')}>
 						{t('Secure_SaaS_solution')} {t('A_cloud-based_platform_for_those_needing_a_plug-and-play_app')}
 					</Callout>
 				</Margins>

diff --git a/apps/meteor/ee/app/license/server/settings.ts b/apps/meteor/ee/app/license/server/settings.ts
@@ -3,11 +3,11 @@ import { Meteor } from 'meteor/meteor';
 import { settingsRegistry } from '../../../../app/settings/server';
 
 Meteor.startup(async () => {
-	await settingsRegistry.addGroup('Enterprise', async function () {
-		await this.section('License', async function () {
+	await settingsRegistry.addGroup('Premium', async function () {
+		await this.section('Premium', async function () {
 			await this.add('Enterprise_License', '', {
 				type: 'string',
-				i18nLabel: 'Enterprise_License',
+				i18nLabel: 'Premium_License',
 			});
 			await this.add('Enterprise_License_Data', '', {
 				type: 'string',

diff --git a/apps/meteor/ee/server/settings/ldap.ts b/apps/meteor/ee/server/settings/ldap.ts
@@ -14,7 +14,7 @@ export function addSettings(): Promise<void> {
 
 		await this.with(
 			{
-				tab: 'LDAP_Enterprise',
+				tab: 'LDAP_Premium',
 				enterprise: true,
 				modules: ['ldap-enterprise'],
 			},

diff --git a/apps/meteor/ee/server/settings/saml.ts b/apps/meteor/ee/server/settings/saml.ts
@@ -15,7 +15,7 @@ export const addSettings = async function (name: string): Promise<void> {
 	await settingsRegistry.addGroup('SAML', async function () {
 		await this.with(
 			{
-				tab: 'SAML_Enterprise',
+				tab: 'SAML_Premium',
 				enterprise: true,
 				modules: ['saml-enterprise'],
 			},