From 0acad8e9fa65a9de6cecac9b6a4a5b2313ba8f06 Mon Sep 17 00:00:00 2001
From: TheCatLady <52870424+TheCatLady@users.noreply.github.com>
Date: Tue, 23 Feb 2021 00:56:22 -0500
Subject: [PATCH] fix(ui): add missing string for default Discover Language &
 edit string for default Discover Region (#1004)

---
 src/components/RegionSelector/index.tsx                      | 2 +-
 src/components/Settings/SettingsMain.tsx                     | 5 ++++-
 .../UserProfile/UserSettings/UserGeneralSettings/index.tsx   | 5 ++++-
 src/i18n/locale/en.json                                      | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/RegionSelector/index.tsx b/src/components/RegionSelector/index.tsx
index 49db74b1..88117494 100644
--- a/src/components/RegionSelector/index.tsx
+++ b/src/components/RegionSelector/index.tsx
@@ -6,7 +6,7 @@ import type { Region } from '../../../server/lib/settings';
 import { defineMessages, useIntl } from 'react-intl';
 
 const messages = defineMessages({
-  regionDefault: 'All',
+  regionDefault: 'All Regions',
 });
 
 interface RegionSelectorProps {
diff --git a/src/components/Settings/SettingsMain.tsx b/src/components/Settings/SettingsMain.tsx
index 4466f828..83008652 100644
--- a/src/components/Settings/SettingsMain.tsx
+++ b/src/components/Settings/SettingsMain.tsx
@@ -48,6 +48,7 @@ const messages = defineMessages({
   validationApplicationTitle: 'You must provide an application title',
   validationApplicationUrl: 'You must provide a valid URL',
   validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
+  originalLanguageDefault: 'All Languages',
 });
 
 const SettingsMain: React.FC = () => {
@@ -306,7 +307,9 @@ const SettingsMain: React.FC = () => {
                         id="originalLanguage"
                         name="originalLanguage"
                       >
-                        <option value="">All</option>
+                        <option value="">
+                          {intl.formatMessage(messages.originalLanguageDefault)}
+                        </option>
                         {languages?.map((language) => (
                           <option
                             key={`language-key-${language.iso_639_1}`}
diff --git a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
index f8719711..5f89baa6 100644
--- a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
@@ -28,6 +28,7 @@ const messages = defineMessages({
   originallanguage: 'Discover Language',
   originallanguageTip:
     'Filter content by original language (only applies to the "Popular" and "Upcoming" categories)',
+  originalLanguageDefault: 'All Languages',
 });
 
 const UserGeneralSettings: React.FC = () => {
@@ -160,7 +161,9 @@ const UserGeneralSettings: React.FC = () => {
                       id="originalLanguage"
                       name="originalLanguage"
                     >
-                      <option value="">All</option>
+                      <option value="">
+                        {intl.formatMessage(messages.originalLanguageDefault)}
+                      </option>
                       {languages?.map((language) => (
                         <option
                           key={`language-key-${language.iso_639_1}`}
diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
index 5c1fbaf5..082836ca 100644
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -138,7 +138,7 @@
   "components.PlexLoginButton.loading": "Loading…",
   "components.PlexLoginButton.signingin": "Signing in…",
   "components.PlexLoginButton.signinwithplex": "Sign In",
-  "components.RegionSelector.regionDefault": "All",
+  "components.RegionSelector.regionDefault": "All Regions",
   "components.RequestBlock.profilechanged": "Quality Profile",
   "components.RequestBlock.requestoverrides": "Request Overrides",
   "components.RequestBlock.rootfolder": "Root Folder",
@@ -517,6 +517,7 @@
   "components.Settings.notificationsettingsfailed": "Notification settings failed to save.",
   "components.Settings.notificationsettingssaved": "Notification settings saved successfully!",
   "components.Settings.notrunning": "Not Running",
+  "components.Settings.originalLanguageDefault": "All Languages",
   "components.Settings.originallanguage": "Discover Language",
   "components.Settings.originallanguageTip": "Filter content by original language (only applies to the \"Popular\" and \"Upcoming\" categories)",
   "components.Settings.plexlibraries": "Plex Libraries",
@@ -679,6 +680,7 @@
   "components.UserProfile.UserSettings.UserGeneralSettings.displayName": "Display Name",
   "components.UserProfile.UserSettings.UserGeneralSettings.generalsettings": "General Settings",
   "components.UserProfile.UserSettings.UserGeneralSettings.localuser": "Local User",
+  "components.UserProfile.UserSettings.UserGeneralSettings.originalLanguageDefault": "All Languages",
   "components.UserProfile.UserSettings.UserGeneralSettings.originallanguage": "Discover Language",
   "components.UserProfile.UserSettings.UserGeneralSettings.originallanguageTip": "Filter content by original language (only applies to the \"Popular\" and \"Upcoming\" categories)",
   "components.UserProfile.UserSettings.UserGeneralSettings.plexuser": "Plex User",