vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-10 02:39:43 +02:00
Code Issues Releases Wiki Activity

Fix recently added languages not displayed accordingly (#1454 by @gsantner)

Browse source 
(cherry picked from commit c9ffc3497fd0d57e79cfe73ba7e5b174cec104be)

Conflicts:
	app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
This commit is contained in:
Gregor Santner 2021-10-02 15:07:34 +02:00 • committed by James Addison
parent 1c688a3479
commit c60e363d3c
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
View file

@ -153,6 +153,16 @@ public class LanguagePreference extends ListPreference {
ret = ret.substring(0, ret.indexOf(" ") + 1) + "Simplified" + ret.substring(ret.indexOf(" ")); ret = ret.substring(0, ret.indexOf(" ") + 1) + "Simplified" + ret.substring(ret.indexOf(" "));
} else if (localeAndroidCode.equals("zh-rTW")) { } else if (localeAndroidCode.equals("zh-rTW")) {
ret = ret.substring(0, ret.indexOf(" ") + 1) + "Traditional" + ret.substring(ret.indexOf(" ")); 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; return ret;

3
build.gradle
View file

@ -91,8 +91,7 @@ static String findUsedAndroidLocales() {
} }
} }
} }
langs = langs.sort() return '{' + langs.sort().collect { "\"${it}\"" }.join(",") + '}'
return '{' + langs.collect { "\"${it}\"" }.join(",") + '}'
} }
ext.getGitHash = { -> ext.getGitHash = { ->