From 73428002869c81754d24fef368bb9dc7f4fe6d0a Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Wed, 1 Nov 2023 14:22:19 -0300 Subject: [PATCH] chore: Replace `enterprise` labels to `premium` (#30787) --- .changeset/sour-hotels-flash.md | 5 ++ .../modals/EnterpriseDepartmentsModal.tsx | 4 +- .../PreferencesConversationTranscript.tsx | 2 +- .../CustomUserStatusService.tsx | 22 ++++--- .../VideoConference/VideoConfConfigModal.tsx | 6 +- apps/meteor/ee/app/license/server/settings.ts | 6 +- apps/meteor/ee/server/settings/ldap.ts | 2 +- apps/meteor/ee/server/settings/saml.ts | 2 +- .../rocketchat-i18n/i18n/en.i18n.json | 57 +++++++++---------- 9 files changed, 57 insertions(+), 49 deletions(-) create mode 100644 .changeset/sour-hotels-flash.md diff --git a/.changeset/sour-hotels-flash.md b/.changeset/sour-hotels-flash.md new file mode 100644 index 000000000000..ac54cf3d3825 --- /dev/null +++ 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 index 949fc8ecd4ed..b1547ffba0a0 100644 --- 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 }): - {t('Enterprise_capability')} + {t('Premium_capability')} {t('Departments')} @@ -39,7 +39,7 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }): {t('Enterprise_Departments_title')} - {t('Enterprise_Departments_description_upgrade')} + {t('Premium_Departments_description_upgrade')} {hasPermission('view-statistics') ? ( diff --git a/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx b/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx index 9fccaef4593e..8b11367775dd 100644 --- a/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx +++ b/apps/meteor/client/views/account/omnichannel/PreferencesConversationTranscript.tsx @@ -28,7 +28,7 @@ const PreferencesConversationTranscript = () => { {t('Omnichannel_transcript_pdf')} - {!hasLicense && {t('Enterprise')}} + {!hasLicense && {t('Premium')}} {!canSendTranscriptPDF && hasLicense && {t('No_permission')}} diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx index 83f34459efb0..626529e3010a 100644 --- 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('Presence_broadcast_disabled'); const togglePresenceServiceEndpoint = useEndpoint('POST', '/v1/presence.enableBroadcast'); @@ -81,13 +82,16 @@ const CustomUserStatusService = () => { {license?.isEnterprise ? ( <> - {t('Enterprise_cap_description')} + {t('Premium_cap_description')} - {t('Larger_amounts_of_active_connections')}{' '} - - {t('multiple_instance_solutions')} - + + For larger amounts of active connections you can consider our + + multiple instance solutions + + . + ) : ( @@ -96,7 +100,7 @@ const CustomUserStatusService = () => { {t('Community_cap_description')} - {t('Enterprise_cap_description')} + {t('Premium_cap_description')} )} @@ -106,7 +110,7 @@ const CustomUserStatusService = () => { diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfConfigModal.tsx index d6fe7978d1cf..41a980dccf31 100644 --- 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 - {t('Enterprise_capabilities')} + {t('Premium_capabilities')}
  • {t('Ringtones_and_visual_indicators_notify_people_of_incoming_calls')}
    • @@ -35,10 +35,10 @@ const VideoConfConfigModal = ({ onClose, onConfirm, isAdmin }: VideoConfConfigMo {t('Open-source_conference_call_solution')} - + {t('A_secure_and_highly_private_self-managed_solution_for_conference_calls')} - + {t('Secure_SaaS_solution')} {t('A_cloud-based_platform_for_those_needing_a_plug-and-play_app')} diff --git a/apps/meteor/ee/app/license/server/settings.ts b/apps/meteor/ee/app/license/server/settings.ts index ead088fd546d..dc95c88d3481 100644 --- 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 index 413499375b07..1c9137a903ce 100644 --- a/apps/meteor/ee/server/settings/ldap.ts +++ b/apps/meteor/ee/server/settings/ldap.ts @@ -14,7 +14,7 @@ export function addSettings(): Promise { 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 index 50cb499af07f..0b4e8ee5d3c8 100644 --- 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 { await settingsRegistry.addGroup('SAML', async function () { await this.with( { - tab: 'SAML_Enterprise', + tab: 'SAML_Premium', enterprise: true, modules: ['saml-enterprise'], }, diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 2104d6a0483b..a41db5875efa 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -536,10 +536,10 @@ "Apps_Count_Enabled_plural": "{{count}} apps enabled", "Private_Apps_Count_Enabled": "{{count}} private app enabled", "Private_Apps_Count_Enabled_plural": "{{count}} private apps enabled", - "Apps_Count_Enabled_tooltip": "Community Edition workspaces can enable up to {{number}} {{context}} apps", + "Apps_Count_Enabled_tooltip": "Community workspaces can enable up to {{number}} {{context}} apps", "Apps_disabled_when_Enterprise_trial_ended": "Apps disabled when Enterprise trial ended", - "Apps_disabled_when_Enterprise_trial_ended_description": "Workspaces on Community Edition can have up to 5 marketplace apps and 3 private apps enabled. Ask your workspace admin to reenable apps.", - "Apps_disabled_when_Enterprise_trial_ended_description_admin": "Workspaces on Community Edition can have up to 5 marketplace apps and 3 private apps enabled. Reenable the apps you require.", + "Apps_disabled_when_Enterprise_trial_ended_description": "Workspaces on Community can have up to 5 marketplace apps and 3 private apps enabled. Ask your workspace admin to reenable apps.", + "Apps_disabled_when_Enterprise_trial_ended_description_admin": "Workspaces on Community can have up to 5 marketplace apps and 3 private apps enabled. Reenable the apps you require.", "Apps_Engine_Version": "Apps Engine Version", "Apps_Error_private_app_install_disabled": "Private app installation and updates are disabled in this workspace", "Apps_Essential_Alert": "This app is essential for the following events:", @@ -1562,7 +1562,7 @@ "Delete_message": "Delete message", "Delete_my_account": "Delete my account", "Delete_Role_Warning": "This cannot be undone", - "Delete_Role_Warning_Community_Edition": "This cannot be undone. Note that it's not possible to create new custom roles in Community Edition", + "Delete_Role_Warning_Community_Edition": "This cannot be undone. Note that it's not possible to create new custom roles in a Community workspace", "Delete_Room_Warning": "Deleting a room will delete all messages posted within the room. This cannot be undone.", "Delete_User_Warning": "Deleting a user will delete all messages from that user as well. This cannot be undone.", "Delete_User_Warning_Delete": "Deleting a user will delete all messages from that user as well. This cannot be undone.", @@ -1923,14 +1923,13 @@ "Enter_your_password_to_delete_your_account": "Enter your password to delete your account. This cannot be undone.", "Enter_your_username_to_delete_your_account": "Enter your username to delete your account. This cannot be undone.", "Enterprise": "Enterprise", - "Enterprise_capability": "Enterprise capability", - "Enterprise_capabilities": "Enterprise capabilities", + "Premium_capabilities": "Premium capabilities", "Enterprise_Departments_title": "Assign customers to queues and improve agent productivity", - "Enterprise_Departments_description_upgrade": "Workspaces on Community Edition can create just one department. Upgrade to Enterprise to remove limits and supercharge your workspace.", - "Enterprise_Departments_description_free_trial": "Workspaces on Community Edition can create one department. Start a free Enterprise trial to create multiple departments today!", + "Premium_Departments_description_upgrade": "Workspaces on Community can create just one department. Upgrade to Premium to remove limits and supercharge your workspace.", + "Premium_Departments_description_free_trial": "Workspaces on Community can create one department. Start a free Premium trial to create multiple departments today!", "Enterprise_Description": "Manually update your Enterprise license.", - "Enterprise_License": "Enterprise License", - "Enterprise_License_Description": "If your workspace is registered and license is provided by Rocket.Chat Cloud you don't need to manually update the license here.", + "Premium_License": "Premium License", + "Enterprise_License_Description": "If your workspace is registered and license is provided by Rocket.Chat cloud you don't need to manually update the license here.", "Enterprise_Only": "Enterprise only", "Entertainment": "Entertainment", "Error": "Error", @@ -2428,6 +2427,7 @@ "Go_to_your_workspace": "Go to your workspace", "Go_to_accessibility_and_appearance": "Go to accessibility and appearance", "Google_Meet_Enterprise_only": "Google Meet (Enterprise only)", + "Google_Meet_Premium_only": "Google Meet (Premium only)", "Google_Play": "Google Play", "Hold_Call": "Hold Call", "Hold_Call_EE_only": "Hold Call (Enterprise Edition only)", @@ -2858,7 +2858,7 @@ "Layout_Login_Template_Vertical": "Vertical", "Layout_Login_Template_Horizontal": "Horizontal", "Layout_Description": "Customize the look of your workspace.", - "Layout_Home_Body": "Block content", + "Layout_Home_Body": "Content block", "Layout_Home_Page_Content": "Layout / Home page content", "Layout_Home_Page_Content_Title": "Home page content", "Layout_Home_Title": "Home Title", @@ -2867,7 +2867,7 @@ "Layout_Login_Terms_Content": "By proceeding you are agreeing to our Terms of Service, Privacy Policy and Legal Notice.", "Layout_Privacy_Policy": "Privacy Policy", "Layout_Show_Home_Button": "Show home page button on sidebar header", - "Layout_Custom_Content_Description": "Here goes your custom content. It may be placed inside a white block or may take the all space available in the homepage, if you’re on Enterprise.", + "Layout_Custom_Content_Description": "Here goes your custom content. It may be placed inside a white block or may take the all space available in the homepage, if you’re on a Premium plan.", "Layout_Home_Custom_Block_Visible": "Show custom content to homepage", "Layout_Custom_Body_Only": "Show custom content only", "Layout_Custom_Body_Only_Description": "It will hide all other content blocks in the homepage.", @@ -2894,7 +2894,7 @@ "LDAP_DataSync_Roles": "Sync Roles", "LDAP_DataSync_Channels": "Sync Channels", "LDAP_DataSync_Teams": "Sync Teams", - "LDAP_Enterprise": "Enterprise", + "LDAP_Premium": "Premium", "LDAP_DataSync_BackgroundSync": "Background Sync", "LDAP_Server_Type": "Server Type", "LDAP_Server_Type_AD": "Active Directory", @@ -3997,7 +3997,7 @@ "Permalink": "Permalink", "Permissions": "Permissions", "Personal_Access_Tokens": "Personal Access Tokens", - "Pexip_Enterprise_only": "Pexip (Enterprise only)", + "Pexip_Premium_only": "Pexip (Premium only)", "Phone": "Phone", "Phone_call": "Phone Call", "Phone_Number": "Phone Number", @@ -4462,7 +4462,7 @@ "SAML_AuthnRequest_Template": "AuthnRequest Template", "SAML_AuthnRequest_Template_Description": "The following variables are available: \n- **\\_\\_newId\\_\\_**: Randomly generated id string \n- **\\_\\_instant\\_\\_**: Current timestamp \n- **\\_\\_callbackUrl\\_\\_**: The Rocket.Chat callback URL. \n- **\\_\\_entryPoint\\_\\_**: The value of the {{Custom Entry Point}} setting. \n- **\\_\\_issuer\\_\\_**: The value of the {{Custom Issuer}} setting. \n- **\\_\\_identifierFormatTag\\_\\_**: The contents of the {{NameID Policy Template}} if a valid {{Identifier Format}} is configured. \n- **\\_\\_identifierFormat\\_\\_**: The value of the {{Identifier Format}} setting. \n- **\\_\\_authnContextTag\\_\\_**: The contents of the {{AuthnContext Template}} if a valid {{Custom Authn Context}} is configured. \n- **\\_\\_authnContextComparison\\_\\_**: The value of the {{Authn Context Comparison}} setting. \n- **\\_\\_authnContext\\_\\_**: The value of the {{Custom Authn Context}} setting.", "SAML_Connection": "Connection", - "SAML_Enterprise": "Enterprise", + "SAML_Premium": "Premium", "SAML_General": "General", "SAML_Custom_Authn_Context": "Custom Authn Context", "SAML_Custom_Authn_Context_Comparison": "Authn Context Comparison", @@ -5125,7 +5125,7 @@ "There_has_been_an_error_installing_the_app": "There has been an error installing the app", "These_notes_will_be_available_in_the_call_summary": "These notes will be available in the call summary", "This_agent_was_already_selected": "This agent was already selected", - "this_app_is_included_with_subscription": "This app is included with {{bundleName}} subscription", + "this_app_is_included_with_subscription": "This app is included with {{bundleName}} plans", "This_cant_be_undone": "This can't be undone.", "This_conversation_is_already_closed": "This conversation is already closed.", "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "This email has already been used and has not been verified. Please change your password.", @@ -5980,9 +5980,9 @@ "Theme_light_description": "More accessible for individuals with visual impairments and a good choice for well-lit environments.", "Theme_dark": "Dark", "Theme_dark_description": "Reduce eye strain and fatigue in low-light conditions by minimizing the amount of light emitted by the screen.", - "Enable_of_limit_apps_currently_enabled": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.** \n \nWorkspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. \n \n**{{appName}} will be disabled by default.** Disable another {{context}} app or upgrade to Premium to enable this app.", - "Enable_of_limit_apps_currently_enabled_exceeded": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.** \n \nCommunity edition app limit has been exceeded. \n \nWorkspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. \n \n**{{appName}} will be disabled by default.** You will need to disable at least {{exceed}} other {{context}} apps or upgrade to Premium to enable this app.", - "Workspaces_on_Community_edition_install_app": "Workspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. Upgrade to Premium to enable unlimited apps.", + "Enable_of_limit_apps_currently_enabled": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.** \n \nWorkspaces on Community can have up to {{limit}} {{context}} apps enabled. \n \n**{{appName}} will be disabled by default.** Disable another {{context}} app or upgrade to Premium to enable this app.", + "Enable_of_limit_apps_currently_enabled_exceeded": "**{{enabled}} of {{limit}} {{context}} apps currently enabled.** \n \nCommunity app limit has been exceeded. \n \nWorkspaces on Community can have up to {{limit}} {{context}} apps enabled. \n \n**{{appName}} will be disabled by default.** You will need to disable at least {{exceed}} other {{context}} apps or upgrade to Premium to enable this app.", + "Workspaces_on_Community_edition_install_app": "Workspaces on Community can have up to {{limit}} {{context}} apps enabled. Upgrade to Premium to enable unlimited apps.", "Apps_Currently_Enabled": "{{enabled}} of {{limit}} {{context}} apps currently enabled.", "Disable_another_app": "Disable another app or upgrade to Enterprise to enable this app.", "Upload_anyway": "Upload anyway", @@ -5991,7 +5991,7 @@ "Private_apps_limit_reached": "Private apps limit reached", "Private_apps_limit_exceeded": "Private apps limit exceeded", "Disable_at_least_more_apps": "You will need to disable at least {{numberOfExceededApps}} other apps or upgrade to Enterprise to enable this app.", - "Community_Private_apps_limit_exceeded": "Community edition app limit has been exceeded.", + "Community_Private_apps_limit_exceeded": "Community app limit has been exceeded.", "Theme_match_system": "Match system", "Theme_match_system_description": "Automatically match the appearance of your system.", "Theme_high_contrast": "High contrast", @@ -6001,8 +6001,8 @@ "Create_a_password": "Create a password", "Create_an_account": "Create an account", "Get_all_apps": "Get all the apps your team needs", - "Workspaces_on_community_edition_trial_on": "Workspaces on Community Edition can have up to 5 marketplace apps and 3 private apps enabled. Start a free Premium trial to remove these limits today!", - "Workspaces_on_community_edition_trial_off": "Workspaces on Community Edition can have up to 5 marketplace apps and 3 private apps enabled. Upgrade to Premium to remove limits and supercharge your workspace.", + "Workspaces_on_community_edition_trial_on": "Workspaces on Community can have up to 5 marketplace apps and 3 private apps enabled. Start a free Premium trial to remove these limits today!", + "Workspaces_on_community_edition_trial_off": "Workspaces on Community can have up to 5 marketplace apps and 3 private apps enabled. Upgrade to Premium to remove limits and supercharge your workspace.", "No_private_apps_installed": "No private apps installed", "Private_apps_are_side-loaded": "Private apps are side-loaded and are not available on the Marketplace.", "Chat_transcript": "Chat transcript", @@ -6027,17 +6027,17 @@ "Send_transcript": "Send transcript", "Undo_request": "Undo request", "No_permission": "No permission", - "Community_cap_description": "Community workspaces have a cap of 200 concurrent connections, although you can have more connections active, once you hit that limit you won't be able to see users' status. This doesn't affect their ability to send & receive messages.", - "Enterprise_cap_description": "Enterprise workspaces have no cap on the presence service.", + "Community_cap_description": "Community workspaces have a limit of 200 concurrent connections. If this limit is exceeded it will no longer be possible for users to see each others status. This does not affect sending and receiving of messages.", + "Premium_cap_description": "Premium plans do not have a presence service limit.", "Service_status": "Service status", - "More_about_Enterprise_Edition": "More about Enterprise Edition", + "More_about_Premium_plans": "More about Premium plans", "Presence_service_cap": "Presence service cap", "User_Status": "User status", "User_status_menu": "User status menu", "Active_connections": "Active connections", "Presence_service": "Presence service", "Presence_broadcast_disabled": "Presence broadcast disabled internally", - "Presence_broadcast_disabled_Description": "This shows if the presence broadcast has been disabled automatically. This can happen if you don't have an Enterprise License and have more than 200 concurrent connections.", + "Presence_broadcast_disabled_Description": "This shows if the presence broadcast has been disabled automatically. This can happen if you don't have an Premium License and have more than 200 concurrent connections.", "New_custom_status": "New custom status", "Service_disabled": "The service is now disabled", "Service_disabled_description": "You can't reenable it again until there's less than 200 active connections at the same time", @@ -6096,10 +6096,9 @@ "RegisterWorkspace_Connection_Error": "An error occured connecting", "cloud.RegisterWorkspace_Token_Step_One": "1. Go to: <1>cloud.rocket.chat > Workspaces and click <3>'Register self-managed'.", "cloud.RegisterWorkspace_Setup_Terms_Privacy": "I agree with <1>Terms and Conditions and <3>Privacy Policy", - "Larger_amounts_of_active_connections": "For larger amounts of active connections you can consider our", - "multiple_instance_solutions": "multiple instance solutions", + "Larger_amounts_of_active_connections": "For larger amounts of active connections you can consider our <1>multiple instance solutions.", "Uninstall_grandfathered_app": "Uninstall {{appName}}?", - "App_will_lose_grandfathered_status": "**This {{context}} app will lose its grandfathered status.** \n \nWorkspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. Grandfathered apps count towards the limit but the limit is not applied to them.", + "App_will_lose_grandfathered_status": "**This {{context}} app will lose its grandfathered status.** \n \nWorkspaces on Community can have up to {{limit}} {{context}} apps enabled. Grandfathered apps count towards the limit but the limit is not applied to them.", "All_rooms": "All rooms", "All_visible": "All visible", "Filter_by_room": "Filter by room type",