diff --git a/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx b/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx index 9e3c9f33..37213016 100644 --- a/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx +++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx @@ -20,14 +20,12 @@ const messages = defineMessages({ 'The ID number for your Discord user account', validationDiscordId: 'You must provide a valid Discord user ID', telegramChatId: 'Telegram Chat ID', - telegramChatIdTip: - 'The Chat ID can be aquired by adding @get_id_bot to the chat.', + telegramChatIdTip: 'Add @get_id_bot to the chat', telegramChatIdTipLong: - 'Start a chat by clicking here.\ - Then get the group Chat ID by adding @get_id_bot to that chat and send /my_id to the chat', - sendSilently: 'Send Silently', - sendSilentlyDescription: 'Send telegram notifications silently', - validationTelegramChatId: 'You must provide a valid Telegram Chat ID', + 'Start a chat, add @get_id_bot, and issue the /my_id command', + sendSilently: 'Send Telegram Messages Silently', + sendSilentlyDescription: 'Send notifications with no sound', + validationTelegramChatId: 'You must provide a valid Telegram chat ID', save: 'Save Changes', saving: 'Saving…', plexuser: 'Plex User', @@ -47,10 +45,10 @@ const UserNotificationSettings: React.FC = () => { const UserNotificationSettingsSchema = Yup.object().shape({ discordId: Yup.string() - .optional() + .nullable() .matches(/^\d{17,18}$/, intl.formatMessage(messages.validationDiscordId)), telegramChatId: Yup.string() - .optional() + .nullable() .matches( /^[-]?\d+$/, intl.formatMessage(messages.validationTelegramChatId) @@ -184,6 +182,9 @@ const UserNotificationSettings: React.FC = () => { ); }, + code: function code(msg) { + return {msg}; + }, }) : intl.formatMessage(messages.telegramChatIdTip, { GetIdBotLink: function GetIdBotLink(msg) { diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json index 695fbbe8..c3821d33 100644 --- a/src/i18n/locale/en.json +++ b/src/i18n/locale/en.json @@ -719,15 +719,15 @@ "components.UserProfile.UserSettings.UserNotificationSettings.plexuser": "Plex User", "components.UserProfile.UserSettings.UserNotificationSettings.save": "Save Changes", "components.UserProfile.UserSettings.UserNotificationSettings.saving": "Saving…", - "components.UserProfile.UserSettings.UserNotificationSettings.sendSilently": "Send Silently", - "components.UserProfile.UserSettings.UserNotificationSettings.sendSilentlyDescription": "Send telegram notifications silently", + "components.UserProfile.UserSettings.UserNotificationSettings.sendSilently": "Send Telegram Messages Silently", + "components.UserProfile.UserSettings.UserNotificationSettings.sendSilentlyDescription": "Send notifications with no sound", "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatId": "Telegram Chat ID", - "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatIdTip": "The Chat ID can be aquired by adding @get_id_bot to the chat.", - "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatIdTipLong": "Start a chat by clicking here. Then get the group Chat ID by adding @get_id_bot to that chat and send /my_id to the chat", + "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatIdTip": "Add @get_id_bot to the chat", + "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatIdTipLong": "Start a chat, add @get_id_bot, and issue the /my_id command", "components.UserProfile.UserSettings.UserNotificationSettings.toastSettingsFailure": "Something went wrong while saving settings.", "components.UserProfile.UserSettings.UserNotificationSettings.toastSettingsSuccess": "Settings successfully saved!", "components.UserProfile.UserSettings.UserNotificationSettings.validationDiscordId": "You must provide a valid Discord user ID", - "components.UserProfile.UserSettings.UserNotificationSettings.validationTelegramChatId": "You must provide a valid Telegram Chat ID", + "components.UserProfile.UserSettings.UserNotificationSettings.validationTelegramChatId": "You must provide a valid Telegram chat ID", "components.UserProfile.UserSettings.UserPasswordChange.confirmpassword": "Confirm Password", "components.UserProfile.UserSettings.UserPasswordChange.currentpassword": "Current Password", "components.UserProfile.UserSettings.UserPasswordChange.newpassword": "New Password",