From 7e4e22b9e162535518dce11c037a6dbd61c14e9a Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Fri, 9 May 2025 00:44:48 +0200 Subject: [PATCH] Add "All" to default languages --- src/modules/core/utils/Languages.ts | 8 ++------ src/modules/global-search/screens/SearchAll.tsx | 4 ++-- src/modules/settings/Settings.constants.ts | 4 ++-- src/modules/source/screens/Sources.tsx | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/modules/core/utils/Languages.ts b/src/modules/core/utils/Languages.ts index 0931c2b6..1fd38619 100644 --- a/src/modules/core/utils/Languages.ts +++ b/src/modules/core/utils/Languages.ts @@ -89,12 +89,8 @@ function defaultNativeLang(): readonly string[] { return preferredLanguages; } -export function extensionDefaultLanguages(): string[] { - return [...defaultNativeLang()]; -} - -export function sourceDefaultLanguages(): string[] { - return [...defaultNativeLang()]; +export function getDefaultLanguages(): string[] { + return [...defaultNativeLang(), DefaultLanguage.ALL]; } export const languageSortComparator = (a: string, b: string) => diff --git a/src/modules/global-search/screens/SearchAll.tsx b/src/modules/global-search/screens/SearchAll.tsx index 223bcd52..1b77baef 100644 --- a/src/modules/global-search/screens/SearchAll.tsx +++ b/src/modules/global-search/screens/SearchAll.tsx @@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next'; import Box from '@mui/material/Box'; import { requestManager } from '@/lib/requests/RequestManager.ts'; import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx'; -import { sourceDefaultLanguages } from '@/modules/core/utils/Languages.ts'; +import { getDefaultLanguages } from '@/modules/core/utils/Languages.ts'; import { AppbarSearch } from '@/modules/core/components/AppbarSearch.tsx'; import { LanguageSelect } from '@/modules/core/components/inputs/LanguageSelect.tsx'; import { useDebounce } from '@/modules/core/hooks/useDebounce.ts'; @@ -194,7 +194,7 @@ export const SearchAll: React.FC = () => { const [query] = useQueryParam('query', StringParam); const searchString = useDebounce(query, TRIGGER_SEARCH_THRESHOLD); - const [shownLangs, setShownLangs] = useLocalStorage('shownSourceLangs', sourceDefaultLanguages()); + const [shownLangs, setShownLangs] = useLocalStorage('shownSourceLangs', getDefaultLanguages()); const { settings: { showNsfw }, } = useMetadataServerSettings(); diff --git a/src/modules/settings/Settings.constants.ts b/src/modules/settings/Settings.constants.ts index 625281e3..0798f6b1 100644 --- a/src/modules/settings/Settings.constants.ts +++ b/src/modules/settings/Settings.constants.ts @@ -10,7 +10,7 @@ import { DEFAULT_DEVICE } from '@/modules/device/services/Device.ts'; import { DEFAULT_SORT_SETTINGS } from '@/modules/migration/Migration.constants.ts'; import { MetadataServerSettings } from '@/modules/settings/Settings.types.ts'; import { GridLayout } from '@/modules/core/Core.types.ts'; -import { extensionDefaultLanguages } from '@/modules/core/utils/Languages.ts'; +import { getDefaultLanguages } from '@/modules/core/utils/Languages.ts'; export const SERVER_SETTINGS_METADATA_DEFAULT: MetadataServerSettings = { // downloads @@ -41,7 +41,7 @@ export const SERVER_SETTINGS_METADATA_DEFAULT: MetadataServerSettings = { // browse hideLibraryEntries: false, - extensionLanguages: extensionDefaultLanguages(), + extensionLanguages: getDefaultLanguages(), showNsfw: true, // history diff --git a/src/modules/source/screens/Sources.tsx b/src/modules/source/screens/Sources.tsx index 146680a0..432626c3 100644 --- a/src/modules/source/screens/Sources.tsx +++ b/src/modules/source/screens/Sources.tsx @@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next'; import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx'; import { requestManager } from '@/lib/requests/RequestManager.ts'; import { useLocalStorage } from '@/modules/core/hooks/useStorage.tsx'; -import { sourceDefaultLanguages } from '@/modules/core/utils/Languages.ts'; +import { getDefaultLanguages } from '@/modules/core/utils/Languages.ts'; import { LoadingPlaceholder } from '@/modules/core/components/feedback/LoadingPlaceholder.tsx'; import { SourceCard } from '@/modules/source/components/SourceCard.tsx'; import { LanguageSelect } from '@/modules/core/components/inputs/LanguageSelect.tsx'; @@ -31,7 +31,7 @@ import { useAppAction } from '@/modules/navigation-bar/hooks/useAppAction.ts'; export function Sources() { const { t } = useTranslation(); - const [shownLangs, setShownLangs] = useLocalStorage('shownSourceLangs', sourceDefaultLanguages()); + const [shownLangs, setShownLangs] = useLocalStorage('shownSourceLangs', getDefaultLanguages()); const { settings: { showNsfw }, } = useMetadataServerSettings();