Language fallback

Stack.tsx

@@ -9,18 +9,23 @@ import { Dimensions, StyleSheet } from "react-native";
 import { useTranslation } from "react-i18next";
 import FastImage from "@gkasdorf/react-native-fast-image";
 import { useMe } from "@src/stores/site/siteStore";
-import { View } from "./src/components/common/Gluestack";
 import {
   useSettingsStore,
   useThemeOptions,
-} from "./src/stores/settings/settingsStore";
+} from "@src/stores/settings/settingsStore";
+import { selectSite } from "@src/slices/site/siteSlice";
+import { truncateName } from "@src/helpers/TextHelper";
+import { ICON_MAP } from "@src/constants/IconMap";
+import { CustomTabBar } from "@src/components/common/Navigation/CustomTabBar";
+import {
+  useAccountStore,
+  useAccounts,
+  useCurrentAccount,
+} from "@src/stores/account/accountStore";
+import { View } from "./src/components/common/Gluestack";
 
-import { selectSite } from "./src/slices/site/siteSlice";
-import { truncateName } from "./src/helpers/TextHelper";
-import { ICON_MAP } from "./src/constants/IconMap";
 import KeywordsFilterScreen from "./src/components/screens/Settings/Filters/KeywordsFilterScreen";
 import InstanceFiltersScreen from "./src/components/screens/Settings/Filters/InstanceFiltersScreen";
-import { CustomTabBar } from "./src/components/common/Navigation/CustomTabBar";
 import LoadingView from "./src/components/common/Loading/LoadingView";
 import SFIcon from "./src/components/common/icons/SFIcon";
 import EditCommentScreen from "./src/components/screens/Comments/EditCommentScreen";
@@ -63,11 +68,6 @@ import UserCommentsScreen from "./src/components/screens/UserProfile/UserComment
 import UserPostsScreen from "./src/components/screens/UserProfile/UserPostsScreen";
 import UserProfileScreen from "./src/components/screens/UserProfile/UserProfileScreen";
 import ViewerScreen from "./src/components/screens/ViewerScreen";
-import {
-  useAccountStore,
-  useAccounts,
-  useCurrentAccount,
-} from "./src/stores/account/accountStore";
 import { useAppSelector } from "./store";
 import FiltersScreen from "./src/components/screens/Settings/Filters/FiltersScreen";
 
@@ -293,7 +293,7 @@ function InboxStackScreen() {
   );
 }
 
-function SettingsScreens(stack) {
+function SettingsScreens(stack: typeof SettingsStack) {
   const { t } = useTranslation();
   return (
     <>
@@ -676,8 +676,8 @@ function Tabs() {
               <SFIcon icon={ICON_MAP.USER_AVATAR} color={color} />
             ),
           tabBarLabel: hideUsernameInTab
-            ? "Profile"
-            : truncateName(currentAccount?.username ?? "Profile", 8),
+            ? t("Profile")
+            : truncateName(currentAccount?.username ?? t("Profile"), 8),
           freezeOnBlur: false,
         }}
       />

src/plugins/DayJs.ts

@@ -7,11 +7,11 @@ import relativeTime from "dayjs/plugin/relativeTime";
 import updateLocale from "dayjs/plugin/updateLocale";
 import utc from "dayjs/plugin/utc";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import de_DE from "./i18n/locales/de.json";
-import en_US from "./i18n/locales/en.json";
-import cs_CZ from "./i18n/locales/cz.json";
-import ro_RO from "./i18n/locales/ro.json";
-import pt_BR from "./i18n/locales/pt_br.json";
+import de_DE from "./i18n/locales/de_DE.json";
+import en_US from "./i18n/locales/en_US.json";
+import cs_CZ from "./i18n/locales/cs_CZ.json";
+import ro_RO from "./i18n/locales/ro_RO.json";
+import pt_BR from "./i18n/locales/pt_BR.json";
 
 // dayjs locales
 import "dayjs/locale/de";

src/plugins/i18n/i18n.ts

@@ -1,34 +1,66 @@
 import i18n from "i18next";
 import { initReactI18next } from "react-i18next";
-import en_US from "./locales/en.json";
-import de_DE from "./locales/de.json";
-import pt_BR from "./locales/pt_br.json";
-import cs_CZ from "./locales/cz.json";
-import ro_RO from "./locales/ro.json";
+import { writeToLog } from "@src/helpers/LogHelper";
 import languageDetector from "./languageDetector";
+import en_US from "./locales/en_US.json";
+import de_DE from "./locales/de_DE.json";
+import pt_BR from "./locales/pt_BR.json";
+import cs_CZ from "./locales/cs_CZ.json";
+import ro_RO from "./locales/ro_RO.json";
+
+type SupportedLocale = "en" | "de" | "pt" | "ro" | "cs";
 
 i18n
   .use(languageDetector)
   .use(initReactI18next)
   .init({
     resources: {
-      en: {
+      "en-US": {
         translation: en_US,
       },
-      de: {
+      "de-DE": {
         translation: de_DE,
       },
-      pt: {
+      "pt-BR": {
         translation: pt_BR,
       },
-      ro: {
+      "ro-RO": {
         translation: ro_RO,
       },
-      cz: {
+      "cs-CZ": {
         translation: cs_CZ,
       },
     },
-    fallbackLng: "en",
+    fallbackLng: (code) => {
+      const fallbacks = ["en-US"];
+
+      if (!code) return fallbacks;
+
+      const [locale] = code.split("-") as [SupportedLocale, string];
+
+      switch (locale) {
+        case "en":
+          // already covered
+          break;
+        case "de":
+          fallbacks.push("de-DE");
+          break;
+        case "pt":
+          fallbacks.push("pt-BR");
+          break;
+        case "ro":
+          fallbacks.push("ro-RO");
+          break;
+        case "cs":
+          fallbacks.push("cs-CZ");
+          break;
+        default:
+          writeToLog(`Language "${code}" is not yet supported!`);
+          break;
+      }
+
+      return fallbacks.reverse();
+    },
     interpolation: {
       escapeValue: false, // react already safes from xss => https://www.i18next.com/translation-function/interpolation#unescape
     },

src/plugins/i18n/languageDetector.ts

@@ -4,7 +4,7 @@ import { LanguageDetectorModule } from "i18next";
 // noinspection JSUnusedGlobalSymbols
 const languageDetector: LanguageDetectorModule = {
   type: "languageDetector",
-  detect: () => Localization.locale.split("-")[0],
+  detect: () => Localization.locale,
   init: () => {},
   cacheUserLanguage: () => {},
 };

src/plugins/i18n/locales/de.json → src/plugins/i18n/locales/de_DE.json

@@ -95,6 +95,7 @@
 			"useReaderMode": "Lesemodus verwenden"
 		},
 		"reportBugBtn": "Bug auf GitHub melden",
+		"checkInstanceStatus": "Lemmy Status prüfen",
 		"swipeToVote": "Mit Wisch hoch-/runterwählen",
 		"swipe": {
 			"left": {