Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-12-03 08:57:38 +01:00
commit d4d4417872

View file

@ -186,10 +186,8 @@ public class RouteDataObject {
}
}
}
if(transliterate && destinationDefault != null) {
return destRef1 + Junidecode.unidecode(destinationDefault);
} else if (destinationDefault != null) {
return destRef1 + destinationDefault;
if(destinationDefault != null) {
return destRef1 + ((transliterate) ? Junidecode.unidecode(destinationDefault) : destinationDefault);
}
}
return "".equals(destRef) ? null : destRef;