Skip to content

Commit c4f147e

Browse files
1ec51ec5
authored
Merge pull request #285 from Project-OSRM/1ec5-merry-go-roundabout-188-2
Rename traffic circle to roundabout
2 parents b410fad + 19cc5b5 commit c4f147e

File tree

113 files changed

+200
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+200
-196
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Change Log
22
All notable changes to this project will be documented in this file. For change log formatting, see http://keepachangelog.com/
33

4+
## master
5+
6+
- Renamed “traffic circle” to “roundabout” in the English localization. [#285](https://github.com/Project-OSRM/osrm-text-instructions/pull/285)
7+
48
## 0.13.3 2019-03-29
59

610
- Added a Hungarian localization and grammar. [#274](https://github.com/Project-OSRM/osrm-text-instructions/pull/274)

‎languages/translations/en.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -388,19 +388,19 @@
388388
"rotary": {
389389
"default": {
390390
"default": {
391-
"default": "Enter the traffic circle",
392-
"name": "Enter the traffic circle and exit onto {way_name}",
393-
"destination": "Enter the traffic circle and exit towards {destination}"
391+
"default": "Enter the roundabout",
392+
"name": "Enter the roundabout and exit onto {way_name}",
393+
"destination": "Enter the roundabout and exit towards {destination}"
394394
},
395395
"name": {
396396
"default": "Enter {rotary_name}",
397397
"name": "Enter {rotary_name} and exit onto {way_name}",
398398
"destination": "Enter {rotary_name} and exit towards {destination}"
399399
},
400400
"exit": {
401-
"default": "Enter the traffic circle and take the {exit_number} exit",
402-
"name": "Enter the traffic circle and take the {exit_number} exit onto {way_name}",
403-
"destination": "Enter the traffic circle and take the {exit_number} exit towards {destination}"
401+
"default": "Enter the roundabout and take the {exit_number} exit",
402+
"name": "Enter the roundabout and take the {exit_number} exit onto {way_name}",
403+
"destination": "Enter the roundabout and take the {exit_number} exit towards {destination}"
404404
},
405405
"name_exit": {
406406
"default": "Enter {rotary_name} and take the {exit_number} exit",
@@ -412,14 +412,14 @@
412412
"roundabout": {
413413
"default": {
414414
"exit": {
415-
"default": "Enter the traffic circle and take the {exit_number} exit",
416-
"name": "Enter the traffic circle and take the {exit_number} exit onto {way_name}",
417-
"destination": "Enter the traffic circle and take the {exit_number} exit towards {destination}"
415+
"default": "Enter the roundabout and take the {exit_number} exit",
416+
"name": "Enter the roundabout and take the {exit_number} exit onto {way_name}",
417+
"destination": "Enter the roundabout and take the {exit_number} exit towards {destination}"
418418
},
419419
"default": {
420-
"default": "Enter the traffic circle",
421-
"name": "Enter the traffic circle and exit onto {way_name}",
422-
"destination": "Enter the traffic circle and exit towards {destination}"
420+
"default": "Enter the roundabout",
421+
"name": "Enter the roundabout and exit onto {way_name}",
422+
"destination": "Enter the roundabout and exit towards {destination}"
423423
}
424424
}
425425
},
@@ -447,16 +447,16 @@
447447
},
448448
"exit roundabout": {
449449
"default": {
450-
"default": "Exit the traffic circle",
451-
"name": "Exit the traffic circle onto {way_name}",
452-
"destination": "Exit the traffic circle towards {destination}"
450+
"default": "Exit the roundabout",
451+
"name": "Exit the roundabout onto {way_name}",
452+
"destination": "Exit the roundabout towards {destination}"
453453
}
454454
},
455455
"exit rotary": {
456456
"default": {
457-
"default": "Exit the traffic circle",
458-
"name": "Exit the traffic circle onto {way_name}",
459-
"destination": "Exit the traffic circle towards {destination}"
457+
"default": "Exit the roundabout",
458+
"name": "Exit the roundabout onto {way_name}",
459+
"destination": "Exit the roundabout towards {destination}"
460460
}
461461
},
462462
"turn": {

‎languages/translations/pt-BR.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,15 +448,15 @@
448448
"exit roundabout": {
449449
"default": {
450450
"default": "Saia da rotatória",
451-
"name": "Exit the traffic circle onto {way_name}",
452-
"destination": "Exit the traffic circle towards {destination}"
451+
"name": "Exit the roundabout onto {way_name}",
452+
"destination": "Exit the roundabout towards {destination}"
453453
}
454454
},
455455
"exit rotary": {
456456
"default": {
457457
"default": "Saia da rotatória",
458-
"name": "Exit the traffic circle onto {way_name}",
459-
"destination": "Exit the traffic circle towards {destination}"
458+
"name": "Exit the roundabout onto {way_name}",
459+
"destination": "Exit the roundabout towards {destination}"
460460
}
461461
},
462462
"turn": {

‎test/fixtures/v5/exit_rotary/left_default.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"ar": "اخرج من الدوّار",
1212
"da": "Forlad rundkørslen",
1313
"de": "Links abbiegen",
14-
"en": "Exit the traffic circle",
14+
"en": "Exit the roundabout",
1515
"eo": "Eliru trafikcirklegon",
1616
"es": "Sal la rotonda",
1717
"es-ES": "Sal la rotonda",

‎test/fixtures/v5/exit_rotary/left_destination.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"ar": "اسلك مسار الخروج Destination 1",
1313
"da": "Forlad rundkørslen mod Destination 1",
1414
"de": "Links abbiegen Richtung Destination 1",
15-
"en": "Exit the traffic circle towards Destination 1",
15+
"en": "Exit the roundabout towards Destination 1",
1616
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
1717
"es": "Sal la rotonda hacia Destination 1",
1818
"es-ES": "Toma la salida hacia Destination 1",
@@ -28,7 +28,7 @@
2828
"nl": "Verlaat de rotonde richting Destination 1",
2929
"no": "Kjør ut av rundkjøringen mot Destination 1",
3030
"pl": "Skręć w lewo w kierunku Destination 1",
31-
"pt-BR": "Exit the traffic circle towards Destination 1",
31+
"pt-BR": "Exit the roundabout towards Destination 1",
3232
"pt-PT": "Saia da rotunda em direção a Destination 1",
3333
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
3434
"ru": "Сверните с круговой развязки в направлении Destination 1",

‎test/fixtures/v5/exit_rotary/left_exit.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"ar": "اخرج من مسار الدوران على Way Name",
1313
"da": "Forlad rundkørslen ad Way Name",
1414
"de": "Links abbiegen auf Way Name",
15-
"en": "Exit the traffic circle onto Way Name",
15+
"en": "Exit the roundabout onto Way Name",
1616
"eo": "Elveturu trafikcirklegon al Way Name",
1717
"es": "Sal la rotonda en Way Name",
1818
"es-ES": "Toma la salida por Way Name",
@@ -28,7 +28,7 @@
2828
"nl": "Verlaat de rotonde en ga verder op Way Name",
2929
"no": "Kjør ut av rundkjøringen og inn på Way Name",
3030
"pl": "Skręć w lewo na Way Name",
31-
"pt-BR": "Exit the traffic circle onto Way Name",
31+
"pt-BR": "Exit the roundabout onto Way Name",
3232
"pt-PT": "Saia da rotunda para Way Name",
3333
"ro": "Ieșiți din sensul giratoriu pe Way Name",
3434
"ru": "Сверните с круговой развязки на Way Name",

‎test/fixtures/v5/exit_rotary/left_exit_destination.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"ar": "اسلك مسار الخروج Destination 1",
1414
"da": "Forlad rundkørslen mod Destination 1",
1515
"de": "Links abbiegen Richtung Destination 1",
16-
"en": "Exit the traffic circle towards Destination 1",
16+
"en": "Exit the roundabout towards Destination 1",
1717
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
1818
"es": "Sal la rotonda hacia Destination 1",
1919
"es-ES": "Toma la salida hacia Destination 1",
@@ -29,7 +29,7 @@
2929
"nl": "Verlaat de rotonde richting Destination 1",
3030
"no": "Kjør ut av rundkjøringen mot Destination 1",
3131
"pl": "Skręć w lewo w kierunku Destination 1",
32-
"pt-BR": "Exit the traffic circle towards Destination 1",
32+
"pt-BR": "Exit the roundabout towards Destination 1",
3333
"pt-PT": "Saia da rotunda em direção a Destination 1",
3434
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
3535
"ru": "Сверните с круговой развязки в направлении Destination 1",

‎test/fixtures/v5/exit_rotary/left_name.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"ar": "اخرج من مسار الدوران على Way Name",
1212
"da": "Forlad rundkørslen ad Way Name",
1313
"de": "Links abbiegen auf Way Name",
14-
"en": "Exit the traffic circle onto Way Name",
14+
"en": "Exit the roundabout onto Way Name",
1515
"eo": "Elveturu trafikcirklegon al Way Name",
1616
"es": "Sal la rotonda en Way Name",
1717
"es-ES": "Toma la salida por Way Name",
@@ -27,7 +27,7 @@
2727
"nl": "Verlaat de rotonde en ga verder op Way Name",
2828
"no": "Kjør ut av rundkjøringen og inn på Way Name",
2929
"pl": "Skręć w lewo na Way Name",
30-
"pt-BR": "Exit the traffic circle onto Way Name",
30+
"pt-BR": "Exit the roundabout onto Way Name",
3131
"pt-PT": "Saia da rotunda para Way Name",
3232
"ro": "Ieșiți din sensul giratoriu pe Way Name",
3333
"ru": "Сверните с круговой развязки на Way Name",

‎test/fixtures/v5/exit_rotary/right_default.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"ar": "اخرج من الدوّار",
1212
"da": "Forlad rundkørslen",
1313
"de": "Rechts abbiegen",
14-
"en": "Exit the traffic circle",
14+
"en": "Exit the roundabout",
1515
"eo": "Eliru trafikcirklegon",
1616
"es": "Sal la rotonda",
1717
"es-ES": "Sal la rotonda",

‎test/fixtures/v5/exit_rotary/right_destination.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"ar": "اسلك مسار الخروج Destination 1",
1313
"da": "Forlad rundkørslen mod Destination 1",
1414
"de": "Rechts abbiegen Richtung Destination 1",
15-
"en": "Exit the traffic circle towards Destination 1",
15+
"en": "Exit the roundabout towards Destination 1",
1616
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
1717
"es": "Sal la rotonda hacia Destination 1",
1818
"es-ES": "Toma la salida hacia Destination 1",
@@ -28,7 +28,7 @@
2828
"nl": "Verlaat de rotonde richting Destination 1",
2929
"no": "Kjør ut av rundkjøringen mot Destination 1",
3030
"pl": "Skręć w prawo w kierunku Destination 1",
31-
"pt-BR": "Exit the traffic circle towards Destination 1",
31+
"pt-BR": "Exit the roundabout towards Destination 1",
3232
"pt-PT": "Saia da rotunda em direção a Destination 1",
3333
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
3434
"ru": "Сверните с круговой развязки в направлении Destination 1",

0 commit comments

Comments
 (0)