Merge pull request #930 from hydralauncher/feat/refactor-languages

feat: refactor languages

package.json

@@ -32,7 +32,6 @@
     "knex:migrate:make": "knex --knexfile src/main/knexfile.ts migrate:make --esm"
   },
   "dependencies": {
-    "@cospired/i18n-iso-languages": "^4.2.0",
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
     "@fontsource/noto-sans": "^5.0.22",
@@ -43,7 +42,7 @@
     "@vanilla-extract/dynamic": "^2.1.1",
     "@vanilla-extract/recipes": "^0.5.2",
     "auto-launch": "^5.0.6",
-    "axios": "^1.6.8",
+    "axios": "^1.7.7",
     "better-sqlite3": "^11.2.1",
     "check-disk-space": "^3.4.0",
     "classnames": "^2.5.1",
@@ -59,7 +58,6 @@
     "i18next": "^23.11.2",
     "i18next-browser-languagedetector": "^7.2.1",
     "icojs": "^0.19.3",
-    "iso-639-1": "3.1.2",
     "jsdom": "^24.0.0",
     "jsonwebtoken": "^9.0.2",
     "knex": "^3.1.0",

src/locales/ar/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "اَلْعَرَبِيَّةُ",
   "home": {
     "featured": "مميّز",
     "trending": "شائع",

src/locales/be/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "беларуская мова",
   "home": {
     "featured": "Рэкамэндаванае",
     "trending": "Актуальнае",

src/locales/ca/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Català",
   "app": {
     "successfully_signed_in": "Has entrat correctament"
   },

src/locales/da/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Dansk",
   "home": {
     "featured": "Anbefalet",
     "trending": "Trender",

src/locales/en/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "English",
   "app": {
     "successfully_signed_in": "Successfully signed in"
   },

src/locales/es/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Español",
   "app": {
     "successfully_signed_in": "Sesión iniciada correctamente"
   },

src/locales/fa/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "فارسی",
   "home": {
     "featured": "پیشنهادی",
     "trending": "پرطرفدار",

src/locales/fr/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Français",
   "home": {
     "featured": "En vedette",
     "trending": "Tendance",

src/locales/hu/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Magyar",
   "home": {
     "featured": "Featured",
     "trending": "Népszerű",

src/locales/id/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Bahasa Indonesia",
   "app": {
     "successfully_signed_in": "Berhasil masuk"
   },

src/locales/index.ts

@@ -1,22 +1,47 @@
-export { default as en } from "./en/translation.json";
-export { default as ptPT } from "./pt-PT/translation.json";
-export { default as ptBR } from "./pt-BR/translation.json";
-export { default as es } from "./es/translation.json";
-export { default as nl } from "./nl/translation.json";
-export { default as fr } from "./fr/translation.json";
-export { default as hu } from "./hu/translation.json";
-export { default as it } from "./it/translation.json";
-export { default as pl } from "./pl/translation.json";
-export { default as ru } from "./ru/translation.json";
-export { default as tr } from "./tr/translation.json";
-export { default as be } from "./be/translation.json";
-export { default as uk } from "./uk/translation.json";
-export { default as zh } from "./zh/translation.json";
-export { default as id } from "./id/translation.json";
-export { default as ko } from "./ko/translation.json";
-export { default as da } from "./da/translation.json";
-export { default as ar } from "./ar/translation.json";
-export { default as fa } from "./fa/translation.json";
-export { default as ro } from "./ro/translation.json";
-export { default as ca } from "./ca/translation.json";
-export { default as kk } from "./kk/translation.json";
+import en from "./en/translation.json";
+import ptPT from "./pt-PT/translation.json";
+import ptBR from "./pt-BR/translation.json";
+import es from "./es/translation.json";
+import nl from "./nl/translation.json";
+import fr from "./fr/translation.json";
+import hu from "./hu/translation.json";
+import it from "./it/translation.json";
+import pl from "./pl/translation.json";
+import ru from "./ru/translation.json";
+import tr from "./tr/translation.json";
+import be from "./be/translation.json";
+import uk from "./uk/translation.json";
+import zh from "./zh/translation.json";
+import id from "./id/translation.json";
+import ko from "./ko/translation.json";
+import da from "./da/translation.json";
+import ar from "./ar/translation.json";
+import fa from "./fa/translation.json";
+import ro from "./ro/translation.json";
+import ca from "./ca/translation.json";
+import kk from "./kk/translation.json";
+
+export default {
+  "pt-BR": ptBR,
+  "pt-PT": ptPT,
+  en,
+  es,
+  nl,
+  fr,
+  hu,
+  it,
+  pl,
+  ru,
+  tr,
+  be,
+  uk,
+  zh,
+  id,
+  ko,
+  da,
+  ar,
+  fa,
+  ro,
+  ca,
+  kk,
+};

src/locales/it/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Italiano",
   "home": {
     "featured": "In primo piano",
     "trending": "Di tendenza",

src/locales/kk/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "қазақ тілі",
   "app": {
     "successfully_signed_in": "Сәтті кіру"
   },

src/locales/ko/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "한국어",
   "home": {
     "featured": "추천",
     "trending": "인기",

src/locales/nl/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Nederlands",
   "home": {
     "featured": "Uitgelicht",
     "trending": "Trending",

src/locales/pl/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Polski",
   "home": {
     "featured": "Wyróżnione",
     "trending": "Trendujące",

src/locales/pt-BR/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Português (Brasil)",
   "app": {
     "successfully_signed_in": "Autenticado com sucesso"
   },

src/locales/pt-PT/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Português (Portugal)",
   "app": {
     "successfully_signed_in": "Sessão iniciada com sucesso"
   },

src/locales/ro/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Română",
   "home": {
     "featured": "Recomandate",
     "trending": "Populare",

src/locales/ru/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Русский",
   "app": {
     "successfully_signed_in": "Успешный вход"
   },

src/locales/tr/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Türkçe",
   "home": {
     "featured": "Öne çıkan",
     "trending": "Popüler",

src/locales/uk/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "Українська",
   "app": {
     "successfully_signed_in": "Успішний вхід в систему"
   },

src/locales/zh/translation.json

@@ -1,4 +1,5 @@
 {
+  "language_name": "中文",
   "app": {
     "successfully_signed_in": "已成功登录"
   },

src/main/index.ts

@@ -7,7 +7,7 @@ import url from "node:url";
 import { electronApp, optimizer } from "@electron-toolkit/utils";
 import { logger, PythonInstance, WindowManager } from "@main/services";
 import { dataSource } from "@main/data-source";
-import * as resources from "@locales";
+import resources from "@locales";
 import { userPreferencesRepository } from "@main/repository";
 import { knexClient, migrationConfig } from "./knex-client";
 

src/renderer/src/main.tsx

@@ -26,7 +26,7 @@ import {
 
 import { store } from "./store";
 
-import * as resources from "@locales";
+import resources from "@locales";
 import { User } from "./pages/user/user";
 
 Sentry.init({});

src/renderer/src/pages/settings/settings-general.tsx

@@ -1,19 +1,14 @@
 import { useContext, useEffect, useState } from "react";
-import languages from "@cospired/i18n-iso-languages";
-import languagesEn from "@cospired/i18n-iso-languages/langs/en.json";
-
 import {
   TextField,
   Button,
   CheckboxField,
   SelectField,
 } from "@renderer/components";
 import { useTranslation } from "react-i18next";
-
 import { useAppSelector } from "@renderer/hooks";
-
 import { changeLanguage } from "i18next";
-import * as languageResources from "@locales";
+import languageResources from "@locales";
 import { orderBy } from "lodash-es";
 import { settingsContext } from "@renderer/context";
 
@@ -22,13 +17,6 @@ interface LanguageOption {
   nativeName: string;
 }
 
-languages.registerLocale(languagesEn);
-
-const customLanguageNames = {
-  ptBR: "Português (Brasil)",
-  ptPT: "Português (Portugal)",
-};
-
 export function SettingsGeneral() {
   const { t } = useTranslation("settings");
 
@@ -58,11 +46,9 @@ export function SettingsGeneral() {
 
     setLanguageOptions(
       orderBy(
-        Object.keys(languageResources).map((language) => {
+        Object.entries(languageResources).map(([language, value]) => {
           return {
-            nativeName:
-              customLanguageNames[language] ||
-              languages.getName(language, "en"),
+            nativeName: value.language_name,
             option: language,
           };
         }),
@@ -103,16 +89,14 @@ export function SettingsGeneral() {
 
   function updateFormWithUserPreferences() {
     if (userPreferences) {
-      const parsedLanguage = userPreferences.language;
-
       setForm((prev) => ({
         ...prev,
         downloadsPath: userPreferences.downloadsPath ?? defaultDownloadsPath,
         downloadNotificationsEnabled:
           userPreferences.downloadNotificationsEnabled,
         repackUpdatesNotificationsEnabled:
           userPreferences.repackUpdatesNotificationsEnabled,
-        language: parsedLanguage,
+        language: userPreferences.language,
       }));
     }
   }