update translations

3 files changed, 27 insertions, 11 deletions

diff --git a/src/lib/translations/index.js b/src/lib/translations/index.js
index a07a6dbf..c18b0093 100644
--- a/src/lib/translations/index.js
+++ b/src/lib/translations/index.js
@@ -12,16 +12,17 @@ function createLocaleLoader(localeCode) {
 }
 
 const availableLocales = Object.keys(lang);
-const translations = {};
+const trans = {};
 for (let i = 0; i < availableLocales.length; i++) {
-  translations[availableLocales[i]] = { lang };
+  trans[availableLocales[i]] = { lang };
 }
 const loaders = availableLocales.map(createLocaleLoader);
 
+export const defaultLocale = 'en';
+
 const config = {
-  initLocale: "en",
   fallbackLocale: "en",
-  translations,
+  translations: trans,
   loaders: [
     {
       locale: "en",
@@ -49,6 +50,11 @@ const config = {
       loader: async () => (await import("../../locales/de.json")).default,
     },
     {
+      locale: "ja",
+      key: "",
+      loader: async () => (await import("../../locales/ja.json")).default,
+    },
+    {
       locale: "zh",
       key: "",
       loader: async () => (await import("../../locales/zh.json")).default,
@@ -66,6 +72,14 @@ const config = {
   ],
 };
 
-export const { t, loading, locales, locale, loadTranslations } = new i18n(
-  config
-);
+export const {
+  t,
+  loading,
+  locales,
+  locale,
+  loadTranslations,
+  addTranslations,
+  translations,
+  setLocale,
+  setRoute,
+} = new i18n(config);
diff --git a/src/lib/translations/lang.json b/src/lib/translations/lang.json
index d18a67e3..85f1b9c1 100644
--- a/src/lib/translations/lang.json
+++ b/src/lib/translations/lang.json
@@ -1,8 +1,9 @@
 {
   "en": "English",
-  "fr": "Français",
   "es": "Español",
+  "fr": "Français",
   "de": "Deutsch",
+  "ja": "日本語",
   "pt": "Português",
   "zh": "中国人",
   "fa": "فارسی ",
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 4ffbb8b0..81f5a80f 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -105,7 +105,7 @@ let recent = [];
 export let success = (m, clear = true) => {
   if (recent.includes(m)) return;
   recent.push(m);
-    setTimeout(() => (recent = []), 5000);
+  setTimeout(() => (recent = []), 5000);
   if (clear) toast.pop();
   toast.push(m, {
     theme: {
@@ -114,7 +114,7 @@ export let success = (m, clear = true) => {
   });
 };
 
-  export let warning = (m, clear = true) => {
+export let warning = (m, clear = true) => {
   if (clear) toast.pop();
   toast.push(m, {
     theme: {
@@ -156,13 +156,14 @@ export let login = async (user, cookies, ip) => {
     if (text.startsWith("2fa")) throw new Error("2fa");
   }
 
-  let { token } = await res.json();
+  let { user: u, token } = await res.json();
   if (!token) throw new Error("Login failed");
 
   let expires = new Date();
   expires.setSeconds(expires.getSeconds() + maxAge);
 
   let opts = { path: "/", expires };
+  if (u.language) cookies.set("lang", u.language, opts);
   cookies.set("username", user.username, opts);
   cookies.set("token", token, opts);
 };