Adding a few missing langs. (#325)

* Adding a few missing langs.

* Remove unused extra language issue.

diff --git a/src/server/index.tsx b/src/server/index.tsx
index 2d2a6624f7915f23095828a68bb301f5ae0ba5ca..57c59645a9ac205f43df8a8d4902fc8fb106b428 100644 (file)
--- a/src/server/index.tsx
+++ b/src/server/index.tsx
@@ -76,20 +76,10 @@ server.get("/*", async (req, res) => {
     return res.redirect(`/404?err=${errCode}`);
   }
 
-  let acceptLang = req.headers["accept-language"]
-    ? req.headers["accept-language"].split(",")[0]
-    : "en";
-  let lang = site.my_user
-    ? site.my_user.local_user.lang == "browser"
-      ? acceptLang
-      : "en"
-    : acceptLang;
-
   let isoData: IsoData = {
     path: req.path,
     site_res: site,
     routeData,
-    lang,
   };
 
   const wrapper = (
@@ -160,9 +150,9 @@ server.listen(Number(port), hostname, () => {
   console.log(`http://${hostname}:${port}`);
 });
 
-function setForwardedHeaders(
-  headers: IncomingHttpHeaders
-): { [key: string]: string } {
+function setForwardedHeaders(headers: IncomingHttpHeaders): {
+  [key: string]: string;
+} {
   let out = {
     host: headers.host,
   };

diff --git a/src/shared/i18next.ts b/src/shared/i18next.ts
index 0bb85aea7853a5dc7f8d671030a711cb219649b6..6db9dd1f6f4496c167fe2f317c5eff86ce459eb9 100644 (file)
--- a/src/shared/i18next.ts
+++ b/src/shared/i18next.ts
@@ -35,6 +35,9 @@ import { th } from "./translations/th";
 import { bg } from "./translations/bg";
 import { ar } from "./translations/ar";
 import { ko } from "./translations/ko";
+import { id } from "./translations/id";
+import { nb_NO } from "./translations/nb_NO";
+import { zh_Hant } from "./translations/zh_Hant";
 
 // https://github.com/nimbusec-oss/inferno-i18next/blob/master/tests/T.test.js#L66
 const resources = {
@@ -72,7 +75,10 @@ const resources = {
   th,
   bg,
   ar,
-  ko
+  ko,
+  id,
+  nb_NO,
+  zh_Hant,
 };
 
 function format(value: any, format: any): any {

diff --git a/src/shared/interfaces.ts b/src/shared/interfaces.ts
index d4477b730cef6469116f2ea827512b9066388c5e..e09f3bd598c65ebff0208cc7ff03cbe6b41139e4 100644 (file)
--- a/src/shared/interfaces.ts
+++ b/src/shared/interfaces.ts
@@ -9,9 +9,6 @@ export interface IsoData {
   path: string;
   routeData: any[];
   site_res: GetSiteResponse;
-  // Lang and theme
-  lang: string;
-  // communities?: ListCommunitiesResponse;
 }
 
 export interface ILemmyConfig {

diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 72983113052f44e935f4ca1cc9f31e16109945d7..2510b95f319fa147a3fb8f14c9777831e18d0a19 100644 (file)
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -29,6 +29,8 @@ import "moment/locale/ko";
 import "moment/locale/da";
 import "moment/locale/hr";
 import "moment/locale/bg";
+import "moment/locale/id";
+import "moment/locale/nb";
 
 import {
   UserOperation,
@@ -106,6 +108,7 @@ export const languages = [
   { code: "gl" },
   { code: "hr" },
   { code: "hu" },
+  { code: "id" },
   { code: "ka" },
   { code: "ko" },
   { code: "km" },
@@ -113,6 +116,7 @@ export const languages = [
   { code: "fa" },
   { code: "ja" },
   { code: "oc" },
+  { code: "nb_NO" },
   { code: "pl" },
   { code: "pt_BR" },
   { code: "zh" },
@@ -128,6 +132,7 @@ export const languages = [
   { code: "nl" },
   { code: "it" },
   { code: "bg" },
+  { code: "zh_Hant" },
 ];
 
 export const themes = [
@@ -458,6 +463,10 @@ export function getMomentLanguage(): string {
     lang = "th";
   } else if (lang.startsWith("bg")) {
     lang = "bg";
+  } else if (lang.startsWith("id")) {
+    lang = "id";
+  } else if (lang.startsWith("nb")) {
+    lang = "nb";
   } else {
     lang = "en";
   }