From 8d17777573bf8bb8182beaa1a6e42c4ffc891bf9 Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Fri, 23 Sep 2022 02:15:24 +0530 Subject: [PATCH 1/2] add missing setting translation --- apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index ac81f641efab..3b3c1904f8d4 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -76,7 +76,8 @@ "Accounts_CustomFieldsToShowInUserInfo": "Custom Fields to Show in User Info", "Accounts_Default_User_Preferences": "Default User Preferences", "Accounts_Default_User_Preferences_audioNotifications": "Audio Notifications Default Alert", - "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Allow users to select the Also send to channel behavior", + "Accounts_Default_User_Preferences_alsoSendThreadToChannel": "Default also send to channel selection", + "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Sets default option for thread replies.", "Accounts_Default_User_Preferences_desktopNotifications": "Desktop Notifications Default Alert", "Accounts_Default_User_Preferences_pushNotifications": "Push Notifications Default Alert", "Accounts_Default_User_Preferences_not_available": "Failed to retrieve User Preferences because they haven't been set up by the user yet", From 26b0e445aae644eb37cd52bbbd31e034c6e04853 Mon Sep 17 00:00:00 2001 From: dougfabris Date: Mon, 26 Sep 2022 13:54:38 -0300 Subject: [PATCH 2/2] chore: review --- apps/meteor/app/lib/server/startup/settings.ts | 1 + apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/meteor/app/lib/server/startup/settings.ts b/apps/meteor/app/lib/server/startup/settings.ts index 7c60d8c9c02f..45051f6ec697 100644 --- a/apps/meteor/app/lib/server/startup/settings.ts +++ b/apps/meteor/app/lib/server/startup/settings.ts @@ -443,6 +443,7 @@ settingsRegistry.addGroup('Accounts', function () { }, ], public: true, + i18nLabel: 'Also_send_thread_message_to_channel_behavior', }); this.add('Accounts_Default_User_Preferences_sidebarShowFavorites', true, { diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 3b3c1904f8d4..ac81f641efab 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -76,8 +76,7 @@ "Accounts_CustomFieldsToShowInUserInfo": "Custom Fields to Show in User Info", "Accounts_Default_User_Preferences": "Default User Preferences", "Accounts_Default_User_Preferences_audioNotifications": "Audio Notifications Default Alert", - "Accounts_Default_User_Preferences_alsoSendThreadToChannel": "Default also send to channel selection", - "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Sets default option for thread replies.", + "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Allow users to select the Also send to channel behavior", "Accounts_Default_User_Preferences_desktopNotifications": "Desktop Notifications Default Alert", "Accounts_Default_User_Preferences_pushNotifications": "Push Notifications Default Alert", "Accounts_Default_User_Preferences_not_available": "Failed to retrieve User Preferences because they haven't been set up by the user yet",