diff --git a/src/components/NotificationTypeSelector/index.tsx b/src/components/NotificationTypeSelector/index.tsx index b6591edcd..c84631671 100644 --- a/src/components/NotificationTypeSelector/index.tsx +++ b/src/components/NotificationTypeSelector/index.tsx @@ -5,15 +5,17 @@ import NotificationType from './NotificationType'; const messages = defineMessages({ mediarequested: 'Media Requested', mediarequestedDescription: - 'Sends a notification when new media is requested. For certain agents, this will only send the notification to admins or users with the "Manage Requests" permission.', + 'Sends a notification when media is requested and requires approval.', mediaapproved: 'Media Approved', - mediaapprovedDescription: 'Sends a notification when media is approved.', + mediaapprovedDescription: + 'Sends a notification when media is approved.\ + By default, automatically approved requests will not trigger notifications.', mediaavailable: 'Media Available', mediaavailableDescription: 'Sends a notification when media becomes available.', mediafailed: 'Media Failed', mediafailedDescription: - 'Sends a notification when media fails to be added to services (Radarr/Sonarr). For certain agents, this will only send the notification to admins or users with the "Manage Requests" permission.', + 'Sends a notification when media fails to be added to Radarr or Sonarr.', mediadeclined: 'Media Declined', mediadeclinedDescription: 'Sends a notification when a request is declined.', }); diff --git a/src/components/PermissionEdit/index.tsx b/src/components/PermissionEdit/index.tsx index 86faa7e20..2f856e1a2 100644 --- a/src/components/PermissionEdit/index.tsx +++ b/src/components/PermissionEdit/index.tsx @@ -6,7 +6,7 @@ import { useIntl, defineMessages } from 'react-intl'; export const messages = defineMessages({ admin: 'Admin', adminDescription: - 'Full administrator access. Bypasses all permission checks.', + 'Full administrator access. Bypasses all other permission checks.', users: 'Manage Users', usersDescription: 'Grants permission to manage Overseerr users. Users with this permission cannot modify users with or grant the Admin privilege.', diff --git a/src/components/Settings/Notifications/NotificationsDiscord.tsx b/src/components/Settings/Notifications/NotificationsDiscord.tsx index 25f7d813b..fcd67943b 100644 --- a/src/components/Settings/Notifications/NotificationsDiscord.tsx +++ b/src/components/Settings/Notifications/NotificationsDiscord.tsx @@ -15,7 +15,7 @@ const messages = defineMessages({ agentenabled: 'Enable Agent', webhookUrl: 'Webhook URL', webhookUrlPlaceholder: 'Server Settings → Integrations → Webhooks', - discordsettingssaved: 'Discord notification settings saved!', + discordsettingssaved: 'Discord notification settings saved successfully!', discordsettingsfailed: 'Discord notification settings failed to save.', testsent: 'Test notification sent!', test: 'Test', diff --git a/src/components/Settings/Notifications/NotificationsEmail.tsx b/src/components/Settings/Notifications/NotificationsEmail.tsx index f7080afa8..ad9313f17 100644 --- a/src/components/Settings/Notifications/NotificationsEmail.tsx +++ b/src/components/Settings/Notifications/NotificationsEmail.tsx @@ -8,6 +8,7 @@ import axios from 'axios'; import * as Yup from 'yup'; import { useToasts } from 'react-toast-notifications'; import NotificationTypeSelector from '../../NotificationTypeSelector'; +import Alert from '../../Common/Alert'; const messages = defineMessages({ save: 'Save Changes', @@ -21,7 +22,7 @@ const messages = defineMessages({ enableSsl: 'Enable SSL', authUser: 'SMTP Username', authPass: 'SMTP Password', - emailsettingssaved: 'Email notification settings saved!', + emailsettingssaved: 'Email notification settings saved successfully!', emailsettingsfailed: 'Email notification settings failed to save.', test: 'Test', testsent: 'Test notification sent!', @@ -31,6 +32,10 @@ const messages = defineMessages({ senderName: 'Sender Name', notificationtypes: 'Notification Types', validationEmail: 'You must provide a valid email address', + emailNotificationTypesAlert: 'Notification Email Recipients', + emailNotificationTypesAlertDescription: + 'For the "Media Requested" and "Media Failed" notification types,\ + notifications will only be sent to users with the "Manage Requests" permission.', }); const NotificationsEmail: React.FC = () => { @@ -124,180 +129,193 @@ const NotificationsEmail: React.FC = () => { }; return ( -