Compare commits

...

2 commits

Author SHA1 Message Date
Dessalines
7b6b47c7c8 Remove unused extra language issue. 2021-07-16 13:52:27 -04:00
Dessalines
4a89c24075 Adding a few missing langs. 2021-07-16 13:35:02 -04:00
4 changed files with 19 additions and 17 deletions

View file

@ -76,20 +76,10 @@ server.get("/*", async (req, res) => {
return res.redirect(`/404?err=${errCode}`); 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 = { let isoData: IsoData = {
path: req.path, path: req.path,
site_res: site, site_res: site,
routeData, routeData,
lang,
}; };
const wrapper = ( const wrapper = (
@ -160,9 +150,9 @@ server.listen(Number(port), hostname, () => {
console.log(`http://${hostname}:${port}`); console.log(`http://${hostname}:${port}`);
}); });
function setForwardedHeaders( function setForwardedHeaders(headers: IncomingHttpHeaders): {
headers: IncomingHttpHeaders [key: string]: string;
): { [key: string]: string } { } {
let out = { let out = {
host: headers.host, host: headers.host,
}; };

View file

@ -35,6 +35,9 @@ import { th } from "./translations/th";
import { bg } from "./translations/bg"; import { bg } from "./translations/bg";
import { ar } from "./translations/ar"; import { ar } from "./translations/ar";
import { ko } from "./translations/ko"; 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 // https://github.com/nimbusec-oss/inferno-i18next/blob/master/tests/T.test.js#L66
const resources = { const resources = {
@ -72,7 +75,10 @@ const resources = {
th, th,
bg, bg,
ar, ar,
ko ko,
id,
nb_NO,
zh_Hant,
}; };
function format(value: any, format: any): any { function format(value: any, format: any): any {

View file

@ -9,9 +9,6 @@ export interface IsoData {
path: string; path: string;
routeData: any[]; routeData: any[];
site_res: GetSiteResponse; site_res: GetSiteResponse;
// Lang and theme
lang: string;
// communities?: ListCommunitiesResponse;
} }
export interface ILemmyConfig { export interface ILemmyConfig {

View file

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