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

Add "Display language" and "Device language" to Menus in Latin characters

Browse source
This commit is contained in:
sonora 2015-01-07 17:20:46 +01:00
parent 9616c4d89a
commit d3b16e84f1
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/no_translate.xml
View file

@ -36,4 +36,6 @@
\n\tHarry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant.
</string>
<string name="app_edition"></string>
<string name="preferred_locale_no_translate">Display language</string>
<string name="system_default_no_translate">Device language</string>
</resources>

2
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -729,7 +729,7 @@ public class OsmandSettings {
public final OsmandPreference<Boolean> SHOW_POI_LABEL = new BooleanPreference("show_poi_label", false).makeGlobal();
// this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<String> PREFERRED_LOCALE = new StringPreference("preferred_locale", "").makeGlobal();
public final OsmandPreference<String> PREFERRED_LOCALE = new StringPreference("preferred_locale" + " (" + preferred_locale_no_translate + ")", "").makeGlobal();
public static final String TRANSPORT_STOPS_OVER_MAP = "transportStops";

4
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -153,6 +153,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
// See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/
String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")";
String latinSystemDefaultSuffix = " (" + getString(R.string.system_default_no_translate) + ")";
//getResources().getAssets().getLocales();
entrieValues = new String[] { "",
"en",
@ -203,7 +205,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
"uk",
"vi",
"cy"};
entries = new String[] { getString(R.string.system_locale),
entries = new String[] { getString(R.string.system_locale) + latinSystemDefaultSuffix,
getString(R.string.lang_en),
getString(R.string.lang_af),
getString(R.string.lang_al) + incompleteSuffix,