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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-06-16 00:13:05 +02:00
commit b581990e7a
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
OsmAnd-java/src/net/osmand/data/Amenity.java
View file

@ -157,27 +157,27 @@ public class Amenity extends MapObject {
setAdditionalInfo(PHONE, phone);
}
public String getNameSelected(String lang, String defLang) {
public String getContentSelected(String tag, String lang, String defLang) {
if (lang != null) {
String translateName;
if (lang.equals("en")) {
translateName = getEnName();
} else {
translateName = getAdditionalInfo("name:" + lang);
}
String translateName = getAdditionalInfo(tag + ":" + lang);
if (!Algorithms.isEmpty(translateName)) {
return lang;
}
}
if(!Algorithms.isEmpty(getName())) {
String plainName = getAdditionalInfo(tag);
if (!Algorithms.isEmpty(plainName)) {
return defLang;
}
String enName = getAdditionalInfo(tag + ":en");
if (!Algorithms.isEmpty(enName)) {
return enName;
}
for (String nm : getAdditionalInfo().keySet()) {
if (nm.startsWith("name:")) {
return nm.substring("name:".length());
}
}
return "";
return defLang;
}
public String getName(String lang) {

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

@ -382,7 +382,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
topBar.setBackgroundColor(ctx.getResources().getColor(getResIdFromAttribute(ctx, R.attr.pstsTabBackground)));
topBar.setTitleTextColor(ctx.getResources().getColor(getResIdFromAttribute(ctx, R.attr.pstsTextColor)));
String lng = a.getNameSelected(lang, "en");
String lng = a.getContentSelected("content", lang, "en");
if(Algorithms.isEmpty(lng)) {
lng = "en";
}