From be6a209fe902f9fa369c06b004ce6a06bbb296cc Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Tue, 7 Apr 2020 22:00:39 -0400
Subject: [PATCH] Sort languages, add Hebrew

---
 .../ui/setting/SettingsGeneralController.kt   | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index 430c9a355d..b8c543a6b4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -53,14 +53,22 @@ class SettingsGeneralController : SettingsController() {
             listPreference {
                 key = Keys.lang
                 titleRes = R.string.pref_language
-                entryValues = arrayOf("", "ar", "bg", "bn", "ca", "cs", "de", "el", "en-US", "en-GB",
-                        "es", "fr", "hi", "hu", "in", "it", "ja", "ko", "lv", "ms", "nb-rNO", "nl", "pl", "pt",
-                        "pt-BR", "ro", "ru", "sc", "sr", "sv", "th", "tl", "tr", "uk", "vi", "zh-rCN")
-                entries = entryValues.map { value ->
-                    val locale = LocaleHelper.getLocaleFromString(value.toString())
-                    locale?.getDisplayName(locale)?.capitalize()
-                            ?: context.getString(R.string.system_default)
-                }.toTypedArray()
+
+                val langs = mutableListOf<Pair<String, String>>()
+                langs += Pair("", context.getString(R.string.system_default))
+                langs += arrayOf(
+                    "ar", "bg", "bn", "ca", "cs", "de", "el", "en-US", "en-GB", "es", "fr", "he",
+                    "hi", "hu", "in", "it", "ja", "ko", "lv", "ms", "nb-rNO", "nl", "pl", "pt",
+                    "pt-BR", "ro", "ru", "sc", "sr", "sv", "th", "tl", "tr", "uk", "vi", "zh-rCN"
+                )
+                    .map {
+                        val locale = LocaleHelper.getLocaleFromString(it)
+                        Pair(it, locale!!.getDisplayName(locale).capitalize())
+                    }
+                    .sortedBy { it.second }
+
+                entryValues = langs.map { it.first }.toTypedArray()
+                entries = langs.map { it.second }.toTypedArray()
                 defaultValue = ""
                 summary = "%s"