Fix language names

package.json

@@ -74,7 +74,6 @@
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "^7.0.4",
     "import-sort-style-module": "^6.0.0",
-    "iso-639-1": "^2.1.10",
     "lemmy-js-client": "0.15.1-rc.1",
     "lint-staged": "^12.1.2",
     "mini-css-extract-plugin": "^2.4.5",

src/shared/components/app/navbar.tsx

@@ -18,7 +18,7 @@ import { UserService, WebSocketService } from "../../services";
 import {
   authField,
   donateLemmyUrl,
-  getLanguage,
+  getLanguages,
   isBrowser,
   notifyComment,
   notifyPrivateMessage,
@@ -612,7 +612,7 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
       setTheme(
         UserService.Instance.myUserInfo.local_user_view.local_user.theme
       );
-      i18n.changeLanguage(getLanguage());
+      i18n.changeLanguage(getLanguages()[0]);
       this.state.isLoggedIn = true;
       this.setState(this.state);
     } else if (op == UserOperation.CreateComment) {

src/shared/components/common/moment-time.tsx

@@ -1,7 +1,7 @@
 import { Component } from "inferno";
 import moment from "moment";
 import { i18n } from "../../i18next";
-import { capitalizeFirstLetter, getMomentLanguage } from "../../utils";
+import { capitalizeFirstLetter, getLanguages } from "../../utils";
 import { Icon } from "./icon";
 
 interface MomentTimeProps {
@@ -18,7 +18,7 @@ export class MomentTime extends Component<MomentTimeProps, any> {
   constructor(props: any, context: any) {
     super(props, context);
 
-    let lang = getMomentLanguage();
+    let lang = getLanguages();
 
     moment.locale(lang);
   }

src/shared/components/person/settings.tsx

@@ -18,7 +18,7 @@ import {
   UserOperation,
 } from "lemmy-js-client";
 import { Subscription } from "rxjs";
-import { i18n } from "../../i18next";
+import { i18n, languages } from "../../i18next";
 import { UserService, WebSocketService } from "../../services";
 import {
   authField,
@@ -30,10 +30,8 @@ import {
   elementUrl,
   fetchCommunities,
   fetchUsers,
-  getLanguage,
-  getNativeLanguageName,
+  getLanguages,
   isBrowser,
-  languages,
   personSelectName,
   personToChoice,
   setIsoData,
@@ -526,9 +524,7 @@ export class Settings extends Component<any, SettingsState> {
                 {languages
                   .sort((a, b) => a.code.localeCompare(b.code))
                   .map(lang => (
-                    <option value={lang.code}>
-                      {getNativeLanguageName(lang.code)}
-                    </option>
+                    <option value={lang.code}>{lang.name}</option>
                   ))}
               </select>
             </div>
@@ -935,7 +931,7 @@ export class Settings extends Component<any, SettingsState> {
 
   handleLangChange(i: Settings, event: any) {
     i.state.saveUserSettingsForm.lang = event.target.value;
-    i18n.changeLanguage(getLanguage(i.state.saveUserSettingsForm.lang));
+    i18n.changeLanguage(getLanguages(i.state.saveUserSettingsForm.lang)[0]);
     i.setState(i.state);
   }
 

src/shared/i18next.ts

@@ -1,11 +1,8 @@
-import i18next, { i18nTyped } from "i18next";
+import i18next, { i18nTyped, Resource } from "i18next";
 import { ar } from "./translations/ar";
-import { as } from "./translations/as";
 import { bg } from "./translations/bg";
-import { bn } from "./translations/bn";
 import { ca } from "./translations/ca";
 import { cs } from "./translations/cs";
-import { cy } from "./translations/cy";
 import { da } from "./translations/da";
 import { de } from "./translations/de";
 import { el } from "./translations/el";
@@ -18,88 +15,57 @@ import { fi } from "./translations/fi";
 import { fr } from "./translations/fr";
 import { ga } from "./translations/ga";
 import { gl } from "./translations/gl";
-import { hi } from "./translations/hi";
 import { hr } from "./translations/hr";
-import { hu } from "./translations/hu";
 import { id } from "./translations/id";
 import { it } from "./translations/it";
 import { ja } from "./translations/ja";
-import { ka } from "./translations/ka";
-import { km } from "./translations/km";
 import { ko } from "./translations/ko";
-import { lt } from "./translations/lt";
-import { ml } from "./translations/ml";
-import { mnc } from "./translations/mnc";
-import { nb_NO } from "./translations/nb_NO";
 import { nl } from "./translations/nl";
-import { oc } from "./translations/oc";
 import { pl } from "./translations/pl";
 import { pt } from "./translations/pt";
 import { pt_BR } from "./translations/pt_BR";
 import { ru } from "./translations/ru";
-import { sk } from "./translations/sk";
-import { sq } from "./translations/sq";
-import { sr_Latn } from "./translations/sr_Latn";
 import { sv } from "./translations/sv";
-import { th } from "./translations/th";
-import { tr } from "./translations/tr";
-import { uk } from "./translations/uk";
 import { vi } from "./translations/vi";
 import { zh } from "./translations/zh";
 import { zh_Hant } from "./translations/zh_Hant";
-import { getLanguage } from "./utils";
+import { getLanguages } from "./utils";
 
-// https://github.com/nimbusec-oss/inferno-i18next/blob/master/tests/T.test.js#L66
-const resources = {
-  en,
-  el,
-  eu,
-  eo,
-  es,
-  ka,
-  hi,
-  de,
-  zh,
-  fr,
-  sv,
-  ru,
-  nl,
-  it,
-  fi,
-  ca,
-  fa,
-  pl,
-  pt_BR,
-  ja,
-  gl,
-  tr,
-  hu,
-  uk,
-  sq,
-  km,
-  ga,
-  sr_Latn,
-  da,
-  oc,
-  hr,
-  th,
-  bg,
-  ar,
-  ko,
-  id,
-  nb_NO,
-  zh_Hant,
-  cy,
-  mnc,
-  sk,
-  vi,
-  pt,
-  bn,
-  ml,
-  cs,
-  as,
-  lt,
-};
+export const languages = [
+  { resource: ar, code: "ar", name: "العربية" },
+  { resource: bg, code: "bg", name: "Български" },
+  { resource: ca, code: "ca", name: "Català" },
+  { resource: cs, code: "cs", name: "Česky" },
+  { resource: da, code: "da", name: "Dansk" },
+  { resource: de, code: "de", name: "Deutsch" },
+  { resource: el, code: "el", name: "Ελληνικά" },
+  { resource: en, code: "en", name: "English" },
+  { resource: eo, code: "eo", name: "Esperanto" },
+  { resource: es, code: "es", name: "Español" },
+  { resource: eu, code: "eu", name: "Euskara" },
+  { resource: fa, code: "fa", name: "فارسی" },
+  { resource: fi, code: "fi", name: "Suomi" },
+  { resource: fr, code: "fr", name: "Français" },
+  { resource: ga, code: "ga", name: "Gaeilge" },
+  { resource: gl, code: "gl", name: "Galego" },
+  { resource: hr, code: "hr", name: "Hrvatski" },
+  { resource: id, code: "id", name: "Bahasa Indonesia" },
+  { resource: it, code: "it", name: "Italiano" },
+  { resource: ja, code: "ja", name: "日本語" },
+  { resource: ko, code: "ko", name: "한국어" },
+  { resource: nl, code: "nl", name: "Nederlands" },
+  { resource: pl, code: "pl", name: "Polski" },
+  { resource: pt, code: "pt", name: "Português" },
+  { resource: pt_BR, code: "pt_BR", name: "Português (Brasil)" },
+  { resource: ru, code: "ru", name: "Русский" },
+  { resource: sv, code: "sv", name: "Svenska" },
+  { resource: vi, code: "vi", name: "Tiếng Việt" },
+  { resource: zh, code: "zh", name: "中文" },
+  { resource: zh_Hant, code: "zh_Hant", name: "文言" },
+];
+
+const resources: Resource = {};
+languages.forEach(l => (resources[l.code] = l.resource));
 
 function format(value: any, format: any): any {
   return format === "uppercase" ? value.toUpperCase() : value;
@@ -109,14 +75,11 @@ i18next.init({
   debug: false,
   compatibilityJSON: "v3",
   // load: 'languageOnly',
-
   // initImmediate: false,
-  lng: getLanguage(),
+  lng: getLanguages()[0],
   fallbackLng: "en",
   resources,
   interpolation: { format },
 });
 
 export const i18n = i18next as i18nTyped;
-
-export { resources };