Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix sysLocale and enLocale

Browse source
This commit is contained in:
sonora 2016-05-30 13:21:06 +02:00
parent 5481c0ebfe
commit e5213d2937
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -539,6 +539,8 @@ public class ConfigureMapMenu {
mp.put(ids[i], values[i]);
}
ArrayList<String> lst = new ArrayList<>(mp.keySet());
String systemLocale = ctx.getString(R.string.system_locale) + " (" + ctx.getString(R.string.system_locale_no_translate) + ")";
String englishLocale = ctx.getString(R.string.lang_en);
Collections.sort(lst, new Comparator<String>() {
@Override
public int compare(String lhs, String rhs) {
@ -547,11 +549,11 @@ public class ConfigureMapMenu {
if (i1 != i2) {
return i1 < i2 ? -1 : 1;
}
//i1 = lhs.equals(ctx.getString(R.string.system_locale) + " (" + ctx.getString(R.string.system_locale_no_translate) + ")") ? 0 : (lhs.equals(ctx.getString(R.string.lang_en)) ? 1 : 2);
//i2 = rhs.equals(ctx.getString(R.string.system_locale) + " (" + ctx.getString(R.string.system_locale_no_translate) + ")") ? 0 : (rhs.equals(ctx.getString(R.string.lang_en)) ? 1 : 2);
//if (i1 != i2) {
// return i1 < i2 ? -1 : 1;
//}
i1 = lhs.equals(systemLocale) ? 0 : (lhs.equals(englishLocale)) ? 1 : 2);
i2 = rhs.equals(systemLocale) ? 0 : (rhs.equals(englishLocale)) ? 1 : 2);
if (i1 != i2) {
return i1 < i2 ? -1 : 1;
}
return mp.get(lhs).compareTo(mp.get(rhs));
}
});