The weeb for the next gen discord boat - Wamellow
wamellow.com
bot
discord
Revert "fetch func in translations config"
This reverts commit e6e74cf999c2db56d3f53fdbb19fac273dc99484.
+4
-10
+1
-1
app/provider.tsx
+1
-1
app/provider.tsx
···
43
43
function setLanguage(language: LanguageLocale) {
44
44
setLocale(language);
45
45
document.cookie = `${translationsConfig.localeCookieName}=${language}; path=/;`;
46
-
fetch((() => translationsConfig.fetchUrl(language))()).then((res) => res.json()).then(setFile).catch(console.error);
46
+
fetch(`/locales/${language}.json`).then((res) => res.json()).then(setFile);
47
47
}
48
48
49
49
return (
+2
-6
app/translations.ts
+2
-6
app/translations.ts
···
1
1
"use server";
2
2
3
-
import { LanguageLocale, translationsConfig } from "@/common/languages";
4
3
5
-
export async function loadFile(locale: LanguageLocale) {
4
+
export async function loadFile(locale: string) {
6
5
console.log("Fetching locale", locale);
7
6
8
-
return await fetch((() => translationsConfig.fetchUrl(locale))()).then((res) => res.json()).catch(async (err) => {
9
-
console.error("Failed to fetch locale", locale, err);
10
-
return await fetch((() => translationsConfig.fetchUrl(translationsConfig.defaultLocale))()).then((res) => res.json());
11
-
});
7
+
return await fetch(`${process.env.NEXT_PUBLIC_BASE_API}/locales/${locale}.json`).then((res) => res.json());
12
8
}
+1
-3
common/languages.ts
+1
-3
common/languages.ts
···
16
16
export const translationsConfig: TranslationConfig = {
17
17
languages,
18
18
localeCookieName: "locale",
19
-
defaultLocale: "en",
20
-
fetchUrl: (locale) => process.env.NEXT_PUBLIC_BASE_API + `/locales/${locale}.json` // interesting how this env working on client in next
19
+
defaultLocale: "en"
21
20
};
22
21
23
22
export type LanguageLocale = typeof languages[number]["locale"];
···
26
25
languages: typeof languages;
27
26
localeCookieName: string;
28
27
defaultLocale: LanguageLocale
29
-
fetchUrl: (locale: LanguageLocale) => string;
30
28
}