Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-08-17 07:40:55 +02:00
commit 3a39c1d44c

View file

@ -710,14 +710,8 @@ public class RoutingHelper {
public static String formatStreetName(String name, String ref, String destination, String towards) { public static String formatStreetName(String name, String ref, String destination, String towards) {
//Original version returned: //Hardy, 2016-08-05:
// 1. ref + " " + dest //Now returns: (ref) + ((" ")+name) + ((" ")+"toward "+dest) or ""
// 2. dest
// 3. ref + " " + name
// 4. name
// 5. ref
// 6. ""
//Now returns: (ref)+((" ")+name)+((" ")+"toward "+dest)
String formattedStreetName = ""; String formattedStreetName = "";
if (ref != null && ref.length() > 0) { if (ref != null && ref.length() > 0) {