shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-17 17:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): for server default options, display "All" region/language option instead of empty string (#1042)

Browse Source
This commit is contained in:
TheCatLady
2021-02-27 22:34:56 -05:00
committed by GitHub
parent 3f9a116b17
commit 3fed26cfbe
3 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
View File

@@ -30,7 +30,7 @@ const messages = defineMessages({
originallanguageTip:
'Filter content by original language (only applies to the "Popular" and "Upcoming" categories)',
originalLanguageDefault: 'All Languages',
languageServerDefault: '{applicationTitle} Default ({language})',
languageServerDefault: 'Default ({language})',
});
const UserGeneralSettings: React.FC = () => {
@@ -61,6 +61,11 @@ const UserGeneralSettings: React.FC = () => {
return <Error statusCode={500} />;
}
const defaultLanguageNameFallback =
languages.find(
(language) => language.iso_639_1 === currentSettings.originalLanguage
)?.english_name ?? currentSettings.originalLanguage;
return (
<>
<div className="mb-6">
@@ -167,15 +172,17 @@ const UserGeneralSettings: React.FC = () => {
>
<option value="">
{intl.formatMessage(messages.languageServerDefault, {
applicationTitle: currentSettings.applicationTitle,
language:
intl.formatDisplayName(
currentSettings.originalLanguage,
{
type: 'language',
fallback: 'none',
}
) ?? currentSettings.originalLanguage,
language: currentSettings.originalLanguage
? intl.formatDisplayName(
currentSettings.originalLanguage,
{
type: 'language',
fallback: 'none',
}
) ?? defaultLanguageNameFallback
: intl.formatMessage(
messages.originalLanguageDefault
),
})}
</option>
<option value="all">