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

partial implementation of wiki article language preference

Browse source
This commit is contained in:
sonora 2015-06-13 15:08:31 +02:00
parent 05f66b753c
commit 90eefe8ad6
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -340,7 +340,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
public static void showDescriptionDialog(Context ctx, OsmandApplication app, Amenity a) { public static void showDescriptionDialog(Context ctx, OsmandApplication app, Amenity a) {
String lang = app.getSettings().MAP_PREFERRED_LOCALE.get(); String lang = app.getSettings().MAP_PREFERRED_LOCALE.get();
if (a.getType().isWiki()) { if (a.getType().isWiki()) {
// first choice to display wiki article should be device display language, not map display language // First choice to display wiki article in should be the selected OsmAnd locale (not the map display language)
//showWiki(ctx, app, a, lang); //showWiki(ctx, app, a, lang);
showWiki(ctx, app, a, app.getSettings().PREFERRED_LOCALE.get()); showWiki(ctx, app, a, app.getSettings().PREFERRED_LOCALE.get());
} else { } else {
@ -386,6 +386,15 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
topBar.setTitleTextColor(ctx.getResources().getColor(getResIdFromAttribute(ctx, R.attr.pstsTextColor))); topBar.setTitleTextColor(ctx.getResources().getColor(getResIdFromAttribute(ctx, R.attr.pstsTextColor)));
String lng = a.getNameSelected(lang); String lng = a.getNameSelected(lang);
if(Algorithms.isEmpty(lng)) {
// Second choice to display wiki article in if it does not exist in the OsmAnd locale should be the longest article (most information, usually the on in the region's local language)
lng = a.getNameSelected("en");
}
if(Algorithms.isEmpty(lng)) {
//TODO: Third choice to display wiki article in if it does not exist in the OsmAnd locale or "en" should be the longest article (most information, usually the on in the region's local language)
lng = a.getNameSelected();
}
// This should not occur
if(Algorithms.isEmpty(lng)) { if(Algorithms.isEmpty(lng)) {
lng = "EN"; lng = "EN";
} }