From 1c688a3479fd7df5df778fdc8fa3012f1caeca18 Mon Sep 17 00:00:00 2001
From: Gregor Santner <gsantner@users.noreply.github.com>
Date: Sat, 2 Oct 2021 14:42:07 +0200
Subject: [PATCH 1/2] Fix language preference: Properly show all languages (PR
 #1453 by @gsantner)

(cherry picked from commit 7ff1f1389d69df9ac2c0e041600451649325ac85)
---
 build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 75a6ed58..4e1fd9c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -83,14 +83,15 @@ static String findUsedAndroidLocales() {
     Set<String> langs = new HashSet<>()
     new File('.').eachFileRecurse(groovy.io.FileType.DIRECTORIES) {
         final foldername = it.name
-        if (foldername.startsWith('values-') && !it.canonicalPath.contains("build" + File.separator + "intermediates") && !it.canonicalPath.contains("gradle" + File.separator + "daemon")) {
+        if (foldername.contains('values-') && !it.absolutePath.contains("build" + File.separator + "intermediates") && !foldername.matches(".*values-((.*[0-9])|(land)|(port)).*")) {
             new File(it.toString()).eachFileRecurse(groovy.io.FileType.FILES) {
-                if (it.name.toLowerCase().endsWith(".xml") && it.getCanonicalFile().getText('UTF-8').contains("<string")) {
+                if (it.exists() && it.name.toLowerCase().endsWith(".xml") && it.getText('UTF-8').contains("<string")) {
                     langs.add(foldername.replace("values-", ""))
                 }
             }
         }
     }
+    langs = langs.sort()
     return '{' + langs.collect { "\"${it}\"" }.join(",") + '}'
 }
 

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 2/2] 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 = { ->