From fe66a28638979b604858852df9e9d7d1d47646a5 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 15 Feb 2022 13:47:53 +0100
Subject: [PATCH] Fix language names

---
 lemmy-translations  |   2 +-
 package.json        |   1 -
 src/shared/utils.ts | 107 ++++++++++++++++++++------------------------
 yarn.lock           |   5 ---
 4 files changed, 50 insertions(+), 65 deletions(-)

diff --git a/lemmy-translations b/lemmy-translations
index 0d63b5af..b18bfc1a 160000
--- a/lemmy-translations
+++ b/lemmy-translations
@@ -1 +1 @@
-Subproject commit 0d63b5affe2273bb88b3593cdc13e4bb0f4d2d5d
+Subproject commit b18bfc1a8d512d081056cf5aa1f422e4710ef683
diff --git a/package.json b/package.json
index 63ddad7e..1134d480 100644
--- a/package.json
+++ b/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",
diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 6eb0e116..34315346 100644
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -1,5 +1,4 @@
 import emojiShortName from "emoji-short-name";
-import ISO6391 from "iso-639-1";
 import {
   BlockCommunityResponse,
   BlockPersonResponse,
@@ -116,54 +115,54 @@ export const fetchLimit = 20;
 export const mentionDropdownFetchLimit = 10;
 
 export const languages = [
-  { code: "ca" },
-  { code: "en" },
-  { code: "el" },
-  { code: "eu" },
-  { code: "eo" },
-  { code: "es" },
-  { code: "da" },
-  { code: "de" },
-  { code: "ga" },
-  { code: "gl" },
-  { code: "hr" },
-  { code: "hu" },
-  { code: "id" },
-  { code: "ka" },
-  { code: "ko" },
-  { code: "km" },
-  { code: "hi" },
-  { code: "fa" },
-  { code: "ja" },
-  { code: "oc" },
-  { code: "nb_NO" },
-  { code: "pl" },
-  { code: "pt_BR" },
-  { code: "zh" },
-  { code: "fi" },
-  { code: "fr" },
-  { code: "sv" },
-  { code: "sq" },
-  { code: "sr_Latn" },
-  { code: "th" },
-  { code: "tr" },
-  { code: "uk" },
-  { code: "ru" },
-  { code: "nl" },
-  { code: "it" },
-  { code: "bg" },
-  { code: "zh_Hant" },
-  { code: "cy" },
-  { code: "mnc" },
-  { code: "sk" },
-  { code: "vi" },
-  { code: "pt" },
-  { code: "ar" },
-  { code: "bn" },
-  { code: "ml" },
-  { code: "cs" },
-  { code: "as" },
-  { code: "lt" },
+  { code: "ca", name: "Català" },
+  { code: "en", name: "English" },
+  { code: "el", name: "Ελληνικά" },
+  { code: "eu", name: "Euskara" },
+  { code: "eo", name: "Esperanto" },
+  { code: "es", name: "Español" },
+  { code: "da", name: "Dansk" },
+  { code: "de", name: "Deutsch" },
+  { code: "ga", name: "Gaeilge" },
+  { code: "gl", name: "Galego" },
+  { code: "hr", name: "Hrvatski" },
+  { code: "hu", name: "Magyar" },
+  { code: "id", name: "Bahasa Indonesia" },
+  { code: "ka", name: "ქართული" },
+  { code: "ko", name: "한국어" },
+  { code: "km", name: "ខេមរភាសា" },
+  { code: "hi", name: "हिन्दी" },
+  { code: "fa", name: "فارسی" },
+  { code: "ja", name: "日本語" },
+  { code: "oc", name: "Occitan" },
+  { code: "nb_NO", name: "Norsk (bokmål)" },
+  { code: "pl", name: "Polski" },
+  { code: "pt_BR", name: "Português (Brasil)" },
+  { code: "zh", name: "中文" },
+  { code: "fi", name: "Suomi" },
+  { code: "fr", name: "Français" },
+  { code: "sv", name: "Svenska" },
+  { code: "sq", name: "Shqip" },
+  { code: "sr_Latn", name: "Српски" },
+  { code: "th", name: "ไทย" },
+  { code: "tr", name: "Türkçe" },
+  { code: "uk", name: "Українська" },
+  { code: "ru", name: "Русский" },
+  { code: "nl", name: "Nederlands" },
+  { code: "it", name: "Italiano" },
+  { code: "bg", name: "Български" },
+  { code: "zh_Hant", name: "文言" },
+  { code: "cy", name: "Cymraeg" },
+  { code: "mnc", name: "ᠮᠠᠨᠵᡠ ᡤᡳᠰᡠᠨ" },
+  { code: "sk", name: "Slovenčina" },
+  { code: "vi", name: "Tiếng Việt" },
+  { code: "pt", name: "Português" },
+  { code: "ar", name: "العربية" },
+  { code: "bn", name: "বাংলা" },
+  { code: "ml", name: "മലയാളം" },
+  { code: "cs", name: "Česky" },
+  { code: "as", name: "অসমীয়া" },
+  { code: "lt", name: "Lietuvių" },
 ];
 
 export const themes = [
@@ -429,15 +428,7 @@ export function debounce(func: any, wait = 1000, immediate = false) {
 }
 
 export function getNativeLanguageName(code: string): string {
-  let [isoCode, qualifier] = code.split("_");
-
-  let native = ISO6391.getNativeName(isoCode) || code;
-
-  if (qualifier) {
-    return `${native}_${qualifier}`;
-  } else {
-    return native;
-  }
+  return languages.filter(c => c.code === code).map(l => l.name)[0];
 }
 
 // TODO
diff --git a/yarn.lock b/yarn.lock
index 824c1a8d..b787a30f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4464,11 +4464,6 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-iso-639-1@^2.1.10:
-  version "2.1.11"
-  resolved "https://registry.yarnpkg.com/iso-639-1/-/iso-639-1-2.1.11.tgz#a928a7c71025321258bd46e03ae85e49ded5dbdc"
-  integrity sha512-WDF2XWfw1GuPvjn3YEn1+gFGF+72ZltVcjNhaWwmgvveN+rTy3XzWYwgIp/Y8CSZYclNvJ4Vqeh5byubiXCzPw==
-
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"