Skip to content

Commit caa1c96

Browse files
mcwhittemoremcwhittemore
authored
Merge pull request #179 from Project-OSRM/traffic-circle
Update en.json to use traffic circle for all circles
2 parents cc36e63 + 8c4a5b9 commit caa1c96

31 files changed

+42
-42
lines changed

‎languages/translations/en.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -350,19 +350,19 @@
350350
"rotary": {
351351
"default": {
352352
"default": {
353-
"default": "Enter the rotary",
354-
"name": "Enter the rotary and exit onto {way_name}",
355-
"destination": "Enter the rotary and exit towards {destination}"
353+
"default": "Enter the traffic circle",
354+
"name": "Enter the traffic circle and exit onto {way_name}",
355+
"destination": "Enter the traffic circle and exit towards {destination}"
356356
},
357357
"name": {
358358
"default": "Enter {rotary_name}",
359359
"name": "Enter {rotary_name} and exit onto {way_name}",
360360
"destination": "Enter {rotary_name} and exit towards {destination}"
361361
},
362362
"exit": {
363-
"default": "Enter the rotary and take the {exit_number} exit",
364-
"name": "Enter the rotary and take the {exit_number} exit onto {way_name}",
365-
"destination": "Enter the rotary and take the {exit_number} exit towards {destination}"
363+
"default": "Enter the traffic circle and take the {exit_number} exit",
364+
"name": "Enter the traffic circle and take the {exit_number} exit onto {way_name}",
365+
"destination": "Enter the traffic circle and take the {exit_number} exit towards {destination}"
366366
},
367367
"name_exit": {
368368
"default": "Enter {rotary_name} and take the {exit_number} exit",
@@ -374,14 +374,14 @@
374374
"roundabout": {
375375
"default": {
376376
"exit": {
377-
"default": "Enter the roundabout and take the {exit_number} exit",
378-
"name": "Enter the roundabout and take the {exit_number} exit onto {way_name}",
379-
"destination": "Enter the roundabout and take the {exit_number} exit towards {destination}"
377+
"default": "Enter the traffic circle and take the {exit_number} exit",
378+
"name": "Enter the traffic circle and take the {exit_number} exit onto {way_name}",
379+
"destination": "Enter the traffic circle and take the {exit_number} exit towards {destination}"
380380
},
381381
"default": {
382-
"default": "Enter the roundabout",
383-
"name": "Enter the roundabout and exit onto {way_name}",
384-
"destination": "Enter the roundabout and exit towards {destination}"
382+
"default": "Enter the traffic circle",
383+
"name": "Enter the traffic circle and exit onto {way_name}",
384+
"destination": "Enter the traffic circle and exit towards {destination}"
385385
}
386386
}
387387
},

‎test/fixtures/v5/rotary/default_default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "In den Kreisverkehr fahren",
11-
"en": "Enter the rotary",
11+
"en": "Enter the traffic circle",
1212
"eo": "Enveturu trafikcirklegon",
1313
"es": "Entra en la rotonda",
1414
"es-ES": "Incorpórate en la rotonda",

‎test/fixtures/v5/rotary/default_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Im Kreisverkehr die Ausfahrt Richtung Destination 1 nehmen",
12-
"en": "Enter the rotary and exit towards Destination 1",
12+
"en": "Enter the traffic circle and exit towards Destination 1",
1313
"eo": "Enveturu trafikcirklegon kaj elveturu direkte al Destination 1",
1414
"es": "Entra en la rotonda y sal hacia Destination 1",
1515
"es-ES": "En la rotonda sal hacia Destination 1",

‎test/fixtures/v5/rotary/default_exit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Im Kreisverkehr die Ausfahrt auf Way Name nehmen",
12-
"en": "Enter the rotary and exit onto Way Name",
12+
"en": "Enter the traffic circle and exit onto Way Name",
1313
"eo": "Enveturu trafikcirklegon kaj elveturu al Way Name",
1414
"es": "Entra en la rotonda y sal en Way Name",
1515
"es-ES": "En la rotonda sal por Way Name",

‎test/fixtures/v5/rotary/default_exit_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"instructions": {
1212
"de": "Im Kreisverkehr die Ausfahrt Richtung Destination 1 nehmen",
13-
"en": "Enter the rotary and exit towards Destination 1",
13+
"en": "Enter the traffic circle and exit towards Destination 1",
1414
"eo": "Enveturu trafikcirklegon kaj elveturu direkte al Destination 1",
1515
"es": "Entra en la rotonda y sal hacia Destination 1",
1616
"es-ES": "En la rotonda sal hacia Destination 1",

‎test/fixtures/v5/rotary/default_name.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"instructions": {
1010
"de": "Im Kreisverkehr die Ausfahrt auf Way Name nehmen",
11-
"en": "Enter the rotary and exit onto Way Name",
11+
"en": "Enter the traffic circle and exit onto Way Name",
1212
"eo": "Enveturu trafikcirklegon kaj elveturu al Way Name",
1313
"es": "Entra en la rotonda y sal en Way Name",
1414
"es-ES": "En la rotonda sal por Way Name",

‎test/fixtures/v5/rotary/exit_10.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Im Kreisverkehr die zehnte Ausfahrt nehmen",
12-
"en": "Enter the rotary and take the 10th exit",
12+
"en": "Enter the traffic circle and take the 10th exit",
1313
"eo": "Enveturu trafikcirklegon kaj sekve al 10-a elveturejo",
1414
"es": "Entra en la rotonda y toma la 10ª salida",
1515
"es-ES": "En la rotonda toma la 10ª salida",

‎test/fixtures/v5/rotary/exit_11.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Im Kreisverkehr die Ausfahrt nehmen",
12-
"en": "Enter the rotary and take the exit",
12+
"en": "Enter the traffic circle and take the exit",
1313
"eo": "Enveturu trafikcirklegon kaj sekve al elveturejo",
1414
"es": "Entra en la rotonda y toma la salida",
1515
"es-ES": "En la rotonda toma la salida",

‎test/fixtures/v5/rotary/exit_1_default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"instructions": {
1111
"de": "Im Kreisverkehr die erste Ausfahrt nehmen",
12-
"en": "Enter the rotary and take the 1st exit",
12+
"en": "Enter the traffic circle and take the 1st exit",
1313
"eo": "Enveturu trafikcirklegon kaj sekve al 1-a elveturejo",
1414
"es": "Entra en la rotonda y toma la 1ª salida",
1515
"es-ES": "En la rotonda toma la 1ª salida",

‎test/fixtures/v5/rotary/exit_1_destination.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"instructions": {
1212
"de": "Im Kreisverkehr die erste Ausfahrt nehmen Richtung Destination 1",
13-
"en": "Enter the rotary and take the 1st exit towards Destination 1",
13+
"en": "Enter the traffic circle and take the 1st exit towards Destination 1",
1414
"eo": "Enveturu trafikcirklegon kaj sekve al 1-a elveturejo direkte al Destination 1",
1515
"es": "Entra en la rotonda y toma la 1ª salida hacia Destination 1",
1616
"es-ES": "En la rotonda toma la 1ª salida hacia Destination 1",

0 commit comments

Comments
 (0)