refactor(lang): use global strings where appropriate and remove unused strings (#1265)

2026-01-02 04:39:14 -05:00 · 2021-03-24 08:45:07 -04:00
parent 544c2d9442
commit e393b53b29
41 changed files with 348 additions and 466 deletions
--- a/src/components/Settings/Notifications/NotificationsDiscord.tsx
+++ b/src/components/Settings/Notifications/NotificationsDiscord.tsx
@@ -1,17 +1,16 @@
-import React from 'react';
-import { Field, Form, Formik } from 'formik';
-import useSWR from 'swr';
-import LoadingSpinner from '../../Common/LoadingSpinner';
-import Button from '../../Common/Button';
-import { defineMessages, useIntl } from 'react-intl';
 import axios from 'axios';
-import * as Yup from 'yup';
+import { Field, Form, Formik } from 'formik';
+import React from 'react';
+import { defineMessages, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
+import useSWR from 'swr';
+import * as Yup from 'yup';
+import globalMessages from '../../../i18n/globalMessages';
+import Button from '../../Common/Button';
+import LoadingSpinner from '../../Common/LoadingSpinner';
 import NotificationTypeSelector from '../../NotificationTypeSelector';

 const messages = defineMessages({
-  save: 'Save Changes',
-  saving: 'Saving…',
  agentenabled: 'Enable Agent',
  botUsername: 'Bot Username',
  botAvatarUrl: 'Bot Avatar URL',
@@ -20,7 +19,6 @@ const messages = defineMessages({
  discordsettingssaved: 'Discord notification settings saved successfully!',
  discordsettingsfailed: 'Discord notification settings failed to save.',
  testsent: 'Test notification sent!',
-  test: 'Test',
  notificationtypes: 'Notification Types',
  validationUrl: 'You must provide a valid URL',
 });
@@ -197,7 +195,7 @@ const NotificationsDiscord: React.FC = () => {
                      testSettings();
                    }}
                  >
-                    {intl.formatMessage(messages.test)}
+                    {intl.formatMessage(globalMessages.test)}
                  </Button>
                </span>
                <span className="inline-flex ml-3 rounded-md shadow-sm">
@@ -207,8 +205,8 @@ const NotificationsDiscord: React.FC = () => {
                    disabled={isSubmitting || !isValid}
                  >
                    {isSubmitting
-                      ? intl.formatMessage(messages.saving)
-                      : intl.formatMessage(messages.save)}
+                      ? intl.formatMessage(globalMessages.saving)
+                      : intl.formatMessage(globalMessages.save)}
                  </Button>
                </span>
              </div>
--- a/src/components/Settings/Notifications/NotificationsEmail.tsx
+++ b/src/components/Settings/Notifications/NotificationsEmail.tsx
@@ -13,8 +13,6 @@ import LoadingSpinner from '../../Common/LoadingSpinner';
 import NotificationTypeSelector from '../../NotificationTypeSelector';

 const messages = defineMessages({
-  save: 'Save Changes',
-  saving: 'Saving…',
  validationSmtpHostRequired: 'You must provide a hostname or IP address',
  validationSmtpPortRequired: 'You must provide a valid port number',
  agentenabled: 'Enable Agent',
@@ -26,7 +24,6 @@ const messages = defineMessages({
  authPass: 'SMTP Password',
  emailsettingssaved: 'Email notification settings saved successfully!',
  emailsettingsfailed: 'Email notification settings failed to save.',
-  test: 'Test',
  testsent: 'Test notification sent!',
  allowselfsigned: 'Allow Self-Signed Certificates',
  ssldisabletip:
@@ -407,7 +404,7 @@ const NotificationsEmail: React.FC = () => {
                        testSettings();
                      }}
                    >
-                      {intl.formatMessage(messages.test)}
+                      {intl.formatMessage(globalMessages.test)}
                    </Button>
                  </span>
                  <span className="inline-flex ml-3 rounded-md shadow-sm">
@@ -417,8 +414,8 @@ const NotificationsEmail: React.FC = () => {
                      disabled={isSubmitting || !isValid}
                    >
                      {isSubmitting
-                        ? intl.formatMessage(messages.saving)
-                        : intl.formatMessage(messages.save)}
+                        ? intl.formatMessage(globalMessages.saving)
+                        : intl.formatMessage(globalMessages.save)}
                    </Button>
                  </span>
                </div>
--- a/src/components/Settings/Notifications/NotificationsPushbullet/index.tsx
+++ b/src/components/Settings/Notifications/NotificationsPushbullet/index.tsx
@@ -1,18 +1,17 @@
-import React from 'react';
-import { Field, Form, Formik } from 'formik';
-import useSWR from 'swr';
-import LoadingSpinner from '../../../Common/LoadingSpinner';
-import Button from '../../../Common/Button';
-import { defineMessages, useIntl } from 'react-intl';
 import axios from 'axios';
-import * as Yup from 'yup';
+import { Field, Form, Formik } from 'formik';
+import React from 'react';
+import { defineMessages, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
+import useSWR from 'swr';
+import * as Yup from 'yup';
+import globalMessages from '../../../../i18n/globalMessages';
 import Alert from '../../../Common/Alert';
+import Button from '../../../Common/Button';
+import LoadingSpinner from '../../../Common/LoadingSpinner';
 import NotificationTypeSelector from '../../../NotificationTypeSelector';

 const messages = defineMessages({
-  save: 'Save Changes',
-  saving: 'Saving…',
  agentEnabled: 'Enable Agent',
  accessToken: 'Access Token',
  validationAccessTokenRequired: 'You must provide an access token',
@@ -20,7 +19,6 @@ const messages = defineMessages({
    'Pushbullet notification settings saved successfully!',
  pushbulletSettingsFailed: 'Pushbullet notification settings failed to save.',
  testSent: 'Test notification sent!',
-  test: 'Test',
  settingUpPushbullet: 'Setting Up Pushbullet Notifications',
  settingUpPushbulletDescription:
    'To configure Pushbullet notifications, you will need to <CreateAccessTokenLink>create an access token</CreateAccessTokenLink> and enter it below.',
@@ -174,7 +172,7 @@ const NotificationsPushbullet: React.FC = () => {
                        testSettings();
                      }}
                    >
-                      {intl.formatMessage(messages.test)}
+                      {intl.formatMessage(globalMessages.test)}
                    </Button>
                  </span>
                  <span className="inline-flex ml-3 rounded-md shadow-sm">
@@ -184,8 +182,8 @@ const NotificationsPushbullet: React.FC = () => {
                      disabled={isSubmitting || !isValid}
                    >
                      {isSubmitting
-                        ? intl.formatMessage(messages.saving)
-                        : intl.formatMessage(messages.save)}
+                        ? intl.formatMessage(globalMessages.saving)
+                        : intl.formatMessage(globalMessages.save)}
                    </Button>
                  </span>
                </div>
--- a/src/components/Settings/Notifications/NotificationsPushover/index.tsx
+++ b/src/components/Settings/Notifications/NotificationsPushover/index.tsx
@@ -5,14 +5,13 @@ import { defineMessages, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 import * as Yup from 'yup';
+import globalMessages from '../../../../i18n/globalMessages';
 import Alert from '../../../Common/Alert';
 import Button from '../../../Common/Button';
 import LoadingSpinner from '../../../Common/LoadingSpinner';
 import NotificationTypeSelector from '../../../NotificationTypeSelector';

 const messages = defineMessages({
-  save: 'Save Changes',
-  saving: 'Saving…',
  agentenabled: 'Enable Agent',
  accessToken: 'Application/API Token',
  userToken: 'User Key',
@@ -21,7 +20,6 @@ const messages = defineMessages({
  pushoversettingssaved: 'Pushover notification settings saved successfully!',
  pushoversettingsfailed: 'Pushover notification settings failed to save.',
  testsent: 'Test notification sent!',
-  test: 'Test',
  settinguppushover: 'Setting Up Pushover Notifications',
  settinguppushoverDescription:
    'To configure Pushover notifications, you will need to <RegisterApplicationLink>register an application</RegisterApplicationLink> and enter the API token below. (You can use one of our <IconLink>official icons on GitHub</IconLink>.) You will also need your user key.',
@@ -218,7 +216,7 @@ const NotificationsPushover: React.FC = () => {
                        testSettings();
                      }}
                    >
-                      {intl.formatMessage(messages.test)}
+                      {intl.formatMessage(globalMessages.test)}
                    </Button>
                  </span>
                  <span className="inline-flex ml-3 rounded-md shadow-sm">
@@ -228,8 +226,8 @@ const NotificationsPushover: React.FC = () => {
                      disabled={isSubmitting || !isValid}
                    >
                      {isSubmitting
-                        ? intl.formatMessage(messages.saving)
-                        : intl.formatMessage(messages.save)}
+                        ? intl.formatMessage(globalMessages.saving)
+                        : intl.formatMessage(globalMessages.save)}
                    </Button>
                  </span>
                </div>
--- a/src/components/Settings/Notifications/NotificationsSlack/index.tsx
+++ b/src/components/Settings/Notifications/NotificationsSlack/index.tsx
@@ -1,24 +1,22 @@
-import React from 'react';
-import { Field, Form, Formik } from 'formik';
-import useSWR from 'swr';
-import LoadingSpinner from '../../../Common/LoadingSpinner';
-import Button from '../../../Common/Button';
-import { defineMessages, useIntl } from 'react-intl';
 import axios from 'axios';
-import * as Yup from 'yup';
+import { Field, Form, Formik } from 'formik';
+import React from 'react';
+import { defineMessages, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
+import useSWR from 'swr';
+import * as Yup from 'yup';
+import globalMessages from '../../../../i18n/globalMessages';
 import Alert from '../../../Common/Alert';
+import Button from '../../../Common/Button';
+import LoadingSpinner from '../../../Common/LoadingSpinner';
 import NotificationTypeSelector from '../../../NotificationTypeSelector';

 const messages = defineMessages({
-  save: 'Save Changes',
-  saving: 'Saving…',
  agentenabled: 'Enable Agent',
  webhookUrl: 'Webhook URL',
  slacksettingssaved: 'Slack notification settings saved successfully!',
  slacksettingsfailed: 'Slack notification settings failed to save.',
  testsent: 'Test notification sent!',
-  test: 'Test',
  settingupslack: 'Setting Up Slack Notifications',
  settingupslackDescription:
    'To configure Slack notifications, you will need to create an <WebhookLink>Incoming Webhook</WebhookLink> integration and enter the webhook URL below.',
@@ -172,7 +170,7 @@ const NotificationsSlack: React.FC = () => {
                        testSettings();
                      }}
                    >
-                      {intl.formatMessage(messages.test)}
+                      {intl.formatMessage(globalMessages.test)}
                    </Button>
                  </span>
                  <span className="inline-flex ml-3 rounded-md shadow-sm">
@@ -182,8 +180,8 @@ const NotificationsSlack: React.FC = () => {
                      disabled={isSubmitting || !isValid}
                    >
                      {isSubmitting
-                        ? intl.formatMessage(messages.saving)
-                        : intl.formatMessage(messages.save)}
+                        ? intl.formatMessage(globalMessages.saving)
+                        : intl.formatMessage(globalMessages.save)}
                    </Button>
                  </span>
                </div>
--- a/src/components/Settings/Notifications/NotificationsTelegram.tsx
+++ b/src/components/Settings/Notifications/NotificationsTelegram.tsx
@@ -5,14 +5,13 @@ import { defineMessages, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 import * as Yup from 'yup';
+import globalMessages from '../../../i18n/globalMessages';
 import Alert from '../../Common/Alert';
 import Button from '../../Common/Button';
 import LoadingSpinner from '../../Common/LoadingSpinner';
 import NotificationTypeSelector from '../../NotificationTypeSelector';

 const messages = defineMessages({
-  save: 'Save Changes',
-  saving: 'Saving…',
  agentenabled: 'Enable Agent',
  botUsername: 'Bot Username',
  botAPI: 'Bot Authentication Token',
@@ -22,7 +21,6 @@ const messages = defineMessages({
  telegramsettingssaved: 'Telegram notification settings saved successfully!',
  telegramsettingsfailed: 'Telegram notification settings failed to save.',
  testsent: 'Test notification sent!',
-  test: 'Test',
  settinguptelegram: 'Setting Up Telegram Notifications',
  settinguptelegramDescription:
    'To configure Telegram notifications, you will need to <CreateBotLink>create a bot</CreateBotLink> and get the bot API key. Additionally, you will need the chat ID for the chat to which you would like to send notifications. You can find this by adding <GetIdBotLink>@get_id_bot</GetIdBotLink> to the chat and issuing the <code>/my_id</code> command.',
@@ -260,7 +258,7 @@ const NotificationsTelegram: React.FC = () => {
                        testSettings();
                      }}
                    >
-                      {intl.formatMessage(messages.test)}
+                      {intl.formatMessage(globalMessages.test)}
                    </Button>
                  </span>
                  <span className="inline-flex ml-3 rounded-md shadow-sm">
@@ -270,8 +268,8 @@ const NotificationsTelegram: React.FC = () => {
                      disabled={isSubmitting || !isValid}
                    >
                      {isSubmitting
-                        ? intl.formatMessage(messages.saving)
-                        : intl.formatMessage(messages.save)}
+                        ? intl.formatMessage(globalMessages.saving)
+                        : intl.formatMessage(globalMessages.save)}
                    </Button>
                  </span>
                </div>
--- a/src/components/Settings/Notifications/NotificationsWebhook/index.tsx
+++ b/src/components/Settings/Notifications/NotificationsWebhook/index.tsx
@@ -1,13 +1,14 @@
-import React from 'react';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import dynamic from 'next/dynamic';
-import useSWR from 'swr';
-import LoadingSpinner from '../../../Common/LoadingSpinner';
-import Button from '../../../Common/Button';
+import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
-import axios from 'axios';
-import * as Yup from 'yup';
 import { useToasts } from 'react-toast-notifications';
+import useSWR from 'swr';
+import * as Yup from 'yup';
+import globalMessages from '../../../../i18n/globalMessages';
+import Button from '../../../Common/Button';
+import LoadingSpinner from '../../../Common/LoadingSpinner';
 import NotificationTypeSelector from '../../../NotificationTypeSelector';

 const JSONEditor = dynamic(() => import('../../../JSONEditor'), { ssr: false });
@@ -35,8 +36,6 @@ const defaultPayload = {
 };

 const messages = defineMessages({
-  save: 'Save Changes',
-  saving: 'Saving…',
  agentenabled: 'Enable Agent',
  webhookUrl: 'Webhook URL',
  authheader: 'Authorization Header',
@@ -44,7 +43,6 @@ const messages = defineMessages({
  webhooksettingssaved: 'Webhook notification settings saved successfully!',
  webhooksettingsfailed: 'Webhook notification settings failed to save.',
  testsent: 'Test notification sent!',
-  test: 'Test',
  notificationtypes: 'Notification Types',
  resetPayload: 'Reset to Default',
  resetPayloadSuccess: 'JSON payload reset successfully!',
@@ -295,7 +293,7 @@ const NotificationsWebhook: React.FC = () => {
                      testSettings();
                    }}
                  >
-                    {intl.formatMessage(messages.test)}
+                    {intl.formatMessage(globalMessages.test)}
                  </Button>
                </span>
                <span className="inline-flex ml-3 rounded-md shadow-sm">
@@ -305,8 +303,8 @@ const NotificationsWebhook: React.FC = () => {
                    disabled={isSubmitting || !isValid}
                  >
                    {isSubmitting
-                      ? intl.formatMessage(messages.saving)
-                      : intl.formatMessage(messages.save)}
+                      ? intl.formatMessage(globalMessages.saving)
+                      : intl.formatMessage(globalMessages.save)}
                  </Button>
                </span>
              </div>
--- a/src/components/Settings/RadarrModal/index.tsx
+++ b/src/components/Settings/RadarrModal/index.tsx
@@ -5,6 +5,7 @@ import { defineMessages, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import * as Yup from 'yup';
 import type { RadarrSettings } from '../../../../server/lib/settings';
+import globalMessages from '../../../i18n/globalMessages';
 import Modal from '../../Common/Modal';
 import Transition from '../../Transition';

@@ -21,11 +22,7 @@ const messages = defineMessages({
    'You must select a minimum availability',
  toastRadarrTestSuccess: 'Radarr connection established successfully!',
  toastRadarrTestFailure: 'Failed to connect to Radarr.',
-  saving: 'Saving…',
-  save: 'Save Changes',
  add: 'Add Server',
-  test: 'Test',
-  testing: 'Testing…',
  defaultserver: 'Default Server',
  servername: 'Server Name',
  servernamePlaceholder: 'A Radarr Server',
@@ -294,16 +291,16 @@ const RadarrModal: React.FC<RadarrModalProps> = ({
              okButtonType="primary"
              okText={
                isSubmitting
-                  ? intl.formatMessage(messages.saving)
+                  ? intl.formatMessage(globalMessages.saving)
                  : radarr
-                  ? intl.formatMessage(messages.save)
+                  ? intl.formatMessage(globalMessages.save)
                  : intl.formatMessage(messages.add)
              }
              secondaryButtonType="warning"
              secondaryText={
                isTesting
-                  ? intl.formatMessage(messages.testing)
-                  : intl.formatMessage(messages.test)
+                  ? intl.formatMessage(globalMessages.testing)
+                  : intl.formatMessage(globalMessages.test)
              }
              onSecondary={() => {
                if (values.apiKey && values.hostname && values.port) {
--- a/src/components/Settings/SettingsLogs/index.tsx
+++ b/src/components/Settings/SettingsLogs/index.tsx
@@ -30,13 +30,7 @@ const messages = defineMessages({
  filterInfo: 'Info',
  filterWarn: 'Warning',
  filterError: 'Error',
-  noresults: 'No results.',
  showall: 'Show All Logs',
-  showingresults:
-    'Showing <strong>{from}</strong> to <strong>{to}</strong> of <strong>{total}</strong> results',
-  resultsperpage: 'Display {pageSize} results per page',
-  next: 'Next',
-  previous: 'Previous',
  pauseLogs: 'Pause',
  resumeLogs: 'Resume',
  viewDetails: 'View Details',
@@ -393,7 +387,7 @@ const SettingsLogs: React.FC = () => {
                <Table.TD colSpan={4} noPadding>
                  <div className="flex flex-col items-center justify-center w-screen p-6 lg:w-full">
                    <span className="text-base">
-                      {intl.formatMessage(messages.noresults)}
+                      {intl.formatMessage(globalMessages.noresults)}
                    </span>
                    {currentFilter !== 'debug' && (
                      <div className="mt-4">
@@ -419,7 +413,7 @@ const SettingsLogs: React.FC = () => {
                  <div className="hidden lg:flex lg:flex-1">
                    <p className="text-sm">
                      {data.results.length > 0 &&
-                        intl.formatMessage(messages.showingresults, {
+                        intl.formatMessage(globalMessages.showingresults, {
                          from: pageIndex * currentPageSize + 1,
                          to:
                            data.results.length < currentPageSize
@@ -435,7 +429,7 @@ const SettingsLogs: React.FC = () => {
                  </div>
                  <div className="flex justify-center sm:flex-1 sm:justify-start lg:justify-center">
                    <span className="items-center -mt-3 text-sm sm:-ml-4 lg:ml-0 sm:mt-0">
-                      {intl.formatMessage(messages.resultsperpage, {
+                      {intl.formatMessage(globalMessages.resultsperpage, {
                        pageSize: (
                          <select
                            id="pageSize"
@@ -473,7 +467,7 @@ const SettingsLogs: React.FC = () => {
                          .then(() => window.scrollTo(0, 0))
                      }
                    >
-                      {intl.formatMessage(messages.previous)}
+                      {intl.formatMessage(globalMessages.previous)}
                    </Button>
                    <Button
                      disabled={!hasNextPage}
@@ -489,7 +483,7 @@ const SettingsLogs: React.FC = () => {
                          .then(() => window.scrollTo(0, 0))
                      }
                    >
-                      {intl.formatMessage(messages.next)}
+                      {intl.formatMessage(globalMessages.next)}
                    </Button>
                  </div>
                </nav>
--- a/src/components/Settings/SettingsMain.tsx
+++ b/src/components/Settings/SettingsMain.tsx
@@ -20,8 +20,6 @@ const messages = defineMessages({
  generalsettings: 'General Settings',
  generalsettingsDescription:
    'Configure global and default settings for Overseerr.',
-  save: 'Save Changes',
-  saving: 'Saving…',
  apikey: 'API Key',
  applicationTitle: 'Application Title',
  applicationurl: 'Application URL',
@@ -423,8 +421,8 @@ const SettingsMain: React.FC = () => {
                        disabled={isSubmitting}
                      >
                        {isSubmitting
-                          ? intl.formatMessage(messages.saving)
-                          : intl.formatMessage(messages.save)}
+                          ? intl.formatMessage(globalMessages.saving)
+                          : intl.formatMessage(globalMessages.save)}
                      </Button>
                    </span>
                  </div>
--- a/src/components/Settings/SettingsNotifications.tsx
+++ b/src/components/Settings/SettingsNotifications.tsx
@@ -1,27 +1,25 @@
+import axios from 'axios';
+import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
+import { useToasts } from 'react-toast-notifications';
+import useSWR from 'swr';
+import Bolt from '../../assets/bolt.svg';
 import DiscordLogo from '../../assets/extlogos/discord.svg';
-import SlackLogo from '../../assets/extlogos/slack.svg';
-import TelegramLogo from '../../assets/extlogos/telegram.svg';
 import PushbulletLogo from '../../assets/extlogos/pushbullet.svg';
 import PushoverLogo from '../../assets/extlogos/pushover.svg';
-import Bolt from '../../assets/bolt.svg';
-import { Field, Form, Formik } from 'formik';
-import useSWR from 'swr';
-import Error from '../../pages/_error';
-import LoadingSpinner from '../Common/LoadingSpinner';
-import axios from 'axios';
-import { useToasts } from 'react-toast-notifications';
-import Button from '../Common/Button';
-import PageTitle from '../Common/PageTitle';
+import SlackLogo from '../../assets/extlogos/slack.svg';
+import TelegramLogo from '../../assets/extlogos/telegram.svg';
 import globalMessages from '../../i18n/globalMessages';
+import Error from '../../pages/_error';
+import Button from '../Common/Button';
+import LoadingSpinner from '../Common/LoadingSpinner';
+import PageTitle from '../Common/PageTitle';

 const messages = defineMessages({
  notifications: 'Notifications',
-  save: 'Save Changes',
-  saving: 'Saving…',
  notificationsettings: 'Notification Settings',
  notificationsettingsDescription:
    'Configure global notification settings. The options below will apply to all notification agents.',
@@ -248,8 +246,8 @@ const SettingsNotifications: React.FC = ({ children }) => {
                        disabled={isSubmitting}
                      >
                        {isSubmitting
-                          ? intl.formatMessage(messages.saving)
-                          : intl.formatMessage(messages.save)}
+                          ? intl.formatMessage(globalMessages.saving)
+                          : intl.formatMessage(globalMessages.save)}
                      </Button>
                    </span>
                  </div>
--- a/src/components/Settings/SettingsPlex.tsx
+++ b/src/components/Settings/SettingsPlex.tsx
@@ -45,8 +45,6 @@ const messages = defineMessages({
  port: 'Port',
  enablessl: 'Enable SSL',
  timeout: 'Timeout',
-  save: 'Save Changes',
-  saving: 'Saving…',
  plexlibraries: 'Plex Libraries',
  plexlibrariesDescription:
    'The libraries Overseerr scans for titles. Set up and save your Plex connection settings, then click the button below if no libraries are listed.',
@@ -538,8 +536,8 @@ const SettingsPlex: React.FC<SettingsPlexProps> = ({ onComplete }) => {
                      disabled={isSubmitting}
                    >
                      {isSubmitting
-                        ? intl.formatMessage(messages.saving)
-                        : intl.formatMessage(messages.save)}
+                        ? intl.formatMessage(globalMessages.saving)
+                        : intl.formatMessage(globalMessages.save)}
                    </Button>
                  </span>
                </div>
--- a/src/components/Settings/SettingsServices.tsx
+++ b/src/components/Settings/SettingsServices.tsx
@@ -1,21 +1,21 @@
+import axios from 'axios';
 import React, { useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
-import Badge from '../Common/Badge';
-import Button from '../Common/Button';
 import useSWR from 'swr';
 import type {
  RadarrSettings,
  SonarrSettings,
 } from '../../../server/lib/settings';
-import LoadingSpinner from '../Common/LoadingSpinner';
-import RadarrModal from './RadarrModal';
-import Modal from '../Common/Modal';
-import Transition from '../Transition';
-import axios from 'axios';
-import SonarrModal from './SonarrModal';
-import Alert from '../Common/Alert';
-import PageTitle from '../Common/PageTitle';
 import globalMessages from '../../i18n/globalMessages';
+import Alert from '../Common/Alert';
+import Badge from '../Common/Badge';
+import Button from '../Common/Button';
+import LoadingSpinner from '../Common/LoadingSpinner';
+import Modal from '../Common/Modal';
+import PageTitle from '../Common/PageTitle';
+import Transition from '../Transition';
+import RadarrModal from './RadarrModal';
+import SonarrModal from './SonarrModal';

 const messages = defineMessages({
  services: 'Services',
@@ -26,8 +26,6 @@ const messages = defineMessages({
  sonarrSettingsDescription:
    'Configure your Sonarr connection below. You can have multiple Sonarr configurations, but only two can be active as defaults at any time (one for standard HD and one for 4K). Administrators can override the server which is used for new requests.',
  deleteserverconfirm: 'Are you sure you want to delete this server?',
-  edit: 'Edit',
-  delete: 'Delete',
  ssl: 'SSL',
  default: 'Default',
  default4k: 'Default 4K',
@@ -139,7 +137,9 @@ const ServerInstance: React.FC<ServerInstanceProps> = ({
              >
                <path d="M13.586 3.586a2 2 0 112.828 2.828l-.793.793-2.828-2.828.793-.793zM11.379 5.793L3 14.172V17h2.828l8.38-8.379-2.83-2.828z" />
              </svg>
-              <span className="ml-3">{intl.formatMessage(messages.edit)}</span>
+              <span className="ml-3">
+                {intl.formatMessage(globalMessages.edit)}
+              </span>
            </button>
          </div>
          <div className="flex flex-1 w-0 -ml-px">
@@ -160,7 +160,7 @@ const ServerInstance: React.FC<ServerInstanceProps> = ({
                />
              </svg>
              <span className="ml-3">
-                {intl.formatMessage(messages.delete)}
+                {intl.formatMessage(globalMessages.delete)}
              </span>
            </button>
          </div>
--- a/src/components/Settings/SettingsUsers/index.tsx
+++ b/src/components/Settings/SettingsUsers/index.tsx
@@ -16,15 +16,11 @@ const messages = defineMessages({
  users: 'Users',
  userSettings: 'User Settings',
  userSettingsDescription: 'Configure global and default user settings.',
-  save: 'Save Changes',
-  saving: 'Saving…',
  toastSettingsSuccess: 'User settings saved successfully!',
  toastSettingsFailure: 'Something went wrong while saving settings.',
  localLogin: 'Enable Local Sign-In',
  movieRequestLimitLabel: 'Global Movie Request Limit',
-  movieRequestLimit: '{quotaLimit} movies per {quotaDays} days',
  tvRequestLimitLabel: 'Global Series Request Limit',
-  tvRequestLimit: '{quotaLimit} seasons per {quotaDays} days',
  defaultPermissions: 'Default Permissions',
 });

@@ -173,8 +169,8 @@ const SettingsUsers: React.FC = () => {
                        disabled={isSubmitting}
                      >
                        {isSubmitting
-                          ? intl.formatMessage(messages.saving)
-                          : intl.formatMessage(messages.save)}
+                          ? intl.formatMessage(globalMessages.saving)
+                          : intl.formatMessage(globalMessages.save)}
                      </Button>
                    </span>
                  </div>
--- a/src/components/Settings/SonarrModal/index.tsx
+++ b/src/components/Settings/SonarrModal/index.tsx
@@ -1,12 +1,13 @@
-import React, { useState, useEffect, useCallback, useRef } from 'react';
-import Transition from '../../Transition';
-import Modal from '../../Common/Modal';
-import { Formik, Field } from 'formik';
-import type { SonarrSettings } from '../../../../server/lib/settings';
-import * as Yup from 'yup';
 import axios from 'axios';
+import { Field, Formik } from 'formik';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { defineMessages, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
-import { useIntl, defineMessages } from 'react-intl';
+import * as Yup from 'yup';
+import type { SonarrSettings } from '../../../../server/lib/settings';
+import globalMessages from '../../../i18n/globalMessages';
+import Modal from '../../Common/Modal';
+import Transition from '../../Transition';

 const messages = defineMessages({
  createsonarr: 'Add New Sonarr Server',
@@ -20,11 +21,7 @@ const messages = defineMessages({
  validationLanguageProfileRequired: 'You must select a language profile',
  toastSonarrTestSuccess: 'Sonarr connection established successfully!',
  toastSonarrTestFailure: 'Failed to connect to Sonarr.',
-  saving: 'Saving…',
-  save: 'Save Changes',
  add: 'Add Server',
-  test: 'Test',
-  testing: 'Testing…',
  defaultserver: 'Default Server',
  servername: 'Server Name',
  servernamePlaceholder: 'A Sonarr Server',
@@ -322,16 +319,16 @@ const SonarrModal: React.FC<SonarrModalProps> = ({
              okButtonType="primary"
              okText={
                isSubmitting
-                  ? intl.formatMessage(messages.saving)
+                  ? intl.formatMessage(globalMessages.saving)
                  : sonarr
-                  ? intl.formatMessage(messages.save)
+                  ? intl.formatMessage(globalMessages.save)
                  : intl.formatMessage(messages.add)
              }
              secondaryButtonType="warning"
              secondaryText={
                isTesting
-                  ? intl.formatMessage(messages.testing)
-                  : intl.formatMessage(messages.test)
+                  ? intl.formatMessage(globalMessages.testing)
+                  : intl.formatMessage(globalMessages.test)
              }
              onSecondary={() => {
                if (values.apiKey && values.hostname && values.port) {