Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-12-02 20:11:03 +01:00
commit a58b4c914e

View file

@ -145,7 +145,7 @@ public class RouteDataObject {
public String getDestinationName(String lang, boolean transliterate, boolean direction){
//Issue #3289: Treat destination:ref like a destination, not like a ref
String destRef = ((getDestinationRef(direction) == null) || getDestinationRef(direction).equals(getRef(direction)) ? "" : getDestinationRef(direction);
String destRef = ((getDestinationRef(direction) == null) || getDestinationRef(direction).equals(getRef(direction))) ? "" : getDestinationRef(direction);
String destRef1 = ("".equals(destRef)) ? "" : destRef + ", ";
if(names != null) {