fix(lang): correct mismatched language strings (#1246)

package.json

@@ -9,7 +9,7 @@
     "build": "yarn build:next && yarn build:server",
     "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\"",
     "start": "NODE_ENV=production node dist/index.js",
-    "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault false \"./src/**/!(*.test).{ts,tsx}\"",
+    "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"",
     "migration:generate": "ts-node --project server/tsconfig.json ./node_modules/.bin/typeorm migration:generate",
     "migration:create": "ts-node --project server/tsconfig.json ./node_modules/.bin/typeorm migration:create",
     "migration:run": "ts-node --project server/tsconfig.json ./node_modules/.bin/typeorm migration:run",

src/components/Login/LocalLogin.tsx

@@ -1,16 +1,16 @@
+import axios from 'axios';
+import { Field, Form, Formik } from 'formik';
+import Link from 'next/link';
 import React, { useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
-import Button from '../Common/Button';
-import { Field, Form, Formik } from 'formik';
 import * as Yup from 'yup';
-import axios from 'axios';
-import Link from 'next/link';
+import Button from '../Common/Button';
 
 const messages = defineMessages({
   email: 'Email Address',
   password: 'Password',
-  validationemailrequired: 'Not a valid email address',
-  validationpasswordrequired: 'Password required',
+  validationemailrequired: 'You must provide a valid email address',
+  validationpasswordrequired: 'You must provide a password',
   loginerror: 'Something went wrong while trying to sign in.',
   signingin: 'Signing in…',
   signin: 'Sign In',

src/components/MovieDetails/index.tsx

@@ -1,37 +1,37 @@
-import React, { useState, useContext, useMemo } from 'react';
+import axios from 'axios';
+import Link from 'next/link';
+import { useRouter } from 'next/router';
+import React, { useContext, useMemo, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
-import type { MovieDetails as MovieDetailsType } from '../../../server/models/Movie';
 import useSWR from 'swr';
-import { useRouter } from 'next/router';
-import Button from '../Common/Button';
-import Link from 'next/link';
-import Slider from '../Slider';
-import PersonCard from '../PersonCard';
-import { LanguageContext } from '../../context/LanguageContext';
-import LoadingSpinner from '../Common/LoadingSpinner';
-import { useUser, Permission } from '../../hooks/useUser';
+import type { RTRating } from '../../../server/api/rottentomatoes';
 import { MediaStatus } from '../../../server/constants/media';
-import axios from 'axios';
-import SlideOver from '../Common/SlideOver';
-import RequestBlock from '../RequestBlock';
-import TmdbLogo from '../../assets/tmdb_logo.svg';
-import RTFresh from '../../assets/rt_fresh.svg';
-import RTRotten from '../../assets/rt_rotten.svg';
+import type { MovieDetails as MovieDetailsType } from '../../../server/models/Movie';
 import RTAudFresh from '../../assets/rt_aud_fresh.svg';
 import RTAudRotten from '../../assets/rt_aud_rotten.svg';
-import type { RTRating } from '../../../server/api/rottentomatoes';
+import RTFresh from '../../assets/rt_fresh.svg';
+import RTRotten from '../../assets/rt_rotten.svg';
+import TmdbLogo from '../../assets/tmdb_logo.svg';
+import { LanguageContext } from '../../context/LanguageContext';
+import useSettings from '../../hooks/useSettings';
+import { Permission, useUser } from '../../hooks/useUser';
 import Error from '../../pages/_error';
-import ExternalLinkBlock from '../ExternalLinkBlock';
 import { sortCrewPriority } from '../../utils/creditHelpers';
-import StatusBadge from '../StatusBadge';
-import RequestButton from '../RequestButton';
-import MediaSlider from '../MediaSlider';
+import Button from '../Common/Button';
+import CachedImage from '../Common/CachedImage';
 import ConfirmButton from '../Common/ConfirmButton';
-import DownloadBlock from '../DownloadBlock';
+import LoadingSpinner from '../Common/LoadingSpinner';
 import PageTitle from '../Common/PageTitle';
-import useSettings from '../../hooks/useSettings';
 import PlayButton, { PlayButtonLink } from '../Common/PlayButton';
-import CachedImage from '../Common/CachedImage';
+import SlideOver from '../Common/SlideOver';
+import DownloadBlock from '../DownloadBlock';
+import ExternalLinkBlock from '../ExternalLinkBlock';
+import MediaSlider from '../MediaSlider';
+import PersonCard from '../PersonCard';
+import RequestBlock from '../RequestBlock';
+import RequestButton from '../RequestButton';
+import Slider from '../Slider';
+import StatusBadge from '../StatusBadge';
 
 const messages = defineMessages({
   releasedate: 'Release Date',
@@ -56,8 +56,7 @@ const messages = defineMessages({
   manageModalNoRequests: 'No Requests',
   manageModalClearMedia: 'Clear All Media Data',
   manageModalClearMediaWarning:
-    'This will irreversibly remove all data for this movie, including any requests.\
-    If this item exists in your Plex library, the media information will be recreated during the next scan.',
+    '* This will irreversibly remove all data for this movie, including any requests. If this item exists in your Plex library, the media information will be recreated during the next scan.',
   approve: 'Approve',
   decline: 'Decline',
   studio: '{studioCount, plural, one {Studio} other {Studios}}',

src/components/PermissionEdit/index.tsx

@@ -1,26 +1,23 @@
 import React from 'react';
-import PermissionOption, { PermissionItem } from '../PermissionOption';
+import { defineMessages, useIntl } from 'react-intl';
 import { Permission, User } from '../../hooks/useUser';
-import { useIntl, defineMessages } from 'react-intl';
+import PermissionOption, { PermissionItem } from '../PermissionOption';
 
 export const messages = defineMessages({
   admin: 'Admin',
   adminDescription:
     'Full administrator access. Bypasses all other permission checks.',
   users: 'Manage Users',
   usersDescription:
-    'Grant permission to manage Overseerr users.\
-    Users with this permission cannot modify users with or grant the Admin privilege.',
+    'Grant permission to manage Overseerr users. Users with this permission cannot modify users with or grant the Admin privilege.',
   settings: 'Manage Settings',
   settingsDescription:
-    'Grant permission to modify all Overseerr settings.\
-    A user must have this permission to grant it to others.',
+    'Grant permission to modify all Overseerr settings. A user must have this permission to grant it to others.',
   managerequests: 'Manage Requests',
   managerequestsDescription:
-    'Grant permission to manage Overseerr requests (includes approving and denying requests).\
-    All requests made by a user with this permission will be automatically approved.',
+    'Grant permission to manage Overseerr requests (includes approving and denying requests). All requests made by a user with this permission will be automatically approved.',
   request: 'Request',
-  requestDescription: 'Grants permission to request movies and series.',
+  requestDescription: 'Grant permission to request movies and series.',
   vote: 'Vote',
   voteDescription:
     'Grant permission to vote on requests (voting not yet implemented).',

src/components/RequestBlock/index.tsx

@@ -1,19 +1,19 @@
+import axios from 'axios';
 import React, { useState } from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+import { MediaRequestStatus } from '../../../server/constants/media';
 import type { MediaRequest } from '../../../server/entity/MediaRequest';
-import { useIntl, defineMessages } from 'react-intl';
+import useRequestOverride from '../../hooks/useRequestOverride';
+import globalMessages from '../../i18n/globalMessages';
 import Badge from '../Common/Badge';
-import { MediaRequestStatus } from '../../../server/constants/media';
 import Button from '../Common/Button';
-import axios from 'axios';
-import globalMessages from '../../i18n/globalMessages';
 import RequestModal from '../RequestModal';
-import useRequestOverride from '../../hooks/useRequestOverride';
 
 const messages = defineMessages({
   seasons: '{seasonCount, plural, one {Season} other {Seasons}}',
   requestoverrides: 'Request Overrides',
-  server: 'Server',
-  profilechanged: 'Profile Changed',
+  server: 'Destination Server',
+  profilechanged: 'Quality Profile',
   rootfolder: 'Root Folder',
 });
 

src/components/RequestModal/MovieRequestModal.tsx

@@ -1,40 +1,40 @@
-import React, { useCallback, useState, useEffect } from 'react';
-import Modal from '../Common/Modal';
-import { useUser } from '../../hooks/useUser';
-import { Permission } from '../../../server/lib/permissions';
+import axios from 'axios';
+import React, { useCallback, useEffect, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
-import { MediaRequest } from '../../../server/entity/MediaRequest';
-import useSWR from 'swr';
-import { MovieDetails } from '../../../server/models/Movie';
 import { useToasts } from 'react-toast-notifications';
-import axios from 'axios';
+import useSWR from 'swr';
 import {
-  MediaStatus,
   MediaRequestStatus,
+  MediaStatus,
 } from '../../../server/constants/media';
+import { MediaRequest } from '../../../server/entity/MediaRequest';
+import { Permission } from '../../../server/lib/permissions';
+import { MovieDetails } from '../../../server/models/Movie';
 import DownloadIcon from '../../assets/download.svg';
+import { useUser } from '../../hooks/useUser';
+import globalMessages from '../../i18n/globalMessages';
 import Alert from '../Common/Alert';
+import Modal from '../Common/Modal';
 import AdvancedRequester, { RequestOverrides } from './AdvancedRequester';
-import globalMessages from '../../i18n/globalMessages';
 
 const messages = defineMessages({
   requestadmin: 'Your request will be immediately approved.',
   cancelrequest:
     'This will remove your request. Are you sure you want to continue?',
   requestSuccess: '<strong>{title}</strong> requested successfully!',
-  requestCancel: 'Request for <strong>{title}</strong> canceled',
+  requestCancel: 'Request for <strong>{title}</strong> canceled.',
   requesttitle: 'Request {title}',
   request4ktitle: 'Request {title} in 4K',
   close: 'Close',
   cancel: 'Cancel Request',
   cancelling: 'Canceling…',
-  pendingrequest: 'Pending request for {title}',
-  pending4krequest: 'Pending request for {title} in 4K',
+  pendingrequest: 'Pending Request for {title}',
+  pending4krequest: 'Pending Request for {title} in 4K',
   requesting: 'Requesting…',
   request: 'Request',
   request4k: 'Request 4K',
-  requestfrom: 'There is a pending request from {username}.',
-  request4kfrom: 'There is a pending 4K request from {username}.',
+  requestfrom: 'There is currently a pending request from {username}.',
+  request4kfrom: 'There is currently a pending 4K request from {username}.',
   errorediting: 'Something went wrong while editing the request.',
   requestedited: 'Request edited.',
   autoapproval: 'Automatic Approval',

src/components/RequestModal/SearchByNameModal/index.tsx

@@ -1,17 +1,16 @@
 import React from 'react';
-import Alert from '../../Common/Alert';
-import Modal from '../../Common/Modal';
-import { SmallLoadingSpinner } from '../../Common/LoadingSpinner';
-import useSWR from 'swr';
 import { defineMessages, useIntl } from 'react-intl';
+import useSWR from 'swr';
 import { SonarrSeries } from '../../../../server/api/sonarr';
+import Alert from '../../Common/Alert';
+import { SmallLoadingSpinner } from '../../Common/LoadingSpinner';
+import Modal from '../../Common/Modal';
 
 const messages = defineMessages({
   next: 'Next',
   notvdbid: 'Manual Match Required',
   notvdbiddescription:
-    "We couldn't automatically match your request.\
-    Please select the correct match from the list below.",
+    "We couldn't automatically match your request. Please select the correct match from the list below.",
   nosummary: 'No summary for this title was found.',
 });
 

src/components/ResetPassword/RequestResetLink.tsx

@@ -1,19 +1,19 @@
+import axios from 'axios';
+import { Field, Form, Formik } from 'formik';
+import Link from 'next/link';
 import React, { useState } from 'react';
-import ImageFader from '../Common/ImageFader';
 import { defineMessages, useIntl } from 'react-intl';
-import LanguagePicker from '../Layout/LanguagePicker';
-import Button from '../Common/Button';
-import { Field, Form, Formik } from 'formik';
 import * as Yup from 'yup';
-import axios from 'axios';
-import Link from 'next/link';
+import Button from '../Common/Button';
+import ImageFader from '../Common/ImageFader';
 import PageTitle from '../Common/PageTitle';
+import LanguagePicker from '../Layout/LanguagePicker';
 
 const messages = defineMessages({
   passwordreset: 'Password Reset',
   resetpassword: 'Reset your password',
   emailresetlink: 'Email a Recovery Link',
-  email: 'Email',
+  email: 'Email Address',
   validationemailrequired: 'You must provide a valid email address',
   gobacklogin: 'Return to Sign-In Page',
   requestresetlinksuccessmessage:

src/components/Settings/Notifications/NotificationsEmail.tsx

@@ -1,16 +1,16 @@
-import React from 'react';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
-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 NotificationTypeSelector from '../../NotificationTypeSelector';
+import useSWR from 'swr';
+import * as Yup from 'yup';
+import globalMessages from '../../../i18n/globalMessages';
 import Alert from '../../Common/Alert';
 import Badge from '../../Common/Badge';
-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',
@@ -36,11 +36,9 @@ const messages = defineMessages({
   validationEmail: 'You must provide a valid email address',
   emailNotificationTypesAlert: 'Email Notification Recipients',
   emailNotificationTypesAlertDescription:
-    '<strong>Media Requested</strong>, <strong>Media Automatically Approved</strong>, and <strong>Media Failed</strong>\
-    email notifications are sent to all users with the <strong>Manage Requests</strong> permission.',
+    '<strong>Media Requested</strong>, <strong>Media Automatically Approved</strong>, and <strong>Media Failed</strong> email notifications are sent to all users with the <strong>Manage Requests</strong> permission.',
   emailNotificationTypesAlertDescriptionPt2:
-    '<strong>Media Approved</strong>, <strong>Media Declined</strong>, and <strong>Media Available</strong>\
-    email notifications are sent to the user who submitted the request.',
+    '<strong>Media Approved</strong>, <strong>Media Declined</strong>, and <strong>Media Available</strong> email notifications are sent to the user who submitted the request.',
   pgpPrivateKey: '<PgpLink>PGP</PgpLink> Private Key',
   pgpPrivateKeyTip:
     'Sign encrypted email messages (PGP password is also required)',

src/components/Settings/Notifications/NotificationsPushover/index.tsx

@@ -1,13 +1,13 @@
-import React from 'react';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
-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 Alert from '../../../Common/Alert';
+import Button from '../../../Common/Button';
+import LoadingSpinner from '../../../Common/LoadingSpinner';
 import NotificationTypeSelector from '../../../NotificationTypeSelector';
 
 const messages = defineMessages({
@@ -24,9 +24,7 @@ const messages = defineMessages({
   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.',
+    '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.',
   notificationtypes: 'Notification Types',
 });
 

src/components/Settings/Notifications/NotificationsTelegram.tsx

@@ -1,13 +1,13 @@
-import React from 'react';
+import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
-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 Alert from '../../Common/Alert';
+import Button from '../../Common/Button';
+import LoadingSpinner from '../../Common/LoadingSpinner';
 import NotificationTypeSelector from '../../NotificationTypeSelector';
 
 const messages = defineMessages({
@@ -25,9 +25,7 @@ const messages = defineMessages({
   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.',
+    '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.',
   notificationtypes: 'Notification Types',
   sendSilently: 'Send Silently',
   sendSilentlyTip: 'Send notifications with no sound',