diff --git a/README.md b/README.md index 2516be0a25..3ce1c1f2c8 100644 --- a/README.md +++ b/README.md @@ -85,8 +85,11 @@ Jellyfin Web is the frontend used for most of the clients available for end user โ”œโ”€โ”€ controllers # Legacy page views and controllers ๐Ÿงน โ”œโ”€โ”€ elements # Basic webcomponents and React wrappers ๐Ÿงน โ”œโ”€โ”€ hooks # Custom React hooks - โ”œโ”€โ”€ legacy # Polyfills for legacy browsers - โ”œโ”€โ”€ libraries # Third party libraries ๐Ÿงน + โ”œโ”€โ”€ lib # Reusable libraries + โ”‚ย ย  โ”œโ”€โ”€ globalize # Custom localization library + โ”‚ย ย  โ”œโ”€โ”€ legacy # Polyfills for legacy browsers + โ”‚ย ย  โ”œโ”€โ”€ navdrawer # Navigation drawer library for classic layout + โ”‚ย ย  โ””โ”€โ”€ scroller # Content scrolling library โ”œโ”€โ”€ plugins # Client plugins โ”œโ”€โ”€ scripts # Random assortment of visual components and utilities ๐Ÿ‰ โ”œโ”€โ”€ strings # Translation files diff --git a/src/apps/dashboard/components/activityTable/LogLevelChip.tsx b/src/apps/dashboard/components/activityTable/LogLevelChip.tsx index 9795c96b1d..7f1f68f750 100644 --- a/src/apps/dashboard/components/activityTable/LogLevelChip.tsx +++ b/src/apps/dashboard/components/activityTable/LogLevelChip.tsx @@ -2,7 +2,7 @@ import { LogLevel } from '@jellyfin/sdk/lib/generated-client/models/log-level'; import Chip from '@mui/material/Chip'; import React from 'react'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; const LogLevelChip = ({ level }: { level: LogLevel }) => { let color: 'info' | 'warning' | 'error' | undefined; diff --git a/src/apps/dashboard/components/drawer/sections/AdvancedDrawerSection.tsx b/src/apps/dashboard/components/drawer/sections/AdvancedDrawerSection.tsx index ddbee11841..97d8f26719 100644 --- a/src/apps/dashboard/components/drawer/sections/AdvancedDrawerSection.tsx +++ b/src/apps/dashboard/components/drawer/sections/AdvancedDrawerSection.tsx @@ -10,7 +10,7 @@ import ListSubheader from '@mui/material/ListSubheader'; import React from 'react'; import ListItemLink from 'components/ListItemLink'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; const AdvancedDrawerSection = () => { return ( diff --git a/src/apps/dashboard/components/drawer/sections/DevicesDrawerSection.tsx b/src/apps/dashboard/components/drawer/sections/DevicesDrawerSection.tsx index d79a320733..18fcb010e8 100644 --- a/src/apps/dashboard/components/drawer/sections/DevicesDrawerSection.tsx +++ b/src/apps/dashboard/components/drawer/sections/DevicesDrawerSection.tsx @@ -7,7 +7,7 @@ import ListSubheader from '@mui/material/ListSubheader'; import React from 'react'; import ListItemLink from 'components/ListItemLink'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; const DevicesDrawerSection = () => { return ( diff --git a/src/apps/dashboard/components/drawer/sections/LiveTvDrawerSection.tsx b/src/apps/dashboard/components/drawer/sections/LiveTvDrawerSection.tsx index 35ea15ce0d..55a14d3292 100644 --- a/src/apps/dashboard/components/drawer/sections/LiveTvDrawerSection.tsx +++ b/src/apps/dashboard/components/drawer/sections/LiveTvDrawerSection.tsx @@ -7,7 +7,7 @@ import ListSubheader from '@mui/material/ListSubheader'; import React from 'react'; import ListItemLink from 'components/ListItemLink'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; const LiveTvDrawerSection = () => { return ( diff --git a/src/apps/dashboard/components/drawer/sections/PluginDrawerSection.tsx b/src/apps/dashboard/components/drawer/sections/PluginDrawerSection.tsx index d50cf8b08a..8316d30194 100644 --- a/src/apps/dashboard/components/drawer/sections/PluginDrawerSection.tsx +++ b/src/apps/dashboard/components/drawer/sections/PluginDrawerSection.tsx @@ -8,7 +8,7 @@ import ListSubheader from '@mui/material/ListSubheader'; import React, { useEffect } from 'react'; import ListItemLink from 'components/ListItemLink'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import Dashboard from 'utils/dashboard'; import { useConfigurationPages } from 'apps/dashboard/features/plugins/api/useConfigurationPages'; diff --git a/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx b/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx index 5685afd3fd..d362d872ac 100644 --- a/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx +++ b/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { useLocation } from 'react-router-dom'; import ListItemLink from 'components/ListItemLink'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; const LIBRARY_PATHS = [ '/dashboard/libraries', diff --git a/src/apps/dashboard/features/plugins/components/PluginDetailsTable.tsx b/src/apps/dashboard/features/plugins/components/PluginDetailsTable.tsx index dfda460953..2891f0b694 100644 --- a/src/apps/dashboard/features/plugins/components/PluginDetailsTable.tsx +++ b/src/apps/dashboard/features/plugins/components/PluginDetailsTable.tsx @@ -9,7 +9,7 @@ import TableRow from '@mui/material/TableRow/TableRow'; import React, { FC } from 'react'; import { Link as RouterLink } from 'react-router-dom'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import type { PluginDetails } from '../types/PluginDetails'; diff --git a/src/apps/dashboard/features/plugins/components/PluginRevisions.tsx b/src/apps/dashboard/features/plugins/components/PluginRevisions.tsx index 30d5f70df4..fe4c5743fc 100644 --- a/src/apps/dashboard/features/plugins/components/PluginRevisions.tsx +++ b/src/apps/dashboard/features/plugins/components/PluginRevisions.tsx @@ -10,7 +10,7 @@ import React, { type FC } from 'react'; import MarkdownBox from 'components/MarkdownBox'; import { parseISO8601Date, toLocaleString } from 'scripts/datetime'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import type { PluginDetails } from '../types/PluginDetails'; import { VersionInfo } from '@jellyfin/sdk/lib/generated-client'; diff --git a/src/apps/dashboard/routes/activity.tsx b/src/apps/dashboard/routes/activity.tsx index e0fd4ccd8a..36ceee215d 100644 --- a/src/apps/dashboard/routes/activity.tsx +++ b/src/apps/dashboard/routes/activity.tsx @@ -16,7 +16,7 @@ import Page from 'components/Page'; import UserAvatar from 'components/UserAvatar'; import { useApi } from 'hooks/useApi'; import { parseISO8601Date, toLocaleDateString, toLocaleTimeString } from 'scripts/datetime'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { toBoolean } from 'utils/string'; import LogLevelChip from '../components/activityTable/LogLevelChip'; diff --git a/src/apps/dashboard/routes/playback/trickplay.tsx b/src/apps/dashboard/routes/playback/trickplay.tsx index 90eec1641d..acfdcfff7c 100644 --- a/src/apps/dashboard/routes/playback/trickplay.tsx +++ b/src/apps/dashboard/routes/playback/trickplay.tsx @@ -3,7 +3,7 @@ import { TrickplayScanBehavior } from '@jellyfin/sdk/lib/generated-client/models import { ProcessPriorityClass } from '@jellyfin/sdk/lib/generated-client/models/process-priority-class'; import React, { type FC, useCallback, useEffect, useRef } from 'react'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import Page from '../../../../components/Page'; import SectionTitleContainer from '../../../../elements/SectionTitleContainer'; import ButtonElement from '../../../../elements/ButtonElement'; diff --git a/src/apps/dashboard/routes/plugins/plugin.tsx b/src/apps/dashboard/routes/plugins/plugin.tsx index cfc4c685db..663cbf279a 100644 --- a/src/apps/dashboard/routes/plugins/plugin.tsx +++ b/src/apps/dashboard/routes/plugins/plugin.tsx @@ -33,7 +33,7 @@ import type { PluginDetails } from 'apps/dashboard/features/plugins/types/Plugin import ConfirmDialog from 'components/ConfirmDialog'; import Page from 'components/Page'; import { useApi } from 'hooks/useApi'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { getPluginUrl } from 'utils/dashboard'; import { getUri } from 'utils/api'; diff --git a/src/apps/dashboard/routes/users/access.tsx b/src/apps/dashboard/routes/users/access.tsx index b2cc753a27..766747ff3c 100644 --- a/src/apps/dashboard/routes/users/access.tsx +++ b/src/apps/dashboard/routes/users/access.tsx @@ -4,7 +4,7 @@ import { useSearchParams } from 'react-router-dom'; import loading from '../../../../components/loading/loading'; import libraryMenu from '../../../../scripts/libraryMenu'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import toast from '../../../../components/toast/toast'; import SectionTabs from '../../../../components/dashboard/users/SectionTabs'; import ButtonElement from '../../../../elements/ButtonElement'; diff --git a/src/apps/dashboard/routes/users/add.tsx b/src/apps/dashboard/routes/users/add.tsx index 07213e6ed3..920d38691f 100644 --- a/src/apps/dashboard/routes/users/add.tsx +++ b/src/apps/dashboard/routes/users/add.tsx @@ -2,7 +2,7 @@ import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client'; import React, { useCallback, useEffect, useState, useRef } from 'react'; import Dashboard from '../../../../utils/dashboard'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import loading from '../../../../components/loading/loading'; import toast from '../../../../components/toast/toast'; import SectionTitleContainer from '../../../../elements/SectionTitleContainer'; diff --git a/src/apps/dashboard/routes/users/index.tsx b/src/apps/dashboard/routes/users/index.tsx index 5c31c902cd..c1348714e3 100644 --- a/src/apps/dashboard/routes/users/index.tsx +++ b/src/apps/dashboard/routes/users/index.tsx @@ -2,7 +2,7 @@ import type { UserDto } from '@jellyfin/sdk/lib/generated-client'; import React, { useEffect, useState, useRef } from 'react'; import Dashboard from '../../../../utils/dashboard'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import loading from '../../../../components/loading/loading'; import dom from '../../../../scripts/dom'; import confirm from '../../../../components/confirm/confirm'; diff --git a/src/apps/dashboard/routes/users/parentalcontrol.tsx b/src/apps/dashboard/routes/users/parentalcontrol.tsx index cbd8ff90f7..754129cec7 100644 --- a/src/apps/dashboard/routes/users/parentalcontrol.tsx +++ b/src/apps/dashboard/routes/users/parentalcontrol.tsx @@ -5,7 +5,7 @@ import escapeHTML from 'escape-html'; import React, { useCallback, useEffect, useState, useRef } from 'react'; import { useSearchParams } from 'react-router-dom'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import LibraryMenu from '../../../../scripts/libraryMenu'; import AccessScheduleList from '../../../../components/dashboard/users/AccessScheduleList'; import TagList from '../../../../components/dashboard/users/TagList'; diff --git a/src/apps/dashboard/routes/users/profile.tsx b/src/apps/dashboard/routes/users/profile.tsx index 544ec07d4e..9ba89001a7 100644 --- a/src/apps/dashboard/routes/users/profile.tsx +++ b/src/apps/dashboard/routes/users/profile.tsx @@ -4,7 +4,7 @@ import React, { useCallback, useEffect, useState, useRef } from 'react'; import { useSearchParams } from 'react-router-dom'; import Dashboard from '../../../../utils/dashboard'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import LibraryMenu from '../../../../scripts/libraryMenu'; import ButtonElement from '../../../../elements/ButtonElement'; import CheckBoxElement from '../../../../elements/CheckBoxElement'; diff --git a/src/apps/experimental/components/AppToolbar/RemotePlayButton.tsx b/src/apps/experimental/components/AppToolbar/RemotePlayButton.tsx index b94532b13f..aa1ac14f88 100644 --- a/src/apps/experimental/components/AppToolbar/RemotePlayButton.tsx +++ b/src/apps/experimental/components/AppToolbar/RemotePlayButton.tsx @@ -8,7 +8,7 @@ import { useTheme } from '@mui/material/styles'; import Tooltip from '@mui/material/Tooltip'; import { playbackManager } from 'components/playback/playbackmanager'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import Events from 'utils/events'; import RemotePlayMenu, { ID } from './menus/RemotePlayMenu'; diff --git a/src/apps/experimental/components/AppToolbar/SearchButton.tsx b/src/apps/experimental/components/AppToolbar/SearchButton.tsx index fded244524..3d002ee57c 100644 --- a/src/apps/experimental/components/AppToolbar/SearchButton.tsx +++ b/src/apps/experimental/components/AppToolbar/SearchButton.tsx @@ -9,7 +9,7 @@ import { import SearchIcon from '@mui/icons-material/Search'; import IconButton from '@mui/material/IconButton'; import Tooltip from '@mui/material/Tooltip'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; const getUrlParams = (searchParams: URLSearchParams) => { const parentId = diff --git a/src/apps/experimental/components/AppToolbar/SyncPlayButton.tsx b/src/apps/experimental/components/AppToolbar/SyncPlayButton.tsx index 46955c9b9a..f69a95ccb6 100644 --- a/src/apps/experimental/components/AppToolbar/SyncPlayButton.tsx +++ b/src/apps/experimental/components/AppToolbar/SyncPlayButton.tsx @@ -6,7 +6,7 @@ import React, { useCallback, useState } from 'react'; import { pluginManager } from 'components/pluginManager'; import { useApi } from 'hooks/useApi'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { PluginType } from 'types/plugin'; import AppSyncPlayMenu, { ID } from './menus/SyncPlayMenu'; diff --git a/src/apps/experimental/components/AppToolbar/menus/RemotePlayActiveMenu.tsx b/src/apps/experimental/components/AppToolbar/menus/RemotePlayActiveMenu.tsx index e184a3a25d..9c5c7f8476 100644 --- a/src/apps/experimental/components/AppToolbar/menus/RemotePlayActiveMenu.tsx +++ b/src/apps/experimental/components/AppToolbar/menus/RemotePlayActiveMenu.tsx @@ -13,7 +13,7 @@ import React, { FC, useCallback, useState } from 'react'; import { Link } from 'react-router-dom'; import { enable, isEnabled } from 'scripts/autocast'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; interface RemotePlayActiveMenuProps extends MenuProps { onMenuClose: () => void diff --git a/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx b/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx index 96626eb662..bb53bf6ef5 100644 --- a/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx +++ b/src/apps/experimental/components/AppToolbar/menus/RemotePlayMenu.tsx @@ -6,7 +6,7 @@ import Menu, { type MenuProps } from '@mui/material/Menu'; import MenuItem from '@mui/material/MenuItem'; import React, { FC, useEffect, useState } from 'react'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { playbackManager } from 'components/playback/playbackmanager'; import { pluginManager } from 'components/pluginManager'; import type { PlayTarget } from 'types/playTarget'; diff --git a/src/apps/experimental/components/AppToolbar/menus/SyncPlayMenu.tsx b/src/apps/experimental/components/AppToolbar/menus/SyncPlayMenu.tsx index 476eb94fbd..478777eea9 100644 --- a/src/apps/experimental/components/AppToolbar/menus/SyncPlayMenu.tsx +++ b/src/apps/experimental/components/AppToolbar/menus/SyncPlayMenu.tsx @@ -20,7 +20,7 @@ import React, { FC, useCallback, useEffect, useState } from 'react'; import { pluginManager } from 'components/pluginManager'; import { useApi } from 'hooks/useApi'; import { useSyncPlayGroups } from 'hooks/useSyncPlayGroups'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { PluginType } from 'types/plugin'; import Events, { Event } from 'utils/events'; diff --git a/src/apps/experimental/components/drawers/MainDrawerContent.tsx b/src/apps/experimental/components/drawers/MainDrawerContent.tsx index 99834c2d81..46c797ac96 100644 --- a/src/apps/experimental/components/drawers/MainDrawerContent.tsx +++ b/src/apps/experimental/components/drawers/MainDrawerContent.tsx @@ -18,7 +18,7 @@ import { appRouter } from 'components/router/appRouter'; import { useApi } from 'hooks/useApi'; import { useUserViews } from 'hooks/useUserViews'; import { useWebConfig } from 'hooks/useWebConfig'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import LibraryIcon from '../LibraryIcon'; import DrawerHeaderLink from './DrawerHeaderLink'; diff --git a/src/apps/experimental/components/library/GenresItemsContainer.tsx b/src/apps/experimental/components/library/GenresItemsContainer.tsx index a676a0c78b..de7f5b5348 100644 --- a/src/apps/experimental/components/library/GenresItemsContainer.tsx +++ b/src/apps/experimental/components/library/GenresItemsContainer.tsx @@ -2,7 +2,7 @@ import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/bas import type { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type'; import React, { FC } from 'react'; import { useGetGenres } from 'hooks/useFetchItems'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import Loading from 'components/loading/LoadingComponent'; import GenresSectionContainer from './GenresSectionContainer'; import type { ParentId } from 'types/library'; diff --git a/src/apps/experimental/components/library/GridListViewButton.tsx b/src/apps/experimental/components/library/GridListViewButton.tsx index 26588b1883..8941f4f5cb 100644 --- a/src/apps/experimental/components/library/GridListViewButton.tsx +++ b/src/apps/experimental/components/library/GridListViewButton.tsx @@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react'; import { ButtonGroup, IconButton } from '@mui/material'; import ViewModuleIcon from '@mui/icons-material/ViewModule'; import ViewListIcon from '@mui/icons-material/ViewList'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { LibraryViewSettings, ViewMode } from 'types/library'; import { LibraryTab } from 'types/libraryTab'; import ViewSettingsButton from './ViewSettingsButton'; diff --git a/src/apps/experimental/components/library/NewCollectionButton.tsx b/src/apps/experimental/components/library/NewCollectionButton.tsx index e337de7ddd..92ac452d77 100644 --- a/src/apps/experimental/components/library/NewCollectionButton.tsx +++ b/src/apps/experimental/components/library/NewCollectionButton.tsx @@ -1,7 +1,7 @@ import React, { FC, useCallback } from 'react'; import { IconButton } from '@mui/material'; import AddIcon from '@mui/icons-material/Add'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; const NewCollectionButton: FC = () => { const showCollectionEditor = useCallback(() => { diff --git a/src/apps/experimental/components/library/Pagination.tsx b/src/apps/experimental/components/library/Pagination.tsx index 513c96b2a3..ea3cd1cfe7 100644 --- a/src/apps/experimental/components/library/Pagination.tsx +++ b/src/apps/experimental/components/library/Pagination.tsx @@ -5,7 +5,7 @@ import Box from '@mui/material/Box'; import ButtonGroup from '@mui/material/ButtonGroup'; import IconButton from '@mui/material/IconButton'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import * as userSettings from 'scripts/settings/userSettings'; import { LibraryViewSettings } from 'types/library'; diff --git a/src/apps/experimental/components/library/PlayAllButton.tsx b/src/apps/experimental/components/library/PlayAllButton.tsx index 5af58c708a..45eb1db8f2 100644 --- a/src/apps/experimental/components/library/PlayAllButton.tsx +++ b/src/apps/experimental/components/library/PlayAllButton.tsx @@ -4,7 +4,7 @@ import { IconButton } from '@mui/material'; import PlayArrowIcon from '@mui/icons-material/PlayArrow'; import { playbackManager } from 'components/playback/playbackmanager'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { getFiltersQuery } from 'utils/items'; import { LibraryViewSettings } from 'types/library'; import { LibraryTab } from 'types/libraryTab'; diff --git a/src/apps/experimental/components/library/ProgramsSectionView.tsx b/src/apps/experimental/components/library/ProgramsSectionView.tsx index 960ba1e96f..33accce51b 100644 --- a/src/apps/experimental/components/library/ProgramsSectionView.tsx +++ b/src/apps/experimental/components/library/ProgramsSectionView.tsx @@ -1,7 +1,7 @@ import React, { type FC } from 'react'; import { useGetProgramsSectionsWithItems, useGetTimers } from 'hooks/useFetchItems'; import { appRouter } from 'components/router/appRouter'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import Loading from 'components/loading/LoadingComponent'; import SectionContainer from './SectionContainer'; import { CardShape } from 'utils/card'; diff --git a/src/apps/experimental/components/library/QueueButton.tsx b/src/apps/experimental/components/library/QueueButton.tsx index 6b8be9cb32..d0e93df489 100644 --- a/src/apps/experimental/components/library/QueueButton.tsx +++ b/src/apps/experimental/components/library/QueueButton.tsx @@ -4,7 +4,7 @@ import { IconButton } from '@mui/material'; import QueueIcon from '@mui/icons-material/Queue'; import { playbackManager } from 'components/playback/playbackmanager'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; interface QueueButtonProps { item: BaseItemDto | undefined diff --git a/src/apps/experimental/components/library/ShuffleButton.tsx b/src/apps/experimental/components/library/ShuffleButton.tsx index 609c102720..ec75caeffd 100644 --- a/src/apps/experimental/components/library/ShuffleButton.tsx +++ b/src/apps/experimental/components/library/ShuffleButton.tsx @@ -5,7 +5,7 @@ import { IconButton } from '@mui/material'; import ShuffleIcon from '@mui/icons-material/Shuffle'; import { playbackManager } from 'components/playback/playbackmanager'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { getFiltersQuery } from 'utils/items'; import { LibraryViewSettings } from 'types/library'; import { LibraryTab } from 'types/libraryTab'; diff --git a/src/apps/experimental/components/library/SortButton.tsx b/src/apps/experimental/components/library/SortButton.tsx index c0fcfe5556..d0f1bbce72 100644 --- a/src/apps/experimental/components/library/SortButton.tsx +++ b/src/apps/experimental/components/library/SortButton.tsx @@ -10,7 +10,7 @@ import FormControl from '@mui/material/FormControl'; import Select, { SelectChangeEvent } from '@mui/material/Select'; import SortByAlphaIcon from '@mui/icons-material/SortByAlpha'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { LibraryViewSettings } from 'types/library'; import { LibraryTab } from 'types/libraryTab'; import { ItemSortBy } from '@jellyfin/sdk/lib/models/api/item-sort-by'; diff --git a/src/apps/experimental/components/library/SuggestionsSectionView.tsx b/src/apps/experimental/components/library/SuggestionsSectionView.tsx index ca3631e67d..26602e5a83 100644 --- a/src/apps/experimental/components/library/SuggestionsSectionView.tsx +++ b/src/apps/experimental/components/library/SuggestionsSectionView.tsx @@ -8,7 +8,7 @@ import { useGetSuggestionSectionsWithItems } from 'hooks/useFetchItems'; import { appRouter } from 'components/router/appRouter'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import Loading from 'components/loading/LoadingComponent'; import SectionContainer from './SectionContainer'; import { CardShape } from 'utils/card'; diff --git a/src/apps/experimental/components/library/UpcomingView.tsx b/src/apps/experimental/components/library/UpcomingView.tsx index 874382d9e5..cff2d2f001 100644 --- a/src/apps/experimental/components/library/UpcomingView.tsx +++ b/src/apps/experimental/components/library/UpcomingView.tsx @@ -2,7 +2,7 @@ import React, { type FC } from 'react'; import Box from '@mui/material/Box'; import { useGetGroupsUpcomingEpisodes } from 'hooks/useFetchItems'; import Loading from 'components/loading/LoadingComponent'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import SectionContainer from './SectionContainer'; import { CardShape } from 'utils/card'; import type { LibraryViewProps } from 'types/library'; diff --git a/src/apps/experimental/components/library/ViewSettingsButton.tsx b/src/apps/experimental/components/library/ViewSettingsButton.tsx index 8c91e1fb88..70839d4cd7 100644 --- a/src/apps/experimental/components/library/ViewSettingsButton.tsx +++ b/src/apps/experimental/components/library/ViewSettingsButton.tsx @@ -15,7 +15,7 @@ import Select, { SelectChangeEvent } from '@mui/material/Select'; import Popover from '@mui/material/Popover'; import ViewComfyIcon from '@mui/icons-material/ViewComfy'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { LibraryViewSettings } from 'types/library'; import { LibraryTab } from 'types/libraryTab'; diff --git a/src/apps/experimental/components/library/filter/FilterButton.tsx b/src/apps/experimental/components/library/filter/FilterButton.tsx index 4fa7a9824d..1e3109ed45 100644 --- a/src/apps/experimental/components/library/filter/FilterButton.tsx +++ b/src/apps/experimental/components/library/filter/FilterButton.tsx @@ -15,7 +15,7 @@ import { styled } from '@mui/material/styles'; import Typography from '@mui/material/Typography'; import { useGetQueryFiltersLegacy, useGetStudios } from 'hooks/useFetchItems'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import FiltersFeatures from './FiltersFeatures'; import FiltersGenres from './FiltersGenres'; diff --git a/src/apps/experimental/components/library/filter/FiltersEpisodesStatus.tsx b/src/apps/experimental/components/library/filter/FiltersEpisodesStatus.tsx index fb3f068503..d6df827768 100644 --- a/src/apps/experimental/components/library/filter/FiltersEpisodesStatus.tsx +++ b/src/apps/experimental/components/library/filter/FiltersEpisodesStatus.tsx @@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react'; import FormGroup from '@mui/material/FormGroup'; import FormControlLabel from '@mui/material/FormControlLabel'; import Checkbox from '@mui/material/Checkbox'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { EpisodeFilter, LibraryViewSettings } from 'types/library'; const episodeFilterOptions = [ diff --git a/src/apps/experimental/components/library/filter/FiltersFeatures.tsx b/src/apps/experimental/components/library/filter/FiltersFeatures.tsx index 6bcced0cd7..d2ecc0e996 100644 --- a/src/apps/experimental/components/library/filter/FiltersFeatures.tsx +++ b/src/apps/experimental/components/library/filter/FiltersFeatures.tsx @@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react'; import FormGroup from '@mui/material/FormGroup'; import FormControlLabel from '@mui/material/FormControlLabel'; import Checkbox from '@mui/material/Checkbox'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { FeatureFilters, LibraryViewSettings } from 'types/library'; const featuresOptions = [ diff --git a/src/apps/experimental/components/library/filter/FiltersSeriesStatus.tsx b/src/apps/experimental/components/library/filter/FiltersSeriesStatus.tsx index ae731792b2..eeb81df5e9 100644 --- a/src/apps/experimental/components/library/filter/FiltersSeriesStatus.tsx +++ b/src/apps/experimental/components/library/filter/FiltersSeriesStatus.tsx @@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react'; import FormGroup from '@mui/material/FormGroup'; import FormControlLabel from '@mui/material/FormControlLabel'; import Checkbox from '@mui/material/Checkbox'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { LibraryViewSettings } from 'types/library'; import { SeriesStatus } from '@jellyfin/sdk/lib/generated-client'; diff --git a/src/apps/experimental/components/library/filter/FiltersStatus.tsx b/src/apps/experimental/components/library/filter/FiltersStatus.tsx index 4e2553cae6..69fd22a1a1 100644 --- a/src/apps/experimental/components/library/filter/FiltersStatus.tsx +++ b/src/apps/experimental/components/library/filter/FiltersStatus.tsx @@ -2,7 +2,7 @@ import React, { FC, useCallback } from 'react'; import FormGroup from '@mui/material/FormGroup'; import FormControlLabel from '@mui/material/FormControlLabel'; import Checkbox from '@mui/material/Checkbox'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { LibraryViewSettings } from 'types/library'; import { ItemFilter } from '@jellyfin/sdk/lib/generated-client'; import { LibraryTab } from 'types/libraryTab'; diff --git a/src/apps/experimental/components/tabs/tabRoutes.ts b/src/apps/experimental/components/tabs/tabRoutes.ts index 306e41a8fd..54589ac276 100644 --- a/src/apps/experimental/components/tabs/tabRoutes.ts +++ b/src/apps/experimental/components/tabs/tabRoutes.ts @@ -1,4 +1,4 @@ -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import * as userSettings from 'scripts/settings/userSettings'; import { LibraryTab } from 'types/libraryTab'; diff --git a/src/apps/experimental/routes/home.tsx b/src/apps/experimental/routes/home.tsx index f1288b5e0f..b8aace9ac6 100644 --- a/src/apps/experimental/routes/home.tsx +++ b/src/apps/experimental/routes/home.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useEffect, useMemo, useRef } from 'react'; import { useSearchParams } from 'react-router-dom'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import { clearBackdrop } from '../../../components/backdrop/backdrop'; import layoutManager from '../../../components/layoutManager'; import Page from '../../../components/Page'; diff --git a/src/apps/experimental/routes/user/display/DisplayPreferences.tsx b/src/apps/experimental/routes/user/display/DisplayPreferences.tsx index 4fe869428e..4592fc537c 100644 --- a/src/apps/experimental/routes/user/display/DisplayPreferences.tsx +++ b/src/apps/experimental/routes/user/display/DisplayPreferences.tsx @@ -13,7 +13,7 @@ import React, { Fragment } from 'react'; import { appHost } from 'components/apphost'; import { useApi } from 'hooks/useApi'; import { useThemes } from 'hooks/useThemes'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { DisplaySettingsValues } from './types'; import { useScreensavers } from './hooks/useScreensavers'; diff --git a/src/apps/experimental/routes/user/display/ItemDetailPreferences.tsx b/src/apps/experimental/routes/user/display/ItemDetailPreferences.tsx index 00da9439de..fcb256d323 100644 --- a/src/apps/experimental/routes/user/display/ItemDetailPreferences.tsx +++ b/src/apps/experimental/routes/user/display/ItemDetailPreferences.tsx @@ -6,7 +6,7 @@ import Stack from '@mui/material/Stack'; import Typography from '@mui/material/Typography'; import React from 'react'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { DisplaySettingsValues } from './types'; interface ItemDetailPreferencesProps { diff --git a/src/apps/experimental/routes/user/display/LibraryPreferences.tsx b/src/apps/experimental/routes/user/display/LibraryPreferences.tsx index a73fa7138c..573bd00848 100644 --- a/src/apps/experimental/routes/user/display/LibraryPreferences.tsx +++ b/src/apps/experimental/routes/user/display/LibraryPreferences.tsx @@ -7,7 +7,7 @@ import TextField from '@mui/material/TextField'; import Typography from '@mui/material/Typography'; import React from 'react'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { DisplaySettingsValues } from './types'; interface LibraryPreferencesProps { diff --git a/src/apps/experimental/routes/user/display/LocalizationPreferences.tsx b/src/apps/experimental/routes/user/display/LocalizationPreferences.tsx index e406d0e38e..003fc0cae5 100644 --- a/src/apps/experimental/routes/user/display/LocalizationPreferences.tsx +++ b/src/apps/experimental/routes/user/display/LocalizationPreferences.tsx @@ -10,7 +10,7 @@ import React from 'react'; import { appHost } from 'components/apphost'; import datetime from 'scripts/datetime'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { DATE_LOCALE_OPTIONS, LANGUAGE_OPTIONS } from './constants'; import { DisplaySettingsValues } from './types'; diff --git a/src/apps/experimental/routes/user/display/NextUpPreferences.tsx b/src/apps/experimental/routes/user/display/NextUpPreferences.tsx index 1c21012a1f..5f98fe20b7 100644 --- a/src/apps/experimental/routes/user/display/NextUpPreferences.tsx +++ b/src/apps/experimental/routes/user/display/NextUpPreferences.tsx @@ -7,7 +7,7 @@ import TextField from '@mui/material/TextField'; import Typography from '@mui/material/Typography'; import React from 'react'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { DisplaySettingsValues } from './types'; interface NextUpPreferencesProps { diff --git a/src/apps/experimental/routes/user/display/constants.ts b/src/apps/experimental/routes/user/display/constants.ts index 7ece9aa9c7..8da8ba742d 100644 --- a/src/apps/experimental/routes/user/display/constants.ts +++ b/src/apps/experimental/routes/user/display/constants.ts @@ -1,4 +1,4 @@ -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; export const LANGUAGE_OPTIONS = [ { value: 'auto', label: globalize.translate('Auto') }, diff --git a/src/apps/experimental/routes/user/display/hooks/useDisplaySettingForm.ts b/src/apps/experimental/routes/user/display/hooks/useDisplaySettingForm.ts index 54a919eb84..431091f136 100644 --- a/src/apps/experimental/routes/user/display/hooks/useDisplaySettingForm.ts +++ b/src/apps/experimental/routes/user/display/hooks/useDisplaySettingForm.ts @@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react'; import { useSearchParams } from 'react-router-dom'; import toast from 'components/toast/toast'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { DisplaySettingsValues } from '../types'; import { useDisplaySettings } from './useDisplaySettings'; diff --git a/src/apps/experimental/routes/user/display/hooks/useScreensavers.ts b/src/apps/experimental/routes/user/display/hooks/useScreensavers.ts index 8d9342552c..ac609d37f2 100644 --- a/src/apps/experimental/routes/user/display/hooks/useScreensavers.ts +++ b/src/apps/experimental/routes/user/display/hooks/useScreensavers.ts @@ -2,7 +2,7 @@ import { useMemo } from 'react'; import { pluginManager } from 'components/pluginManager'; import { Plugin, PluginType } from 'types/plugin'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; export function useScreensavers() { const screensavers = useMemo(() => { diff --git a/src/apps/experimental/routes/user/display/index.tsx b/src/apps/experimental/routes/user/display/index.tsx index 61b55bc02c..d90e2ff192 100644 --- a/src/apps/experimental/routes/user/display/index.tsx +++ b/src/apps/experimental/routes/user/display/index.tsx @@ -4,7 +4,7 @@ import Stack from '@mui/material/Stack'; import React, { useCallback } from 'react'; import Page from 'components/Page'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { DisplayPreferences } from './DisplayPreferences'; import { ItemDetailPreferences } from './ItemDetailPreferences'; import { LibraryPreferences } from './LibraryPreferences'; diff --git a/src/apps/stable/routes/quickConnect/index.tsx b/src/apps/stable/routes/quickConnect/index.tsx index 8bff06c7ae..ecadec2312 100644 --- a/src/apps/stable/routes/quickConnect/index.tsx +++ b/src/apps/stable/routes/quickConnect/index.tsx @@ -3,7 +3,7 @@ import React, { FC, FormEvent, useCallback, useMemo, useState } from 'react'; import { Link, useSearchParams } from 'react-router-dom'; import Page from 'components/Page'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import InputElement from 'elements/InputElement'; import ButtonElement from 'elements/ButtonElement'; import { useApi } from 'hooks/useApi'; diff --git a/src/apps/stable/routes/search.tsx b/src/apps/stable/routes/search.tsx index 9682a3fc01..290ea60406 100644 --- a/src/apps/stable/routes/search.tsx +++ b/src/apps/stable/routes/search.tsx @@ -2,7 +2,7 @@ import React, { type FC, useEffect, useState } from 'react'; import { useSearchParams } from 'react-router-dom'; import { useDebounceValue } from 'usehooks-ts'; import { usePrevious } from 'hooks/usePrevious'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import Page from 'components/Page'; import SearchFields from 'components/search/SearchFields'; import SearchSuggestions from 'components/search/SearchSuggestions'; diff --git a/src/apps/stable/routes/user/userprofile.tsx b/src/apps/stable/routes/user/userprofile.tsx index 6ba8fee49b..ccd05d6ad6 100644 --- a/src/apps/stable/routes/user/userprofile.tsx +++ b/src/apps/stable/routes/user/userprofile.tsx @@ -4,7 +4,7 @@ import React, { FunctionComponent, useEffect, useState, useRef, useCallback } fr import { useSearchParams } from 'react-router-dom'; import Dashboard from '../../../../utils/dashboard'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import LibraryMenu from '../../../../scripts/libraryMenu'; import { appHost } from '../../../../components/apphost'; import confirm from '../../../../components/confirm/confirm'; diff --git a/src/components/ConfirmDialog.tsx b/src/components/ConfirmDialog.tsx index 0d7fe9fa35..08efb3dd2b 100644 --- a/src/components/ConfirmDialog.tsx +++ b/src/components/ConfirmDialog.tsx @@ -6,7 +6,7 @@ import DialogContentText from '@mui/material/DialogContentText/DialogContentText import DialogTitle from '@mui/material/DialogTitle/DialogTitle'; import React, { type FC } from 'react'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; interface ConfirmDialogProps extends DialogProps { confirmButtonColor?: 'inherit' | 'primary' | 'secondary' | 'success' | 'error' | 'info' | 'warning' diff --git a/src/components/ConnectionRequired.tsx b/src/components/ConnectionRequired.tsx index ad2577c5d1..e46a8e4ab3 100644 --- a/src/components/ConnectionRequired.tsx +++ b/src/components/ConnectionRequired.tsx @@ -6,7 +6,7 @@ import alert from './alert'; import { appRouter } from './router/appRouter'; import Loading from './loading/LoadingComponent'; import ServerConnections from './ServerConnections'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import { ConnectionState } from '../utils/jellyfin-apiclient/ConnectionState'; enum BounceRoutes { diff --git a/src/components/ServerContentPage.tsx b/src/components/ServerContentPage.tsx index aa3c180a1b..2880e9a303 100644 --- a/src/components/ServerContentPage.tsx +++ b/src/components/ServerContentPage.tsx @@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom'; import ServerConnections from './ServerConnections'; import viewManager from './viewManager/viewManager'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import type { RestoreViewFailResponse } from '../types/viewManager'; interface ServerContentPageProps { diff --git a/src/components/accessSchedule/accessSchedule.js b/src/components/accessSchedule/accessSchedule.js index 91b994c2ef..6a2193e30e 100644 --- a/src/components/accessSchedule/accessSchedule.js +++ b/src/components/accessSchedule/accessSchedule.js @@ -5,7 +5,7 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import datetime from '../../scripts/datetime'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-select/emby-select'; import '../../elements/emby-button/paper-icon-button-light'; import '../formdialog.scss'; diff --git a/src/components/actionSheet/actionSheet.ts b/src/components/actionSheet/actionSheet.ts index c461fee50e..54bf0804df 100644 --- a/src/components/actionSheet/actionSheet.ts +++ b/src/components/actionSheet/actionSheet.ts @@ -1,7 +1,7 @@ import escapeHtml from 'escape-html'; import dialogHelper from '../dialogHelper/dialogHelper'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import dom from '../../scripts/dom'; import '../../elements/emby-button/emby-button'; import './actionSheet.scss'; diff --git a/src/components/activitylog.js b/src/components/activitylog.js index fc9a5a9fe6..36f17c8809 100644 --- a/src/components/activitylog.js +++ b/src/components/activitylog.js @@ -1,6 +1,6 @@ import escapeHtml from 'escape-html'; import Events from '../utils/events.ts'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import dom from '../scripts/dom'; import { formatRelative } from 'date-fns'; import serverNotifications from '../scripts/serverNotifications'; diff --git a/src/components/alert.js b/src/components/alert.js index ebeed3d8fd..b40beb8e54 100644 --- a/src/components/alert.js +++ b/src/components/alert.js @@ -1,7 +1,7 @@ import { appRouter } from './router/appRouter'; import browser from '../scripts/browser'; import dialog from './dialog/dialog'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; export default async function (text, title) { // Modals seem to be blocked on Web OS and Tizen 2.x diff --git a/src/components/alphaPicker/alphaPicker.js b/src/components/alphaPicker/alphaPicker.js index a90e9a08a6..f787f0e6db 100644 --- a/src/components/alphaPicker/alphaPicker.js +++ b/src/components/alphaPicker/alphaPicker.js @@ -6,7 +6,7 @@ import focusManager from '../focusManager'; import layoutManager from '../layoutManager'; import dom from '../../scripts/dom'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import './style.scss'; import '../../elements/emby-button/paper-icon-button-light'; import 'material-design-icons-iconfont'; diff --git a/src/components/apphost.js b/src/components/apphost.js index bbfebdf81e..c99d9c72ec 100644 --- a/src/components/apphost.js +++ b/src/components/apphost.js @@ -3,7 +3,7 @@ import browser from '../scripts/browser'; import Events from '../utils/events.ts'; import * as htmlMediaHelper from '../components/htmlMediaHelper'; import * as webSettings from '../scripts/settings/webSettings'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import profileBuilder from '../scripts/browserDeviceProfile'; const appName = 'Jellyfin Web'; diff --git a/src/components/cardbuilder/Card/cardHelper.ts b/src/components/cardbuilder/Card/cardHelper.ts index 78af3b0ff9..e836abba3f 100644 --- a/src/components/cardbuilder/Card/cardHelper.ts +++ b/src/components/cardbuilder/Card/cardHelper.ts @@ -10,7 +10,7 @@ import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api'; import { appRouter } from 'components/router/appRouter'; import layoutManager from 'components/layoutManager'; import itemHelper from 'components/itemHelper'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import datetime from 'scripts/datetime'; import { isUsingLiveTvNaming } from '../cardBuilderUtils'; diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 6e8e45607e..70dccf6db6 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -10,7 +10,7 @@ import escapeHtml from 'escape-html'; import browser from 'scripts/browser'; import datetime from 'scripts/datetime'; import dom from 'scripts/dom'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card'; import imageHelper from 'utils/image'; diff --git a/src/components/channelMapper/channelMapper.js b/src/components/channelMapper/channelMapper.js index a513d4ac03..762ca0b750 100644 --- a/src/components/channelMapper/channelMapper.js +++ b/src/components/channelMapper/channelMapper.js @@ -2,7 +2,7 @@ import escapeHtml from 'escape-html'; import dom from '../../scripts/dom'; import dialogHelper from '../dialogHelper/dialogHelper'; import loading from '../loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import actionsheet from '../actionSheet/actionSheet'; import '../../elements/emby-input/emby-input'; import '../../elements/emby-button/paper-icon-button-light'; diff --git a/src/components/collectionEditor/collectionEditor.js b/src/components/collectionEditor/collectionEditor.js index 455f5f25ea..703c60df74 100644 --- a/src/components/collectionEditor/collectionEditor.js +++ b/src/components/collectionEditor/collectionEditor.js @@ -4,7 +4,7 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import loading from '../loading/loading'; import layoutManager from '../layoutManager'; import { appRouter } from '../router/appRouter'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-button/emby-button'; import '../../elements/emby-button/paper-icon-button-light'; import '../../elements/emby-checkbox/emby-checkbox'; diff --git a/src/components/common/InfoIconButton.tsx b/src/components/common/InfoIconButton.tsx index deefa0628b..0d1788c5f3 100644 --- a/src/components/common/InfoIconButton.tsx +++ b/src/components/common/InfoIconButton.tsx @@ -1,7 +1,7 @@ import React, { type FC } from 'react'; import IconButton from '@mui/material/IconButton'; import InfoIcon from '@mui/icons-material/Info'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; interface InfoIconButtonProps { className?: string; diff --git a/src/components/common/MoreVertIconButton.tsx b/src/components/common/MoreVertIconButton.tsx index c0a77088c5..bd42a2732d 100644 --- a/src/components/common/MoreVertIconButton.tsx +++ b/src/components/common/MoreVertIconButton.tsx @@ -1,7 +1,7 @@ import React, { type FC } from 'react'; import IconButton from '@mui/material/IconButton'; import MoreVertIcon from '@mui/icons-material/MoreVert'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; interface MoreVertIconButtonProps { className?: string; diff --git a/src/components/common/NoItemsMessage.tsx b/src/components/common/NoItemsMessage.tsx index 88f288c144..1098039e55 100644 --- a/src/components/common/NoItemsMessage.tsx +++ b/src/components/common/NoItemsMessage.tsx @@ -1,7 +1,7 @@ import React, { type FC } from 'react'; import Box from '@mui/material/Box'; import Typography from '@mui/material/Typography'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; interface NoItemsMessageProps { noItemsMessage?: string; diff --git a/src/components/common/PlayArrowIconButton.tsx b/src/components/common/PlayArrowIconButton.tsx index d7ca732966..18eb37169b 100644 --- a/src/components/common/PlayArrowIconButton.tsx +++ b/src/components/common/PlayArrowIconButton.tsx @@ -1,7 +1,7 @@ import React, { type FC } from 'react'; import IconButton from '@mui/material/IconButton'; import PlayArrowIcon from '@mui/icons-material/PlayArrow'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; interface PlayArrowIconButtonProps { className: string; diff --git a/src/components/common/PlaylistAddIconButton.tsx b/src/components/common/PlaylistAddIconButton.tsx index 14fb2a83cd..481e1ee094 100644 --- a/src/components/common/PlaylistAddIconButton.tsx +++ b/src/components/common/PlaylistAddIconButton.tsx @@ -1,7 +1,7 @@ import React, { type FC } from 'react'; import IconButton from '@mui/material/IconButton'; import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; interface PlaylistAddIconButtonProps { className?: string; diff --git a/src/components/confirm/confirm.js b/src/components/confirm/confirm.js index 7ab5ff219a..4259140a3e 100644 --- a/src/components/confirm/confirm.js +++ b/src/components/confirm/confirm.js @@ -1,7 +1,7 @@ import { appRouter } from '../router/appRouter'; import browser from '../../scripts/browser'; import dialog from '../dialog/dialog'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; function useNativeConfirm() { // webOS seems to block modals diff --git a/src/components/dashboard/users/AccessContainer.tsx b/src/components/dashboard/users/AccessContainer.tsx index bc73a579d3..592d96d543 100644 --- a/src/components/dashboard/users/AccessContainer.tsx +++ b/src/components/dashboard/users/AccessContainer.tsx @@ -1,5 +1,5 @@ import React, { type FC, type PropsWithChildren } from 'react'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import CheckBoxElement from '../../../elements/CheckBoxElement'; interface AccessContainerProps { diff --git a/src/components/dashboard/users/AccessScheduleList.tsx b/src/components/dashboard/users/AccessScheduleList.tsx index 0b9c522645..7303ec7e50 100644 --- a/src/components/dashboard/users/AccessScheduleList.tsx +++ b/src/components/dashboard/users/AccessScheduleList.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent } from 'react'; import datetime from '../../../scripts/datetime'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import IconButtonElement from '../../../elements/IconButtonElement'; type AccessScheduleListProps = { diff --git a/src/components/dashboard/users/LinkEditUserPreferences.tsx b/src/components/dashboard/users/LinkEditUserPreferences.tsx index fd272fd770..bc44f458f3 100644 --- a/src/components/dashboard/users/LinkEditUserPreferences.tsx +++ b/src/components/dashboard/users/LinkEditUserPreferences.tsx @@ -1,5 +1,5 @@ import React, { FunctionComponent } from 'react'; -import globalize from '../../../scripts/globalize'; +import globalize from 'lib/globalize'; type IProps = { title?: string; diff --git a/src/components/dashboard/users/SectionTabs.tsx b/src/components/dashboard/users/SectionTabs.tsx index 1befb5912b..26076390ae 100644 --- a/src/components/dashboard/users/SectionTabs.tsx +++ b/src/components/dashboard/users/SectionTabs.tsx @@ -1,5 +1,5 @@ import React, { FunctionComponent } from 'react'; -import globalize from '../../../scripts/globalize'; +import globalize from 'lib/globalize'; type IProps = { activeTab: string; diff --git a/src/components/dashboard/users/UserCardBox.tsx b/src/components/dashboard/users/UserCardBox.tsx index 8046be24ef..3f0897672a 100644 --- a/src/components/dashboard/users/UserCardBox.tsx +++ b/src/components/dashboard/users/UserCardBox.tsx @@ -2,7 +2,7 @@ import type { UserDto } from '@jellyfin/sdk/lib/generated-client'; import React, { FunctionComponent } from 'react'; import { formatDistanceToNow } from 'date-fns'; import { getLocaleWithSuffix } from '../../../utils/dateFnsLocale'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import IconButtonElement from '../../../elements/IconButtonElement'; import escapeHTML from 'escape-html'; import { getDefaultBackgroundClass } from '../../cardbuilder/cardBuilderUtils'; diff --git a/src/components/dashboard/users/UserPasswordForm.tsx b/src/components/dashboard/users/UserPasswordForm.tsx index f8eda44958..090f3377a5 100644 --- a/src/components/dashboard/users/UserPasswordForm.tsx +++ b/src/components/dashboard/users/UserPasswordForm.tsx @@ -1,6 +1,6 @@ import React, { FunctionComponent, useCallback, useEffect, useRef } from 'react'; import Dashboard from '../../../utils/dashboard'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import LibraryMenu from '../../../scripts/libraryMenu'; import confirm from '../../confirm/confirm'; import loading from '../../loading/loading'; diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js index 3e285514e1..48d6842a4a 100644 --- a/src/components/dialog/dialog.js +++ b/src/components/dialog/dialog.js @@ -4,7 +4,7 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import dom from '../../scripts/dom'; import layoutManager from '../layoutManager'; import scrollHelper from '../../scripts/scrollHelper'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import 'material-design-icons-iconfont'; import '../../elements/emby-button/emby-button'; import '../../elements/emby-button/paper-icon-button-light'; diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js index 4a9119266b..a652e6ae41 100644 --- a/src/components/directorybrowser/directorybrowser.js +++ b/src/components/directorybrowser/directorybrowser.js @@ -2,7 +2,7 @@ import escapeHtml from 'escape-html'; import loading from '../loading/loading'; import dialogHelper from '../dialogHelper/dialogHelper'; import dom from '../../scripts/dom'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../listview/listview.scss'; import '../../elements/emby-input/emby-input'; import '../../elements/emby-button/paper-icon-button-light'; diff --git a/src/components/displaySettings/displaySettings.js b/src/components/displaySettings/displaySettings.js index 99c1ab3e2c..5ecae5a69a 100644 --- a/src/components/displaySettings/displaySettings.js +++ b/src/components/displaySettings/displaySettings.js @@ -5,7 +5,7 @@ import { pluginManager } from '../pluginManager'; import { appHost } from '../apphost'; import focusManager from '../focusManager'; import datetime from '../../scripts/datetime'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import loading from '../loading/loading'; import skinManager from '../../scripts/themeManager'; import { PluginType } from '../../types/plugin.ts'; diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js index 25d1875f7a..8a1b5c4738 100644 --- a/src/components/favoriteitems.js +++ b/src/components/favoriteitems.js @@ -1,5 +1,5 @@ import dom from 'scripts/dom'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card'; import { getParameterByName } from 'utils/url'; diff --git a/src/components/filterdialog/filterdialog.js b/src/components/filterdialog/filterdialog.js index 31773716e3..47ebbab77f 100644 --- a/src/components/filterdialog/filterdialog.js +++ b/src/components/filterdialog/filterdialog.js @@ -1,6 +1,6 @@ import dom from '../../scripts/dom'; import dialogHelper from '../dialogHelper/dialogHelper'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Events from '../../utils/events.ts'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-collapse/emby-collapse'; diff --git a/src/components/filtermenu/filtermenu.js b/src/components/filtermenu/filtermenu.js index 7d3e785d19..5d7609f9f9 100644 --- a/src/components/filtermenu/filtermenu.js +++ b/src/components/filtermenu/filtermenu.js @@ -4,7 +4,7 @@ import focusManager from '../focusManager'; import dialogHelper from '../dialogHelper/dialogHelper'; import inputManager from '../../scripts/inputManager'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import * as userSettings from '../../scripts/settings/userSettings'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-input/emby-input'; diff --git a/src/components/guide/guide-settings.js b/src/components/guide/guide-settings.js index b8492d1448..1a68aa35fe 100644 --- a/src/components/guide/guide-settings.js +++ b/src/components/guide/guide-settings.js @@ -1,5 +1,5 @@ import dialogHelper from '../dialogHelper/dialogHelper'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import * as userSettings from '../../scripts/settings/userSettings'; import layoutManager from '../layoutManager'; import scrollHelper from '../../scripts/scrollHelper'; diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js index 97c8bff2c1..a56ae355f4 100644 --- a/src/components/guide/guide.js +++ b/src/components/guide/guide.js @@ -1,7 +1,7 @@ import escapeHtml from 'escape-html'; import inputManager from '../../scripts/inputManager'; import browser from '../../scripts/browser'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Events from '../../utils/events.ts'; import scrollHelper from '../../scripts/scrollHelper'; import serverNotifications from '../../scripts/serverNotifications'; diff --git a/src/components/homeScreenSettings/homeScreenSettings.js b/src/components/homeScreenSettings/homeScreenSettings.js index e7bc741fe0..338a484dfd 100644 --- a/src/components/homeScreenSettings/homeScreenSettings.js +++ b/src/components/homeScreenSettings/homeScreenSettings.js @@ -7,7 +7,7 @@ import { queryClient } from 'utils/query/queryClient'; import layoutManager from '../layoutManager'; import focusManager from '../focusManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import loading from '../loading/loading'; import Events from '../../utils/events.ts'; import homeSections from '../homesections/homesections'; diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index c0dd8f1676..3f363fee0f 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -1,6 +1,6 @@ import layoutManager from 'components/layoutManager'; import { getUserViewsQuery } from 'hooks/useUserViews'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { DEFAULT_SECTIONS, HomeSectionType } from 'types/homeSectionType'; import Dashboard from 'utils/dashboard'; import { toApi } from 'utils/jellyfin-apiclient/compat'; diff --git a/src/components/homesections/sections/activeRecordings.ts b/src/components/homesections/sections/activeRecordings.ts index a06869837c..45989f2989 100644 --- a/src/components/homesections/sections/activeRecordings.ts +++ b/src/components/homesections/sections/activeRecordings.ts @@ -3,7 +3,7 @@ import type { ApiClient } from 'jellyfin-apiclient'; import ServerConnections from 'components/ServerConnections'; import cardBuilder from 'components/cardbuilder/cardBuilder'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import type { SectionContainerElement, SectionOptions } from './section'; diff --git a/src/components/homesections/sections/libraryButtons.ts b/src/components/homesections/sections/libraryButtons.ts index fc5c481663..7b06b55e8e 100644 --- a/src/components/homesections/sections/libraryButtons.ts +++ b/src/components/homesections/sections/libraryButtons.ts @@ -3,7 +3,7 @@ import escapeHtml from 'escape-html'; import imageLoader from 'components/images/imageLoader'; import { appRouter } from 'components/router/appRouter'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import imageHelper from 'utils/image'; function getLibraryButtonsHtml(items: BaseItemDto[]) { diff --git a/src/components/homesections/sections/libraryTiles.ts b/src/components/homesections/sections/libraryTiles.ts index 6ccfc528c5..f1e977e664 100644 --- a/src/components/homesections/sections/libraryTiles.ts +++ b/src/components/homesections/sections/libraryTiles.ts @@ -2,7 +2,7 @@ import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client/models/base import cardBuilder from 'components/cardbuilder/cardBuilder'; import imageLoader from 'components/images/imageLoader'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { getBackdropShape } from 'utils/card'; import type { SectionOptions } from './section'; diff --git a/src/components/homesections/sections/liveTv.ts b/src/components/homesections/sections/liveTv.ts index 7c8606c12b..e09f812fd6 100644 --- a/src/components/homesections/sections/liveTv.ts +++ b/src/components/homesections/sections/liveTv.ts @@ -6,7 +6,7 @@ import { appRouter } from 'components/router/appRouter'; import cardBuilder from 'components/cardbuilder/cardBuilder'; import layoutManager from 'components/layoutManager'; import ServerConnections from 'components/ServerConnections'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { getBackdropShape } from 'utils/card'; import type { SectionContainerElement, SectionOptions } from './section'; diff --git a/src/components/homesections/sections/nextUp.ts b/src/components/homesections/sections/nextUp.ts index e863cf274a..fbf1443e2b 100644 --- a/src/components/homesections/sections/nextUp.ts +++ b/src/components/homesections/sections/nextUp.ts @@ -5,7 +5,7 @@ import cardBuilder from 'components/cardbuilder/cardBuilder'; import layoutManager from 'components/layoutManager'; import { appRouter } from 'components/router/appRouter'; import ServerConnections from 'components/ServerConnections'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import type { UserSettings } from 'scripts/settings/userSettings'; import { getBackdropShape } from 'utils/card'; diff --git a/src/components/homesections/sections/recentlyAdded.ts b/src/components/homesections/sections/recentlyAdded.ts index 30d3743ae1..27d16d161a 100644 --- a/src/components/homesections/sections/recentlyAdded.ts +++ b/src/components/homesections/sections/recentlyAdded.ts @@ -7,7 +7,7 @@ import type { ApiClient } from 'jellyfin-apiclient'; import layoutManager from 'components/layoutManager'; import { appRouter } from 'components/router/appRouter'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import ServerConnections from 'components/ServerConnections'; import cardBuilder from 'components/cardbuilder/cardBuilder'; import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card'; diff --git a/src/components/homesections/sections/resume.ts b/src/components/homesections/sections/resume.ts index a38dcc1c80..249cad2d0d 100644 --- a/src/components/homesections/sections/resume.ts +++ b/src/components/homesections/sections/resume.ts @@ -4,7 +4,7 @@ import type { ApiClient } from 'jellyfin-apiclient'; import ServerConnections from 'components/ServerConnections'; import cardBuilder from 'components/cardbuilder/cardBuilder'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import type { UserSettings } from 'scripts/settings/userSettings'; import { getBackdropShape, getPortraitShape } from 'utils/card'; diff --git a/src/components/imageDownloader/imageDownloader.js b/src/components/imageDownloader/imageDownloader.js index 380803d664..cd05ec57e9 100644 --- a/src/components/imageDownloader/imageDownloader.js +++ b/src/components/imageDownloader/imageDownloader.js @@ -6,7 +6,7 @@ import imageLoader from '../images/imageLoader'; import browser from '../../scripts/browser'; import layoutManager from '../layoutManager'; import scrollHelper from '../../scripts/scrollHelper'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-button/paper-icon-button-light'; import '../../elements/emby-button/emby-button'; diff --git a/src/components/imageOptionsEditor/imageOptionsEditor.js b/src/components/imageOptionsEditor/imageOptionsEditor.js index 6e9d63166c..09eeacefef 100644 --- a/src/components/imageOptionsEditor/imageOptionsEditor.js +++ b/src/components/imageOptionsEditor/imageOptionsEditor.js @@ -4,7 +4,7 @@ * @module components/imageOptionsEditor/imageOptionsEditor */ -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import dom from '../../scripts/dom'; import dialogHelper from '../dialogHelper/dialogHelper'; import '../../elements/emby-checkbox/emby-checkbox'; diff --git a/src/components/imageUploader/imageUploader.js b/src/components/imageUploader/imageUploader.js index c016075ba2..ff07de1553 100644 --- a/src/components/imageUploader/imageUploader.js +++ b/src/components/imageUploader/imageUploader.js @@ -9,7 +9,7 @@ import dom from '../../scripts/dom'; import loading from '../loading/loading'; import scrollHelper from '../../scripts/scrollHelper'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-button/emby-button'; import '../../elements/emby-select/emby-select'; import '../formdialog.scss'; diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index 9e7a9d5710..8d1134c7c0 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -3,7 +3,7 @@ import loading from '../loading/loading'; import dom from '../../scripts/dom'; import layoutManager from '../layoutManager'; import focusManager from '../focusManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import scrollHelper from '../../scripts/scrollHelper'; import imageLoader from '../images/imageLoader'; import browser from '../../scripts/browser'; diff --git a/src/components/itemContextMenu.js b/src/components/itemContextMenu.js index fe0f063682..3e71c2a25f 100644 --- a/src/components/itemContextMenu.js +++ b/src/components/itemContextMenu.js @@ -1,7 +1,7 @@ import browser from '../scripts/browser'; import { copy } from '../scripts/clipboard'; import dom from '../scripts/dom'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import actionsheet from './actionSheet/actionSheet'; import { appHost } from './apphost'; import { appRouter } from './router/appRouter'; diff --git a/src/components/itemHelper.js b/src/components/itemHelper.js index 498a8bab80..df31167860 100644 --- a/src/components/itemHelper.js +++ b/src/components/itemHelper.js @@ -1,5 +1,5 @@ import { appHost } from './apphost'; -import globalize from '../scripts/globalize'; +import globalize from 'lib/globalize'; import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type'; import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind'; import { LocationType } from '@jellyfin/sdk/lib/generated-client/models/location-type'; diff --git a/src/components/itemMediaInfo/itemMediaInfo.js b/src/components/itemMediaInfo/itemMediaInfo.js index 0049163411..517c25dafa 100644 --- a/src/components/itemMediaInfo/itemMediaInfo.js +++ b/src/components/itemMediaInfo/itemMediaInfo.js @@ -10,7 +10,7 @@ import layoutManager from '../layoutManager'; import toast from '../toast/toast'; import { copy } from '../../scripts/clipboard'; import dom from '../../scripts/dom'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import itemHelper from '../../components/itemHelper'; import loading from '../loading/loading'; import '../../elements/emby-select/emby-select'; diff --git a/src/components/itemidentifier/itemidentifier.js b/src/components/itemidentifier/itemidentifier.js index a999f11086..506c1c284a 100644 --- a/src/components/itemidentifier/itemidentifier.js +++ b/src/components/itemidentifier/itemidentifier.js @@ -7,7 +7,7 @@ import escapeHtml from 'escape-html'; import dialogHelper from '../dialogHelper/dialogHelper'; import loading from '../loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import scrollHelper from '../../scripts/scrollHelper'; import layoutManager from '../layoutManager'; import focusManager from '../focusManager'; diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js index de70c1c1a9..fd726d4150 100644 --- a/src/components/libraryoptionseditor/libraryoptionseditor.js +++ b/src/components/libraryoptionseditor/libraryoptionseditor.js @@ -7,7 +7,7 @@ import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type'; import escapeHtml from 'escape-html'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import dom from '../../scripts/dom'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-select/emby-select'; diff --git a/src/components/listview/List/listHelper.ts b/src/components/listview/List/listHelper.ts index c27a073ef0..e9c05f6648 100644 --- a/src/components/listview/List/listHelper.ts +++ b/src/components/listview/List/listHelper.ts @@ -1,7 +1,7 @@ import { Api } from '@jellyfin/sdk'; import { BaseItemKind, ImageType } from '@jellyfin/sdk/lib/generated-client'; import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import type { ItemDto } from 'types/base/models/item-dto'; import type { ListOptions } from 'types/listOptions'; diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js index cd5fcf922e..8240ee047b 100644 --- a/src/components/listview/listview.js +++ b/src/components/listview/listview.js @@ -9,7 +9,7 @@ import itemHelper from '../itemHelper'; import mediaInfo from '../mediainfo/mediainfo'; import indicators from '../indicators/indicators'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import datetime from '../../scripts/datetime'; import cardBuilder from '../cardbuilder/cardBuilder'; import './listview.scss'; diff --git a/src/components/mediaLibraryCreator/mediaLibraryCreator.js b/src/components/mediaLibraryCreator/mediaLibraryCreator.js index 1fd2a9aede..8707a0ba29 100644 --- a/src/components/mediaLibraryCreator/mediaLibraryCreator.js +++ b/src/components/mediaLibraryCreator/mediaLibraryCreator.js @@ -10,7 +10,7 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import dom from '../../scripts/dom'; import 'jquery'; import libraryoptionseditor from '../libraryoptionseditor/libraryoptionseditor'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-button/emby-button'; import '../../elements/emby-button/paper-icon-button-light'; import '../../elements/emby-input/emby-input'; diff --git a/src/components/mediaLibraryEditor/mediaLibraryEditor.js b/src/components/mediaLibraryEditor/mediaLibraryEditor.js index 00c2961b4e..215fb7b3a3 100644 --- a/src/components/mediaLibraryEditor/mediaLibraryEditor.js +++ b/src/components/mediaLibraryEditor/mediaLibraryEditor.js @@ -10,7 +10,7 @@ import loading from '../loading/loading'; import dialogHelper from '../dialogHelper/dialogHelper'; import dom from '../../scripts/dom'; import libraryoptionseditor from '../libraryoptionseditor/libraryoptionseditor'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-button/emby-button'; import '../listview/listview.scss'; import '../../elements/emby-button/paper-icon-button-light'; diff --git a/src/components/mediainfo/EndsAt.tsx b/src/components/mediainfo/EndsAt.tsx index 373e9817d7..fa26d0801f 100644 --- a/src/components/mediainfo/EndsAt.tsx +++ b/src/components/mediainfo/EndsAt.tsx @@ -2,7 +2,7 @@ import React, { type FC } from 'react'; import classNames from 'classnames'; import Box from '@mui/material/Box'; import datetime from 'scripts/datetime'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; interface EndsAtProps { className?: string; diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js index a6bfcf7153..2fdc5d09bf 100644 --- a/src/components/mediainfo/mediainfo.js +++ b/src/components/mediainfo/mediainfo.js @@ -1,6 +1,6 @@ import escapeHtml from 'escape-html'; import datetime from '../../scripts/datetime'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import { appRouter } from '../router/appRouter'; import itemHelper from '../itemHelper'; import indicators from '../indicators/indicators'; diff --git a/src/components/mediainfo/usePrimaryMediaInfo.tsx b/src/components/mediainfo/usePrimaryMediaInfo.tsx index d41eea0ec3..0b5d60968a 100644 --- a/src/components/mediainfo/usePrimaryMediaInfo.tsx +++ b/src/components/mediainfo/usePrimaryMediaInfo.tsx @@ -1,7 +1,7 @@ import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind'; import * as userSettings from 'scripts/settings/userSettings'; import datetime from 'scripts/datetime'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import itemHelper from '../itemHelper'; import type { NullableNumber, NullableString } from 'types/base/common/shared/types'; import type { ItemDto } from 'types/base/models/item-dto'; diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js index 02723463cf..1415bdd993 100644 --- a/src/components/metadataEditor/metadataEditor.js +++ b/src/components/metadataEditor/metadataEditor.js @@ -5,7 +5,7 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import datetime from '../../scripts/datetime'; import loading from '../loading/loading'; import focusManager from '../focusManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-input/emby-input'; import '../../elements/emby-select/emby-select'; diff --git a/src/components/metadataEditor/personEditor.js b/src/components/metadataEditor/personEditor.js index 823eef7289..84431c7f84 100644 --- a/src/components/metadataEditor/personEditor.js +++ b/src/components/metadataEditor/personEditor.js @@ -1,7 +1,7 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import { PersonKind } from '@jellyfin/sdk/lib/generated-client'; import '../../elements/emby-button/paper-icon-button-light'; import '../../elements/emby-input/emby-input'; diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js index a57b647a87..ce3d88f934 100644 --- a/src/components/multiSelect/multiSelect.js +++ b/src/components/multiSelect/multiSelect.js @@ -1,7 +1,7 @@ import browser from '../../scripts/browser'; import { appHost } from '../apphost'; import loading from '../loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import dom from '../../scripts/dom'; import './multiSelect.scss'; import ServerConnections from '../ServerConnections'; diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index 1e4d38b489..c9b7ae157f 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -1,7 +1,7 @@ import serverNotifications from '../../scripts/serverNotifications'; import { playbackManager } from '../playback/playbackmanager'; import Events from '../../utils/events.ts'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import { getItems } from '../../utils/jellyfin-apiclient/getItems.ts'; import ServerConnections from '../../components/ServerConnections'; diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js index b73ce0d888..4140fcf50b 100644 --- a/src/components/nowPlayingBar/nowPlayingBar.js +++ b/src/components/nowPlayingBar/nowPlayingBar.js @@ -7,7 +7,7 @@ import { playbackManager } from '../playback/playbackmanager'; import nowPlayingHelper from '../playback/nowplayinghelper'; import { appHost } from '../apphost'; import dom from '../../scripts/dom'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import itemContextMenu from '../itemContextMenu'; import '../../elements/emby-button/paper-icon-button-light'; import '../../elements/emby-ratingbutton/emby-ratingbutton'; diff --git a/src/components/packageManager.js b/src/components/packageManager.js deleted file mode 100644 index b4b7edcf72..0000000000 --- a/src/components/packageManager.js +++ /dev/null @@ -1,137 +0,0 @@ -import appSettings from '../scripts/settings/appSettings'; -import { pluginManager } from './pluginManager'; - -class PackageManager { - #packagesList = []; - #settingsKey = 'installedpackages1'; - - init() { - console.groupCollapsed('loading packages'); - const manifestUrls = JSON.parse(appSettings.get(this.#settingsKey) || '[]'); - - return Promise.all(manifestUrls.map((url) => { - return this.loadPackage(url); - })) - .then(() => { - console.debug('finished loading packages'); - return Promise.resolve(); - }) - .catch(() => { - return Promise.resolve(); - }).finally(() => { - console.groupEnd('loading packages'); - }); - } - - get packages() { - return this.#packagesList.slice(0); - } - - install(url) { - return this.loadPackage(url, true).then((pkg) => { - const manifestUrls = JSON.parse(appSettings.get(this.#settingsKey) || '[]'); - - if (!manifestUrls.includes(url)) { - manifestUrls.push(url); - appSettings.set(this.#settingsKey, JSON.stringify(manifestUrls)); - } - - return pkg; - }); - } - - uninstall(name) { - const pkg = this.#packagesList.filter((p) => { - return p.name === name; - })[0]; - - if (pkg) { - this.#packagesList = this.#packagesList.filter((p) => { - return p.name !== name; - }); - - this.removeUrl(pkg.url); - } - - return Promise.resolve(); - } - - mapPath(pkg, pluginUrl) { - const urlLower = pluginUrl.toLowerCase(); - if (urlLower.startsWith('http:') || urlLower.startsWith('https:') || urlLower.startsWith('file:')) { - return pluginUrl; - } - - let packageUrl = pkg.url; - packageUrl = packageUrl.substring(0, packageUrl.lastIndexOf('/')); - - packageUrl += '/'; - packageUrl += pluginUrl; - - return packageUrl; - } - - addPackage(pkg) { - this.#packagesList = this.#packagesList.filter((p) => { - return p.name !== pkg.name; - }); - - this.#packagesList.push(pkg); - } - - removeUrl(url) { - let manifestUrls = JSON.parse(appSettings.get(this.#settingsKey) || '[]'); - - manifestUrls = manifestUrls.filter((i) => { - return i !== url; - }); - - appSettings.set(this.#settingsKey, JSON.stringify(manifestUrls)); - } - - loadPackage(url, throwError = false) { - return new Promise((resolve, reject) => { - const xhr = new XMLHttpRequest(); - const originalUrl = url; - url += url.indexOf('?') === -1 ? '?' : '&'; - url += 't=' + new Date().getTime(); - - xhr.open('GET', url, true); - - const onError = () => { - if (throwError === true) { - reject(); - } else { - this.removeUrl(originalUrl); - resolve(); - } - }; - - xhr.onload = () => { - if (this.status < 400) { - const pkg = JSON.parse(this.response); - pkg.url = originalUrl; - - this.addPackage(pkg); - - const plugins = pkg.plugins || []; - if (pkg.plugin) { - plugins.push(pkg.plugin); - } - const promises = plugins.map((pluginUrl) => { - return pluginManager.loadPlugin(this.mapPath(pkg, pluginUrl)); - }); - Promise.all(promises).then(resolve, resolve); - } else { - onError(); - } - }; - - xhr.onerror = onError; - - xhr.send(); - }); - } -} - -export default new PackageManager(); diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js index 9d2c3abbd9..72fa188c42 100644 --- a/src/components/playback/playbackmanager.js +++ b/src/components/playback/playbackmanager.js @@ -9,7 +9,7 @@ import itemHelper from '../itemHelper'; import { pluginManager } from '../pluginManager'; import PlayQueueManager from './playqueuemanager'; import * as userSettings from '../../scripts/settings/userSettings'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import loading from '../loading/loading'; import { appHost } from '../apphost'; import ServerConnections from '../ServerConnections'; diff --git a/src/components/playback/playerSelectionMenu.js b/src/components/playback/playerSelectionMenu.js index 1e57b30442..36de970a82 100644 --- a/src/components/playback/playerSelectionMenu.js +++ b/src/components/playback/playerSelectionMenu.js @@ -4,7 +4,7 @@ import loading from '../loading/loading'; import { playbackManager } from '../playback/playbackmanager'; import { pluginManager } from '../pluginManager'; import { appRouter } from '../router/appRouter'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import { appHost } from '../apphost'; import { enable, isEnabled } from '../../scripts/autocast'; import '../../elements/emby-checkbox/emby-checkbox'; diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js index 9f9f54d56b..1587bf6fd0 100644 --- a/src/components/playback/playersettingsmenu.js +++ b/src/components/playback/playersettingsmenu.js @@ -1,6 +1,6 @@ import actionsheet from '../actionSheet/actionSheet'; import { playbackManager } from '../playback/playbackmanager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import qualityoptions from '../qualityOptions'; import ServerConnections from '../ServerConnections'; diff --git a/src/components/playbackSettings/playbackSettings.js b/src/components/playbackSettings/playbackSettings.js index ba418b96c4..64fab0a7e9 100644 --- a/src/components/playbackSettings/playbackSettings.js +++ b/src/components/playbackSettings/playbackSettings.js @@ -2,7 +2,7 @@ import appSettings from '../../scripts/settings/appSettings'; import { appHost } from '../apphost'; import focusManager from '../focusManager'; import qualityoptions from '../qualityOptions'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import loading from '../loading/loading'; import Events from '../../utils/events.ts'; import '../../elements/emby-select/emby-select'; diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js index 79f5df5d49..39fd66dc54 100644 --- a/src/components/playerstats/playerstats.js +++ b/src/components/playerstats/playerstats.js @@ -1,5 +1,5 @@ import '../../elements/emby-button/paper-icon-button-light'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Events from '../../utils/events.ts'; import layoutManager from '../layoutManager'; import { playbackManager } from '../playback/playbackmanager'; diff --git a/src/components/playlisteditor/playlisteditor.ts b/src/components/playlisteditor/playlisteditor.ts index 46100472c2..620a8a7c85 100644 --- a/src/components/playlisteditor/playlisteditor.ts +++ b/src/components/playlisteditor/playlisteditor.ts @@ -6,7 +6,7 @@ import escapeHtml from 'escape-html'; import toast from 'components/toast/toast'; import dom from 'scripts/dom'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { currentSettings as userSettings } from 'scripts/settings/userSettings'; import { PluginType } from 'types/plugin'; import { toApi } from 'utils/jellyfin-apiclient/compat'; diff --git a/src/components/playmenu.js b/src/components/playmenu.js index 412c5375e0..db8bc5287d 100644 --- a/src/components/playmenu.js +++ b/src/components/playmenu.js @@ -1,7 +1,7 @@ import actionsheet from './actionSheet/actionSheet'; import datetime from '../scripts/datetime'; import { playbackManager } from './playback/playbackmanager'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; export function show(options) { const item = options.item; diff --git a/src/components/pluginManager.js b/src/components/pluginManager.js index 847e2bc579..ce42c806d0 100644 --- a/src/components/pluginManager.js +++ b/src/components/pluginManager.js @@ -1,5 +1,5 @@ import Events from '../utils/events.ts'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import loading from './loading/loading'; import appSettings from '../scripts/settings/appSettings'; import { playbackManager } from './playback/playbackmanager'; diff --git a/src/components/prompt/prompt.js b/src/components/prompt/prompt.js index 54b6e338fe..0812b76106 100644 --- a/src/components/prompt/prompt.js +++ b/src/components/prompt/prompt.js @@ -2,7 +2,7 @@ import browser from '../../scripts/browser'; import dialogHelper from '../dialogHelper/dialogHelper'; import layoutManager from '../layoutManager'; import scrollHelper from '../../scripts/scrollHelper'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import dom from '../../scripts/dom'; import 'material-design-icons-iconfont'; import '../../elements/emby-button/emby-button'; diff --git a/src/components/qualityOptions.js b/src/components/qualityOptions.js index bf59ad1669..dabce52bb5 100644 --- a/src/components/qualityOptions.js +++ b/src/components/qualityOptions.js @@ -1,5 +1,5 @@ import { appHost } from '../components/apphost'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import appSettings from '../scripts/settings/appSettings'; export function getVideoQualityOptions(options) { diff --git a/src/components/recordingcreator/recordingcreator.js b/src/components/recordingcreator/recordingcreator.js index 7bee9dccc7..d69043f600 100644 --- a/src/components/recordingcreator/recordingcreator.js +++ b/src/components/recordingcreator/recordingcreator.js @@ -1,5 +1,5 @@ import dialogHelper from '../dialogHelper/dialogHelper'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import layoutManager from '../layoutManager'; import mediaInfo from '../mediainfo/mediainfo'; import loading from '../loading/loading'; diff --git a/src/components/recordingcreator/recordingeditor.js b/src/components/recordingcreator/recordingeditor.js index b55754f540..442fe86637 100644 --- a/src/components/recordingcreator/recordingeditor.js +++ b/src/components/recordingcreator/recordingeditor.js @@ -1,6 +1,6 @@ import dialogHelper from '../dialogHelper/dialogHelper'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import layoutManager from '../layoutManager'; import loading from '../loading/loading'; import scrollHelper from '../../scripts/scrollHelper'; diff --git a/src/components/recordingcreator/recordingfields.js b/src/components/recordingcreator/recordingfields.js index 2fb9764f2b..19249218b8 100644 --- a/src/components/recordingcreator/recordingfields.js +++ b/src/components/recordingcreator/recordingfields.js @@ -1,4 +1,4 @@ -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Events from '../../utils/events.ts'; import serverNotifications from '../../scripts/serverNotifications'; import loading from '../loading/loading'; diff --git a/src/components/recordingcreator/recordinghelper.js b/src/components/recordingcreator/recordinghelper.js index a65ae006dc..3c593a18ad 100644 --- a/src/components/recordingcreator/recordinghelper.js +++ b/src/components/recordingcreator/recordinghelper.js @@ -1,4 +1,4 @@ -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import loading from '../loading/loading'; import ServerConnections from '../ServerConnections'; import toast from '../toast/toast'; diff --git a/src/components/recordingcreator/seriesrecordingeditor.js b/src/components/recordingcreator/seriesrecordingeditor.js index 79d35b9fe1..30c8e39362 100644 --- a/src/components/recordingcreator/seriesrecordingeditor.js +++ b/src/components/recordingcreator/seriesrecordingeditor.js @@ -1,5 +1,5 @@ import dialogHelper from '../dialogHelper/dialogHelper'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import layoutManager from '../layoutManager'; import loading from '../loading/loading'; import scrollHelper from '../../scripts/scrollHelper'; diff --git a/src/components/refreshdialog/refreshdialog.js b/src/components/refreshdialog/refreshdialog.js index eac336389f..3a17208d7a 100644 --- a/src/components/refreshdialog/refreshdialog.js +++ b/src/components/refreshdialog/refreshdialog.js @@ -2,7 +2,7 @@ import dom from '../../scripts/dom'; import dialogHelper from '../dialogHelper/dialogHelper'; import loading from '../loading/loading'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-input/emby-input'; import '../../elements/emby-button/emby-button'; import '../../elements/emby-button/paper-icon-button-light'; diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js index 6aafeca6a6..0c09ca4b7c 100644 --- a/src/components/remotecontrol/remotecontrol.js +++ b/src/components/remotecontrol/remotecontrol.js @@ -7,7 +7,7 @@ import { playbackManager } from '../playback/playbackmanager'; import nowPlayingHelper from '../playback/nowplayinghelper'; import Events from '../../utils/events.ts'; import { appHost } from '../apphost'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import layoutManager from '../layoutManager'; import * as userSettings from '../../scripts/settings/userSettings'; import itemContextMenu from '../itemContextMenu'; diff --git a/src/components/router/appRouter.js b/src/components/router/appRouter.js index 31e949035d..5688ecd603 100644 --- a/src/components/router/appRouter.js +++ b/src/components/router/appRouter.js @@ -3,7 +3,7 @@ import { Action } from 'history'; import { appHost } from '../apphost'; import { clearBackdrop, setBackdropTransparency } from '../backdrop/backdrop'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Events from '../../utils/events.ts'; import itemHelper from '../itemHelper'; import loading from '../loading/loading'; diff --git a/src/components/search/SearchFields.tsx b/src/components/search/SearchFields.tsx index 865e8d7520..b1cea800c5 100644 --- a/src/components/search/SearchFields.tsx +++ b/src/components/search/SearchFields.tsx @@ -1,7 +1,7 @@ import React, { type ChangeEvent, type FC, useCallback, useRef } from 'react'; import AlphaPicker from '../alphaPicker/AlphaPickerComponent'; import Input from 'elements/emby-input/Input'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import layoutManager from '../layoutManager'; import browser from '../../scripts/browser'; import 'material-design-icons-iconfont'; diff --git a/src/components/search/SearchResults.tsx b/src/components/search/SearchResults.tsx index b350b0f1a1..3c7dec3376 100644 --- a/src/components/search/SearchResults.tsx +++ b/src/components/search/SearchResults.tsx @@ -1,6 +1,6 @@ import React, { type FC } from 'react'; import { Section, useSearchItems } from 'hooks/searchHook'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Loading from '../loading/LoadingComponent'; import SearchResultsRow from './SearchResultsRow'; import { CardShape } from 'utils/card'; diff --git a/src/components/search/SearchSuggestions.tsx b/src/components/search/SearchSuggestions.tsx index b9ebae523a..fb9c8ac5d9 100644 --- a/src/components/search/SearchSuggestions.tsx +++ b/src/components/search/SearchSuggestions.tsx @@ -2,7 +2,7 @@ import React, { type FC } from 'react'; import { useSearchSuggestions } from 'hooks/searchHook'; import Loading from 'components/loading/LoadingComponent'; import { appRouter } from '../router/appRouter'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import LinkButton from 'elements/emby-button/LinkButton'; import '../../elements/emby-button/emby-button'; diff --git a/src/components/settingshelper.js b/src/components/settingshelper.js index ca78369ed9..9ba6ee5800 100644 --- a/src/components/settingshelper.js +++ b/src/components/settingshelper.js @@ -1,4 +1,4 @@ -import globalize from '../scripts/globalize'; +import globalize from 'lib/globalize'; /** * Helper for handling settings. diff --git a/src/components/shortcuts.js b/src/components/shortcuts.js index 91f96f9d9b..e4d144fb84 100644 --- a/src/components/shortcuts.js +++ b/src/components/shortcuts.js @@ -7,7 +7,7 @@ import { getPlaylistsApi } from '@jellyfin/sdk/lib/utils/api/playlists-api'; import { playbackManager } from './playback/playbackmanager'; import inputManager from '../scripts/inputManager'; import { appRouter } from './router/appRouter'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import dom from '../scripts/dom'; import recordingHelper from './recordingcreator/recordinghelper'; import ServerConnections from './ServerConnections'; diff --git a/src/components/sortmenu/sortmenu.js b/src/components/sortmenu/sortmenu.js index 39d42362bf..8adaf67e69 100644 --- a/src/components/sortmenu/sortmenu.js +++ b/src/components/sortmenu/sortmenu.js @@ -1,6 +1,6 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import * as userSettings from '../../scripts/settings/userSettings'; import '../../elements/emby-select/emby-select'; import '../../elements/emby-button/paper-icon-button-light'; diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js index ffe05ae5c3..106ef0b56c 100644 --- a/src/components/subtitleeditor/subtitleeditor.js +++ b/src/components/subtitleeditor/subtitleeditor.js @@ -2,7 +2,7 @@ import escapeHtml from 'escape-html'; import { appHost } from '../apphost'; import dialogHelper from '../dialogHelper/dialogHelper'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import * as userSettings from '../../scripts/settings/userSettings'; import loading from '../loading/loading'; import focusManager from '../focusManager'; diff --git a/src/components/subtitlesettings/subtitlesettings.js b/src/components/subtitlesettings/subtitlesettings.js index 971b8c775d..5e55adfd51 100644 --- a/src/components/subtitlesettings/subtitlesettings.js +++ b/src/components/subtitlesettings/subtitlesettings.js @@ -1,4 +1,4 @@ -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import { appHost } from '../apphost'; import appSettings from '../../scripts/settings/appSettings'; import focusManager from '../focusManager'; diff --git a/src/components/subtitleuploader/subtitleuploader.js b/src/components/subtitleuploader/subtitleuploader.js index e5e262c2ef..dc13ada079 100644 --- a/src/components/subtitleuploader/subtitleuploader.js +++ b/src/components/subtitleuploader/subtitleuploader.js @@ -8,7 +8,7 @@ import dom from '../../scripts/dom'; import loading from '../../components/loading/loading'; import scrollHelper from '../../scripts/scrollHelper'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import template from './subtitleuploader.template.html'; import toast from '../toast/toast'; import '../../elements/emby-button/emby-button'; diff --git a/src/components/toolbar/AppToolbar.tsx b/src/components/toolbar/AppToolbar.tsx index ee31312c8f..c06355a2db 100644 --- a/src/components/toolbar/AppToolbar.tsx +++ b/src/components/toolbar/AppToolbar.tsx @@ -8,7 +8,7 @@ import React, { type FC, type PropsWithChildren, ReactNode } from 'react'; import { appRouter } from 'components/router/appRouter'; import { useApi } from 'hooks/useApi'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import UserMenuButton from './UserMenuButton'; diff --git a/src/components/toolbar/AppUserMenu.tsx b/src/components/toolbar/AppUserMenu.tsx index 00121029e4..31a6856f22 100644 --- a/src/components/toolbar/AppUserMenu.tsx +++ b/src/components/toolbar/AppUserMenu.tsx @@ -17,7 +17,7 @@ import { Link } from 'react-router-dom'; import { appHost } from 'components/apphost'; import { useApi } from 'hooks/useApi'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import Dashboard from 'utils/dashboard'; import { useQuickConnectEnabled } from 'hooks/useQuickConnect'; diff --git a/src/components/toolbar/UserMenuButton.tsx b/src/components/toolbar/UserMenuButton.tsx index 1e37f5be55..cd60fe2865 100644 --- a/src/components/toolbar/UserMenuButton.tsx +++ b/src/components/toolbar/UserMenuButton.tsx @@ -4,7 +4,7 @@ import React, { useCallback, useState } from 'react'; import UserAvatar from 'components/UserAvatar'; import { useApi } from 'hooks/useApi'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import AppUserMenu, { ID } from './AppUserMenu'; diff --git a/src/components/tunerPicker.js b/src/components/tunerPicker.js index 5cb34addc7..a0f015eeed 100644 --- a/src/components/tunerPicker.js +++ b/src/components/tunerPicker.js @@ -1,7 +1,7 @@ import dialogHelper from './dialogHelper/dialogHelper'; import dom from '../scripts/dom'; import layoutManager from './layoutManager'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import loading from './loading/loading'; import browser from '../scripts/browser'; import focusManager from './focusManager'; diff --git a/src/components/tvproviders/schedulesdirect.js b/src/components/tvproviders/schedulesdirect.js index ca6f7a6e84..ec1c6e86ed 100644 --- a/src/components/tvproviders/schedulesdirect.js +++ b/src/components/tvproviders/schedulesdirect.js @@ -1,6 +1,6 @@ import 'jquery'; import loading from '../loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-input/emby-input'; import '../listview/listview.scss'; diff --git a/src/components/tvproviders/xmltv.js b/src/components/tvproviders/xmltv.js index 7b5123c908..ff565700bf 100644 --- a/src/components/tvproviders/xmltv.js +++ b/src/components/tvproviders/xmltv.js @@ -1,6 +1,6 @@ import 'jquery'; import loading from '../loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-input/emby-input'; import '../listview/listview.scss'; diff --git a/src/components/upnextdialog/upnextdialog.js b/src/components/upnextdialog/upnextdialog.js index ac6461ef8b..3f36e60020 100644 --- a/src/components/upnextdialog/upnextdialog.js +++ b/src/components/upnextdialog/upnextdialog.js @@ -4,7 +4,7 @@ import Events from '../../utils/events.ts'; import mediaInfo from '../mediainfo/mediainfo'; import layoutManager from '../layoutManager'; import focusManager from '../focusManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import itemHelper from '../itemHelper'; import ServerConnections from '../ServerConnections'; import './upnextdialog.scss'; diff --git a/src/components/userdatabuttons/userdatabuttons.js b/src/components/userdatabuttons/userdatabuttons.js index f75bbce81e..50b8b69e23 100644 --- a/src/components/userdatabuttons/userdatabuttons.js +++ b/src/components/userdatabuttons/userdatabuttons.js @@ -1,4 +1,4 @@ -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import dom from '../../scripts/dom'; import itemHelper from '../itemHelper'; import '../../elements/emby-button/paper-icon-button-light'; diff --git a/src/components/viewManager/ViewManagerPage.tsx b/src/components/viewManager/ViewManagerPage.tsx index 08498ddb59..72c05511b7 100644 --- a/src/components/viewManager/ViewManagerPage.tsx +++ b/src/components/viewManager/ViewManagerPage.tsx @@ -2,8 +2,9 @@ import { Action } from 'history'; import { FunctionComponent, useEffect } from 'react'; import { useLocation, useNavigationType } from 'react-router-dom'; -import globalize from '../../scripts/globalize'; -import type { RestoreViewFailResponse } from '../../types/viewManager'; +import globalize from 'lib/globalize'; +import type { RestoreViewFailResponse } from 'types/viewManager'; + import viewManager from './viewManager'; export interface ViewManagerPageProps { diff --git a/src/components/viewSettings/viewSettings.js b/src/components/viewSettings/viewSettings.js index a214f13674..d3aa881fee 100644 --- a/src/components/viewSettings/viewSettings.js +++ b/src/components/viewSettings/viewSettings.js @@ -1,6 +1,6 @@ import dialogHelper from '../dialogHelper/dialogHelper'; import layoutManager from '../layoutManager'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import * as userSettings from '../../scripts/settings/userSettings'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-input/emby-input'; diff --git a/src/controllers/dashboard/apikeys.js b/src/controllers/dashboard/apikeys.js index 8811dc5742..3fc7e5fe7d 100644 --- a/src/controllers/dashboard/apikeys.js +++ b/src/controllers/dashboard/apikeys.js @@ -3,7 +3,7 @@ import escapeHTML from 'escape-html'; import datetime from '../../scripts/datetime'; import loading from '../../components/loading/loading'; import dom from '../../scripts/dom'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-button/emby-button'; import confirm from '../../components/confirm/confirm'; import { pageIdOn } from '../../utils/dashboard'; diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index d47f13857a..dad56f19d7 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -5,7 +5,7 @@ import Events from '../../utils/events.ts'; import itemHelper from '../../components/itemHelper'; import serverNotifications from '../../scripts/serverNotifications'; import dom from '../../scripts/dom'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import { formatDistanceToNow } from 'date-fns'; import { getLocaleWithSuffix } from '../../utils/dateFnsLocale.ts'; import loading from '../../components/loading/loading'; diff --git a/src/controllers/dashboard/devices/devices.js b/src/controllers/dashboard/devices/devices.js index 8525e2f1e1..7f8603909a 100644 --- a/src/controllers/dashboard/devices/devices.js +++ b/src/controllers/dashboard/devices/devices.js @@ -1,7 +1,7 @@ import escapeHtml from 'escape-html'; import loading from '../../../components/loading/loading'; import dom from '../../../scripts/dom'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import imageHelper from '../../../utils/image'; import { formatDistanceToNow } from 'date-fns'; import { getLocaleWithSuffix } from '../../../utils/dateFnsLocale.ts'; diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js index 66643483b8..d76a78027f 100644 --- a/src/controllers/dashboard/encodingsettings.js +++ b/src/controllers/dashboard/encodingsettings.js @@ -1,6 +1,6 @@ import 'jquery'; import loading from '../../components/loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import dom from '../../scripts/dom'; import Dashboard from '../../utils/dashboard'; import alert from '../../components/alert'; diff --git a/src/controllers/dashboard/general.js b/src/controllers/dashboard/general.js index d62cfbd16f..141a671a79 100644 --- a/src/controllers/dashboard/general.js +++ b/src/controllers/dashboard/general.js @@ -1,7 +1,7 @@ import 'jquery'; import loading from '../../components/loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-textarea/emby-textarea'; import '../../elements/emby-input/emby-input'; diff --git a/src/controllers/dashboard/library.js b/src/controllers/dashboard/library.js index 8d9dafde03..7d5d913311 100644 --- a/src/controllers/dashboard/library.js +++ b/src/controllers/dashboard/library.js @@ -2,7 +2,7 @@ import escapeHtml from 'escape-html'; import 'jquery'; import taskButton from '../../scripts/taskbutton'; import loading from '../../components/loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import dom from '../../scripts/dom'; import imageHelper from '../../utils/image'; import '../../components/cardbuilder/card.scss'; diff --git a/src/controllers/dashboard/logs.js b/src/controllers/dashboard/logs.js index 86dcfccd7e..110d4be815 100644 --- a/src/controllers/dashboard/logs.js +++ b/src/controllers/dashboard/logs.js @@ -1,6 +1,6 @@ import datetime from '../../scripts/datetime'; import loading from '../../components/loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-button/emby-button'; import '../../components/listview/listview.scss'; import '../../styles/flexstyles.scss'; diff --git a/src/controllers/dashboard/metadataImages.js b/src/controllers/dashboard/metadataImages.js index 81b74b2182..0230cd6568 100644 --- a/src/controllers/dashboard/metadataImages.js +++ b/src/controllers/dashboard/metadataImages.js @@ -3,7 +3,7 @@ import { ImageResolution } from '@jellyfin/sdk/lib/generated-client/models/image import 'jquery'; import loading from '../../components/loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Dashboard from '../../utils/dashboard'; import '../../components/listview/listview.scss'; diff --git a/src/controllers/dashboard/metadatanfo.js b/src/controllers/dashboard/metadatanfo.js index 9e82117892..53dec9778a 100644 --- a/src/controllers/dashboard/metadatanfo.js +++ b/src/controllers/dashboard/metadatanfo.js @@ -1,7 +1,7 @@ import escapeHtml from 'escape-html'; import 'jquery'; import loading from '../../components/loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Dashboard from '../../utils/dashboard'; import alert from '../../components/alert'; diff --git a/src/controllers/dashboard/networking.js b/src/controllers/dashboard/networking.js index 6580c8d108..e1fce88fa0 100644 --- a/src/controllers/dashboard/networking.js +++ b/src/controllers/dashboard/networking.js @@ -1,5 +1,5 @@ import loading from '../../components/loading/loading'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-checkbox/emby-checkbox'; import '../../elements/emby-select/emby-select'; import Dashboard from '../../utils/dashboard'; diff --git a/src/controllers/dashboard/plugins/available/index.js b/src/controllers/dashboard/plugins/available/index.js index 4541fbd6db..34d93ff6e3 100644 --- a/src/controllers/dashboard/plugins/available/index.js +++ b/src/controllers/dashboard/plugins/available/index.js @@ -1,7 +1,7 @@ import escapeHTML from 'escape-html'; import loading from '../../../../components/loading/loading'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import '../../../../components/cardbuilder/card.scss'; import '../../../../elements/emby-button/emby-button'; import '../../../../elements/emby-checkbox/emby-checkbox'; diff --git a/src/controllers/dashboard/plugins/installed/index.js b/src/controllers/dashboard/plugins/installed/index.js index 15483d4c71..cf64bf565d 100644 --- a/src/controllers/dashboard/plugins/installed/index.js +++ b/src/controllers/dashboard/plugins/installed/index.js @@ -1,6 +1,6 @@ import loading from '../../../../components/loading/loading'; import dom from '../../../../scripts/dom'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import '../../../../components/cardbuilder/card.scss'; import '../../../../elements/emby-button/emby-button'; import Dashboard, { pageIdOn } from '../../../../utils/dashboard'; diff --git a/src/controllers/dashboard/plugins/repositories/index.js b/src/controllers/dashboard/plugins/repositories/index.js index 39110cd2e7..d7d9247e96 100644 --- a/src/controllers/dashboard/plugins/repositories/index.js +++ b/src/controllers/dashboard/plugins/repositories/index.js @@ -1,5 +1,5 @@ import loading from '../../../../components/loading/loading'; -import globalize from '../../../../scripts/globalize'; +import globalize from '../../../../lib/globalize'; import dialogHelper from '../../../../components/dialogHelper/dialogHelper'; import confirm from '../../../../components/confirm/confirm'; diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js index 215948205f..578fc2cb80 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtask.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.js @@ -2,7 +2,7 @@ import 'jquery'; import loading from '../../../components/loading/loading'; import datetime from '../../../scripts/datetime'; import dom from '../../../scripts/dom'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import '../../../elements/emby-input/emby-input'; import '../../../elements/emby-button/emby-button'; import '../../../elements/emby-select/emby-select'; diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js index 53966e18d1..359295d461 100644 --- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js +++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js @@ -1,6 +1,6 @@ import 'jquery'; import loading from '../../../components/loading/loading'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import serverNotifications from '../../../scripts/serverNotifications'; import { formatDistance, formatDistanceToNow } from 'date-fns'; import { getLocale, getLocaleWithSuffix } from '../../../utils/dateFnsLocale.ts'; diff --git a/src/controllers/favorites.js b/src/controllers/favorites.js index 4a51478ac7..cbecc9bbf8 100644 --- a/src/controllers/favorites.js +++ b/src/controllers/favorites.js @@ -5,7 +5,7 @@ import layoutManager from 'components/layoutManager'; import { appRouter } from 'components/router/appRouter'; import ServerConnections from 'components/ServerConnections'; import dom from 'scripts/dom'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { getBackdropShape, getPortraitShape, getSquareShape } from 'utils/card'; import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by'; diff --git a/src/controllers/home.js b/src/controllers/home.js index e85d4eb83a..010a23977c 100644 --- a/src/controllers/home.js +++ b/src/controllers/home.js @@ -1,5 +1,5 @@ import TabbedView from '../components/tabbedview/tabbedview'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import '../elements/emby-tabs/emby-tabs'; import '../elements/emby-button/emby-button'; import '../elements/emby-scroller/emby-scroller'; diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js index 584452e6bd..273af34cc1 100644 --- a/src/controllers/itemDetails/index.js +++ b/src/controllers/itemDetails/index.js @@ -25,7 +25,7 @@ import browser from 'scripts/browser'; import datetime from 'scripts/datetime'; import dom from 'scripts/dom'; import { download } from 'scripts/fileDownloader'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import libraryMenu from 'scripts/libraryMenu'; import * as userSettings from 'scripts/settings/userSettings'; import { getPortraitShape, getSquareShape } from 'utils/card'; diff --git a/src/controllers/list.js b/src/controllers/list.js index 54afc87ebe..02da709c03 100644 --- a/src/controllers/list.js +++ b/src/controllers/list.js @@ -1,4 +1,4 @@ -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import listView from '../components/listview/listview'; import * as userSettings from '../scripts/settings/userSettings'; import focusManager from '../components/focusManager'; diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js index aa40afc3d9..662e060a68 100644 --- a/src/controllers/livetv/livetvsuggested.js +++ b/src/controllers/livetv/livetvsuggested.js @@ -3,7 +3,7 @@ import imageLoader from 'components/images/imageLoader'; import layoutManager from 'components/layoutManager'; import loading from 'components/loading/loading'; import * as mainTabsManager from 'components/maintabsmanager'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import inputManager from 'scripts/inputManager'; import * as userSettings from 'scripts/settings/userSettings'; import { LibraryTab } from 'types/libraryTab'; diff --git a/src/controllers/livetvguideprovider.js b/src/controllers/livetvguideprovider.js index e87f2ace33..28d60ec05c 100644 --- a/src/controllers/livetvguideprovider.js +++ b/src/controllers/livetvguideprovider.js @@ -1,5 +1,5 @@ import loading from '../components/loading/loading'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import Dashboard, { pageIdOn } from '../utils/dashboard'; import { getParameterByName } from '../utils/url.ts'; import Events from '../utils/events.ts'; diff --git a/src/controllers/livetvsettings.js b/src/controllers/livetvsettings.js index 053b032282..6ad9c0f58b 100644 --- a/src/controllers/livetvsettings.js +++ b/src/controllers/livetvsettings.js @@ -1,6 +1,6 @@ import 'jquery'; import loading from '../components/loading/loading'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import '../elements/emby-button/emby-button'; import Dashboard from '../utils/dashboard'; import alert from '../components/alert'; diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js index 35c219b93d..b0d13f3345 100644 --- a/src/controllers/livetvstatus.js +++ b/src/controllers/livetvstatus.js @@ -1,5 +1,5 @@ import 'jquery'; -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import taskButton from '../scripts/taskbutton'; import dom from '../scripts/dom'; import layoutManager from '../components/layoutManager'; diff --git a/src/controllers/livetvtuner.js b/src/controllers/livetvtuner.js index de73b608d5..aa9a10041e 100644 --- a/src/controllers/livetvtuner.js +++ b/src/controllers/livetvtuner.js @@ -1,4 +1,4 @@ -import globalize from '../scripts/globalize'; +import globalize from '../lib/globalize'; import loading from '../components/loading/loading'; import dom from '../scripts/dom'; import '../elements/emby-input/emby-input'; diff --git a/src/controllers/lyrics.js b/src/controllers/lyrics.js index c362c4949f..f2af5c32ad 100644 --- a/src/controllers/lyrics.js +++ b/src/controllers/lyrics.js @@ -9,9 +9,9 @@ import scrollManager from 'components/scrollManager'; import focusManager from 'components/focusManager'; import keyboardNavigation from 'scripts/keyboardNavigation'; -import globalize from '../scripts/globalize'; -import LibraryMenu from '../scripts/libraryMenu'; -import Events from '../utils/events.ts'; +import globalize from 'lib/globalize'; +import LibraryMenu from 'scripts/libraryMenu'; +import Events from 'utils/events'; import '../styles/lyrics.scss'; import { AutoScroll } from './lyrics.types'; diff --git a/src/controllers/movies/moviecollections.js b/src/controllers/movies/moviecollections.js index 5f32bf9100..560badf4ac 100644 --- a/src/controllers/movies/moviecollections.js +++ b/src/controllers/movies/moviecollections.js @@ -4,7 +4,7 @@ import imageLoader from '../../components/images/imageLoader'; import listView from '../../components/listview/listview'; import cardBuilder from '../../components/cardbuilder/cardBuilder'; import * as userSettings from '../../scripts/settings/userSettings'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import '../../elements/emby-itemscontainer/emby-itemscontainer'; export default function (view, params, tabContent) { diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js index 22d535bf32..9a45f59e06 100644 --- a/src/controllers/movies/moviegenres.js +++ b/src/controllers/movies/moviegenres.js @@ -5,7 +5,7 @@ import layoutManager from 'components/layoutManager'; import lazyLoader from 'components/lazyLoader/lazyLoaderIntersectionObserver'; import loading from 'components/loading/loading'; import { appRouter } from 'components/router/appRouter'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import * as userSettings from 'scripts/settings/userSettings'; import { getBackdropShape, getPortraitShape } from 'utils/card'; diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js index 7734e27c48..96e7e89c5c 100644 --- a/src/controllers/movies/movies.js +++ b/src/controllers/movies/movies.js @@ -4,7 +4,7 @@ import libraryBrowser from '../../scripts/libraryBrowser'; import { AlphaPicker } from '../../components/alphaPicker/alphaPicker'; import listView from '../../components/listview/listview'; import cardBuilder from '../../components/cardbuilder/cardBuilder'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Events from '../../utils/events.ts'; import { playbackManager } from '../../components/playback/playbackmanager'; diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js index 37c4896c8d..ff2ab8381e 100644 --- a/src/controllers/movies/moviesrecommended.js +++ b/src/controllers/movies/moviesrecommended.js @@ -6,7 +6,7 @@ import layoutManager from 'components/layoutManager'; import * as mainTabsManager from 'components/maintabsmanager'; import { playbackManager } from 'components/playback/playbackmanager'; import dom from 'scripts/dom'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import inputManager from 'scripts/inputManager'; import libraryMenu from 'scripts/libraryMenu'; import * as userSettings from 'scripts/settings/userSettings'; diff --git a/src/controllers/movies/movietrailers.js b/src/controllers/movies/movietrailers.js index 6967aac9bc..1993f07c37 100644 --- a/src/controllers/movies/movietrailers.js +++ b/src/controllers/movies/movietrailers.js @@ -5,7 +5,7 @@ import { AlphaPicker } from '../../components/alphaPicker/alphaPicker'; import listView from '../../components/listview/listview'; import cardBuilder from '../../components/cardbuilder/cardBuilder'; import * as userSettings from '../../scripts/settings/userSettings'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Events from '../../utils/events.ts'; import '../../elements/emby-itemscontainer/emby-itemscontainer'; diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js index fe2acb7b62..42d4ad2dc8 100644 --- a/src/controllers/music/musicalbums.js +++ b/src/controllers/music/musicalbums.js @@ -6,7 +6,7 @@ import AlphaPicker from '../../components/alphaPicker/alphaPicker'; import listView from '../../components/listview/listview'; import cardBuilder from '../../components/cardbuilder/cardBuilder'; import * as userSettings from '../../scripts/settings/userSettings'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Events from '../../utils/events.ts'; import '../../elements/emby-itemscontainer/emby-itemscontainer'; diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js index 1b1bd1000d..dd4ccde9c4 100644 --- a/src/controllers/music/musicrecommended.js +++ b/src/controllers/music/musicrecommended.js @@ -5,7 +5,7 @@ import loading from 'components/loading/loading'; import * as mainTabsManager from 'components/maintabsmanager'; import browser from 'scripts/browser'; import dom from 'scripts/dom'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import inputManager from 'scripts/inputManager'; import libraryMenu from 'scripts/libraryMenu'; import * as userSettings from 'scripts/settings/userSettings'; diff --git a/src/controllers/music/songs.js b/src/controllers/music/songs.js index 5a94223292..277f02a9ce 100644 --- a/src/controllers/music/songs.js +++ b/src/controllers/music/songs.js @@ -5,7 +5,7 @@ import listView from '../../components/listview/listview'; import loading from '../../components/loading/loading'; import { playbackManager } from '../../components/playback/playbackmanager'; import * as userSettings from '../../scripts/settings/userSettings'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Dashboard from '../../utils/dashboard'; import Events from '../../utils/events.ts'; diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index e83d98eedb..e09cbc4167 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -10,7 +10,7 @@ import itemHelper from '../../../components/itemHelper'; import mediaInfo from '../../../components/mediainfo/mediainfo'; import focusManager from '../../../components/focusManager'; import Events from '../../../utils/events.ts'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import { appHost } from '../../../components/apphost'; import layoutManager from '../../../components/layoutManager'; import * as userSettings from '../../../scripts/settings/userSettings'; diff --git a/src/controllers/session/addServer/index.js b/src/controllers/session/addServer/index.js index 47ebfc6af6..d7c02947f8 100644 --- a/src/controllers/session/addServer/index.js +++ b/src/controllers/session/addServer/index.js @@ -1,6 +1,6 @@ import appSettings from '../../../scripts/settings/appSettings'; import loading from '../../../components/loading/loading'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import '../../../elements/emby-button/emby-button'; import Dashboard from '../../../utils/dashboard'; import ServerConnections from '../../../components/ServerConnections'; diff --git a/src/controllers/session/forgotPassword/index.js b/src/controllers/session/forgotPassword/index.js index fb9a7c73d7..fb0afeec9c 100644 --- a/src/controllers/session/forgotPassword/index.js +++ b/src/controllers/session/forgotPassword/index.js @@ -1,5 +1,5 @@ -import globalize from '../../../scripts/globalize'; -import Dashboard from '../../../utils/dashboard'; +import globalize from 'lib/globalize'; +import Dashboard from 'utils/dashboard'; function processForgotPasswordResult(result) { if (result.Action == 'ContactAdmin') { diff --git a/src/controllers/session/login/index.js b/src/controllers/session/login/index.js index c4c5c3dce9..93f8e03de0 100644 --- a/src/controllers/session/login/index.js +++ b/src/controllers/session/login/index.js @@ -7,7 +7,7 @@ import loading from '../../../components/loading/loading'; import layoutManager from '../../../components/layoutManager'; import libraryMenu from '../../../scripts/libraryMenu'; import browser from '../../../scripts/browser'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import '../../../components/cardbuilder/card.scss'; import '../../../elements/emby-checkbox/emby-checkbox'; import Dashboard from '../../../utils/dashboard'; diff --git a/src/controllers/session/resetPassword/index.js b/src/controllers/session/resetPassword/index.js index 10a721ec61..6cbaf59354 100644 --- a/src/controllers/session/resetPassword/index.js +++ b/src/controllers/session/resetPassword/index.js @@ -1,5 +1,5 @@ -import globalize from '../../../scripts/globalize'; -import Dashboard from '../../../utils/dashboard'; +import globalize from 'lib/globalize'; +import Dashboard from 'utils/dashboard'; function processForgotPasswordResult(result) { if (result.Success) { diff --git a/src/controllers/session/selectServer/index.js b/src/controllers/session/selectServer/index.js index 763dcda964..1c9fdf9ae3 100644 --- a/src/controllers/session/selectServer/index.js +++ b/src/controllers/session/selectServer/index.js @@ -5,7 +5,7 @@ import layoutManager from '../../../components/layoutManager'; import libraryMenu from '../../../scripts/libraryMenu'; import appSettings from '../../../scripts/settings/appSettings'; import focusManager from '../../../components/focusManager'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import actionSheet from '../../../components/actionSheet/actionSheet'; import dom from '../../../scripts/dom'; import browser from '../../../scripts/browser'; diff --git a/src/controllers/shows/episodes.js b/src/controllers/shows/episodes.js index ea67583fed..3cf5779968 100644 --- a/src/controllers/shows/episodes.js +++ b/src/controllers/shows/episodes.js @@ -4,7 +4,7 @@ import imageLoader from '../../components/images/imageLoader'; import listView from '../../components/listview/listview'; import cardBuilder from '../../components/cardbuilder/cardBuilder'; import * as userSettings from '../../scripts/settings/userSettings'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Dashboard from '../../utils/dashboard'; import Events from '../../utils/events.ts'; diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js index 6ca140cda7..c1c360a831 100644 --- a/src/controllers/shows/tvgenres.js +++ b/src/controllers/shows/tvgenres.js @@ -5,7 +5,7 @@ import lazyLoader from 'components/lazyLoader/lazyLoaderIntersectionObserver'; import layoutManager from 'components/layoutManager'; import loading from 'components/loading/loading'; import { appRouter } from 'components/router/appRouter'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import * as userSettings from 'scripts/settings/userSettings'; import { getBackdropShape, getPortraitShape } from 'utils/card'; diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js index 6678c6b616..1f4e4eefe5 100644 --- a/src/controllers/shows/tvrecommended.js +++ b/src/controllers/shows/tvrecommended.js @@ -5,7 +5,7 @@ import loading from 'components/loading/loading'; import * as mainTabsManager from 'components/maintabsmanager'; import { playbackManager } from 'components/playback/playbackmanager'; import dom from 'scripts/dom'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import inputManager from 'scripts/inputManager'; import libraryMenu from 'scripts/libraryMenu'; import * as userSettings from 'scripts/settings/userSettings'; diff --git a/src/controllers/shows/tvshows.js b/src/controllers/shows/tvshows.js index ea58f1d8dc..cb857dfd75 100644 --- a/src/controllers/shows/tvshows.js +++ b/src/controllers/shows/tvshows.js @@ -5,7 +5,7 @@ import listView from '../../components/listview/listview'; import cardBuilder from '../../components/cardbuilder/cardBuilder'; import AlphaPicker from '../../components/alphaPicker/alphaPicker'; import * as userSettings from '../../scripts/settings/userSettings'; -import globalize from '../../scripts/globalize'; +import globalize from '../../lib/globalize'; import Events from '../../utils/events.ts'; import '../../elements/emby-itemscontainer/emby-itemscontainer'; diff --git a/src/controllers/shows/tvupcoming.js b/src/controllers/shows/tvupcoming.js index f3c7d90ec6..ab3f251b14 100644 --- a/src/controllers/shows/tvupcoming.js +++ b/src/controllers/shows/tvupcoming.js @@ -3,7 +3,7 @@ import imageLoader from 'components/images/imageLoader'; import layoutManager from 'components/layoutManager'; import loading from 'components/loading/loading'; import datetime from 'scripts/datetime'; -import globalize from 'scripts/globalize'; +import globalize from 'lib/globalize'; import { getBackdropShape } from 'utils/card'; import 'elements/emby-itemscontainer/emby-itemscontainer'; diff --git a/src/controllers/user/controls/index.js b/src/controllers/user/controls/index.js index 4af6dde424..1917fecf42 100644 --- a/src/controllers/user/controls/index.js +++ b/src/controllers/user/controls/index.js @@ -1,6 +1,6 @@ import layoutManager from 'components/layoutManager'; import toast from '../../../components/toast/toast'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import appSettings from '../../../scripts/settings/appSettings'; import Events from '../../../utils/events.ts'; diff --git a/src/controllers/wizard/user/index.js b/src/controllers/wizard/user/index.js index ac6238a931..eb521c87af 100644 --- a/src/controllers/wizard/user/index.js +++ b/src/controllers/wizard/user/index.js @@ -1,5 +1,5 @@ import loading from '../../../components/loading/loading'; -import globalize from '../../../scripts/globalize'; +import globalize from '../../../lib/globalize'; import '../../../styles/dashboard.scss'; import '../../../elements/emby-input/emby-input'; import '../../../elements/emby-button/emby-button'; diff --git a/src/elements/ButtonElement.tsx b/src/elements/ButtonElement.tsx index f9ed58954b..379f4f7995 100644 --- a/src/elements/ButtonElement.tsx +++ b/src/elements/ButtonElement.tsx @@ -1,5 +1,6 @@ import React, { FunctionComponent } from 'react'; -import globalize from '../scripts/globalize'; + +import globalize from 'lib/globalize'; const createButtonElement = ({ type, id, className, title, leftIcon, rightIcon }: IProps) => ({ __html: `