From c60e363d3cf1e6b478f987f28d7da08d766c9412 Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@users.noreply.github.com>
Date: Sat, 2 Oct 2021 15:07:34 +0200
Subject: [PATCH] Fix recently added languages not displayed accordingly (#1454
 by @gsantner)

(cherry picked from commit c9ffc3497fd0d57e79cfe73ba7e5b174cec104be)

Conflicts:
	app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
---
 .../opoc/preference/nonsupport/LanguagePreference.java | 10 ++++++++++
 build.gradle                                           |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java b/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
index 04c3be4f..d1975f44 100644
--- a/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
+++ b/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
@@ -153,6 +153,16 @@ public class LanguagePreference extends ListPreference {
             ret = ret.substring(0, ret.indexOf(" ") + 1) + "Simplified" + ret.substring(ret.indexOf(" "));
         } else if (localeAndroidCode.equals("zh-rTW")) {
             ret = ret.substring(0, ret.indexOf(" ") + 1) + "Traditional" + ret.substring(ret.indexOf(" "));
+        } else if (localeAndroidCode.equals("sr-rRS")) {
+            ret = ret.substring(0, ret.indexOf(" ") + 1) + "Latin" + ret.substring(ret.indexOf(" "));
+        } else if (localeAndroidCode.startsWith("sr")) {
+            ret = ret.substring(0, ret.indexOf(" ") + 1) + "Cyrillic" + ret.substring(ret.indexOf(" "));
+        } else if (localeAndroidCode.equals("fil")) {
+            ret = ret.substring(0, ret.indexOf("(") + 1) + "Philippines)";
+        } else if (localeAndroidCode.equals("kmr")) {
+            ret = "Kurdish Kurmanji (کورمانجی)";
+        } else if (localeAndroidCode.equals("ckb")) {
+            ret = "Kurdish Sorani (" + ret.split("\\(")[1];
         }
 
         return ret;
diff --git a/build.gradle b/build.gradle
index 4e1fd9c8..dbcc3563 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,8 +91,7 @@ static String findUsedAndroidLocales() {
             }
         }
     }
-    langs = langs.sort()
-    return '{' + langs.collect { "\"${it}\"" }.join(",") + '}'
+    return '{' + langs.sort().collect { "\"${it}\"" }.join(",") + '}'
 }
 
 ext.getGitHash = { ->