mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 21:04:37 +03:00
UI filter refactor (#1406)
* Refactor Criterion * Separate filter options from filter * Rename utils to factory * Sort sort by options by alphabetical * Refactor criterion options * Simplify list filter options * Refactor i8n * Simplify ILabeledIdCriterion
This commit is contained in:
@@ -44,13 +44,27 @@ const intlFormats = {
|
||||
},
|
||||
};
|
||||
|
||||
function languageMessageString(language: string) {
|
||||
return language.replace(/-/, "");
|
||||
}
|
||||
|
||||
export const App: React.FC = () => {
|
||||
const config = useConfiguration();
|
||||
const { data: systemStatusData } = useSystemStatus();
|
||||
const language = config.data?.configuration?.interface?.language ?? "en-GB";
|
||||
const messageLanguage = language.replace(/-/, "");
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const messages = flattenMessages((locales as any)[messageLanguage]);
|
||||
const defaultLocale = "en-GB";
|
||||
const language =
|
||||
config.data?.configuration?.interface?.language ?? defaultLocale;
|
||||
const defaultMessageLanguage = languageMessageString(defaultLocale);
|
||||
const messageLanguage = languageMessageString(language);
|
||||
|
||||
// use en-GB as default messages if any messages aren't found in the chosen language
|
||||
const mergedMessages = {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
...(locales as any)[defaultMessageLanguage],
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
...(locales as any)[messageLanguage],
|
||||
};
|
||||
const messages = flattenMessages(mergedMessages);
|
||||
|
||||
const setupMatch = useRouteMatch(["/setup", "/migrate"]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user