Merge branch 'develop' into develop

This commit is contained in:
jc21
2025-11-12 18:39:05 +10:00
committed by GitHub
49 changed files with 3005 additions and 79 deletions

View File

@@ -1,18 +1,33 @@
import { createIntl, createIntlCache } from "react-intl";
import langEn from "./lang/en.json";
import langDe from "./lang/de.json";
import langEs from "./lang/es.json";
import langJa from "./lang/ja.json";
import langRu from "./lang/ru.json";
import langList from "./lang/lang-list.json";
// first item of each array should be the language code,
// not the country code
// Remember when adding to this list, also update check-locales.js script
const localeOptions = [["en", "en-US"], ["ru", "ru-RU"]];
const localeOptions = [
["en", "en-US"],
["de", "de-DE"],
["es", "es-ES"],
["ja", "ja-JP"],
["ru", "ru-RU"],
];
const loadMessages = (locale?: string): typeof langList & typeof langEn => {
const thisLocale = locale || "en";
switch (thisLocale.slice(0, 2)) {
case "de":
return Object.assign({}, langList, langEn, langDe);
case "es":
return Object.assign({}, langList, langEn, langEs);
case "ja":
return Object.assign({}, langList, langEn, langJa);
case "ru":
return Object.assign({}, langList, langRu);
return Object.assign({}, langList, langEn, langRu);
default:
return Object.assign({}, langList, langEn);
}
@@ -20,6 +35,16 @@ const loadMessages = (locale?: string): typeof langList & typeof langEn => {
const getFlagCodeForLocale = (locale?: string) => {
switch (locale) {
case "es-ES":
case "es":
return "ES";
case "de-DE":
case "de":
return "DE";
case "ja-JP":
case "ja":
return "JP";
case "ru-RU":
case "ru":
return "RU";
default:
@@ -45,10 +70,7 @@ const getLocale = (short = false) => {
const cache = createIntlCache();
const initialMessages = loadMessages(getLocale());
let intl = createIntl(
{ locale: getLocale(), messages: initialMessages },
cache,
);
let intl = createIntl({ locale: getLocale(), messages: initialMessages }, cache);
const changeLocale = (locale: string): void => {
const messages = loadMessages(locale);
@@ -88,12 +110,4 @@ const T = ({
);
};
export {
localeOptions,
getFlagCodeForLocale,
getLocale,
createIntl,
changeLocale,
intl,
T,
};
export { localeOptions, getFlagCodeForLocale, getLocale, createIntl, changeLocale, intl, T };