Skip to content

Rename traffic circle to roundabout #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1ec5 merged 2 commits into from
Jul 23, 2019
Merged

Rename traffic circle to roundabout #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdb3f16
Renamed traffic circle to roundabout
1ec5 Jul 23, 2018
19cc5b5
Updated Brazilian Portuguese fallbacks to say roundabout too
1ec5 Jul 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Change Log
All notable changes to this project will be documented in this file. For change log formatting, see http://keepachangelog.com/

## master

- Renamed “traffic circle” to “roundabout” in the English localization. [#285](https://github.com/Project-OSRM/osrm-text-instructions/pull/285)

## 0.13.3 2019-03-29

- Added a Hungarian localization and grammar. [#274](https://github.com/Project-OSRM/osrm-text-instructions/pull/274)
Expand Down
36 changes: 18 additions & 18 deletions languages/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,19 +388,19 @@
"rotary": {
"default": {
"default": {
"default": "Enter the traffic circle",
"name": "Enter the traffic circle and exit onto {way_name}",
"destination": "Enter the traffic circle and exit towards {destination}"
"default": "Enter the roundabout",
"name": "Enter the roundabout and exit onto {way_name}",
"destination": "Enter the roundabout and exit towards {destination}"
},
"name": {
"default": "Enter {rotary_name}",
"name": "Enter {rotary_name} and exit onto {way_name}",
"destination": "Enter {rotary_name} and exit towards {destination}"
},
"exit": {
"default": "Enter the traffic circle and take the {exit_number} exit",
"name": "Enter the traffic circle and take the {exit_number} exit onto {way_name}",
"destination": "Enter the traffic circle and take the {exit_number} exit towards {destination}"
"default": "Enter the roundabout and take the {exit_number} exit",
"name": "Enter the roundabout and take the {exit_number} exit onto {way_name}",
"destination": "Enter the roundabout and take the {exit_number} exit towards {destination}"
},
"name_exit": {
"default": "Enter {rotary_name} and take the {exit_number} exit",
Expand All @@ -412,14 +412,14 @@
"roundabout": {
"default": {
"exit": {
"default": "Enter the traffic circle and take the {exit_number} exit",
"name": "Enter the traffic circle and take the {exit_number} exit onto {way_name}",
"destination": "Enter the traffic circle and take the {exit_number} exit towards {destination}"
"default": "Enter the roundabout and take the {exit_number} exit",
"name": "Enter the roundabout and take the {exit_number} exit onto {way_name}",
"destination": "Enter the roundabout and take the {exit_number} exit towards {destination}"
},
"default": {
"default": "Enter the traffic circle",
"name": "Enter the traffic circle and exit onto {way_name}",
"destination": "Enter the traffic circle and exit towards {destination}"
"default": "Enter the roundabout",
"name": "Enter the roundabout and exit onto {way_name}",
"destination": "Enter the roundabout and exit towards {destination}"
}
}
},
Expand Down Expand Up @@ -447,16 +447,16 @@
},
"exit roundabout": {
"default": {
"default": "Exit the traffic circle",
"name": "Exit the traffic circle onto {way_name}",
"destination": "Exit the traffic circle towards {destination}"
"default": "Exit the roundabout",
"name": "Exit the roundabout onto {way_name}",
"destination": "Exit the roundabout towards {destination}"
}
},
"exit rotary": {
"default": {
"default": "Exit the traffic circle",
"name": "Exit the traffic circle onto {way_name}",
"destination": "Exit the traffic circle towards {destination}"
"default": "Exit the roundabout",
"name": "Exit the roundabout onto {way_name}",
"destination": "Exit the roundabout towards {destination}"
}
},
"turn": {
Expand Down
8 changes: 4 additions & 4 deletions languages/translations/pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,15 +448,15 @@
"exit roundabout": {
"default": {
"default": "Saia da rotatória",
"name": "Exit the traffic circle onto {way_name}",
"destination": "Exit the traffic circle towards {destination}"
"name": "Exit the roundabout onto {way_name}",
"destination": "Exit the roundabout towards {destination}"
}
},
"exit rotary": {
"default": {
"default": "Saia da rotatória",
"name": "Exit the traffic circle onto {way_name}",
"destination": "Exit the traffic circle towards {destination}"
"name": "Exit the roundabout onto {way_name}",
"destination": "Exit the roundabout towards {destination}"
}
},
"turn": {
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/exit_rotary/left_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ar": "اخرج من الدوّار",
"da": "Forlad rundkørslen",
"de": "Links abbiegen",
"en": "Exit the traffic circle",
"en": "Exit the roundabout",
"eo": "Eliru trafikcirklegon",
"es": "Sal la rotonda",
"es-ES": "Sal la rotonda",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/left_destination.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ar": "اسلك مسار الخروج Destination 1",
"da": "Forlad rundkørslen mod Destination 1",
"de": "Links abbiegen Richtung Destination 1",
"en": "Exit the traffic circle towards Destination 1",
"en": "Exit the roundabout towards Destination 1",
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
"es": "Sal la rotonda hacia Destination 1",
"es-ES": "Toma la salida hacia Destination 1",
Expand All @@ -28,7 +28,7 @@
"nl": "Verlaat de rotonde richting Destination 1",
"no": "Kjør ut av rundkjøringen mot Destination 1",
"pl": "Skręć w lewo w kierunku Destination 1",
"pt-BR": "Exit the traffic circle towards Destination 1",
"pt-BR": "Exit the roundabout towards Destination 1",
"pt-PT": "Saia da rotunda em direção a Destination 1",
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
"ru": "Сверните с круговой развязки в направлении Destination 1",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/left_exit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ar": "اخرج من مسار الدوران على Way Name",
"da": "Forlad rundkørslen ad Way Name",
"de": "Links abbiegen auf Way Name",
"en": "Exit the traffic circle onto Way Name",
"en": "Exit the roundabout onto Way Name",
"eo": "Elveturu trafikcirklegon al Way Name",
"es": "Sal la rotonda en Way Name",
"es-ES": "Toma la salida por Way Name",
Expand All @@ -28,7 +28,7 @@
"nl": "Verlaat de rotonde en ga verder op Way Name",
"no": "Kjør ut av rundkjøringen og inn på Way Name",
"pl": "Skręć w lewo na Way Name",
"pt-BR": "Exit the traffic circle onto Way Name",
"pt-BR": "Exit the roundabout onto Way Name",
"pt-PT": "Saia da rotunda para Way Name",
"ro": "Ieșiți din sensul giratoriu pe Way Name",
"ru": "Сверните с круговой развязки на Way Name",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/left_exit_destination.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ar": "اسلك مسار الخروج Destination 1",
"da": "Forlad rundkørslen mod Destination 1",
"de": "Links abbiegen Richtung Destination 1",
"en": "Exit the traffic circle towards Destination 1",
"en": "Exit the roundabout towards Destination 1",
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
"es": "Sal la rotonda hacia Destination 1",
"es-ES": "Toma la salida hacia Destination 1",
Expand All @@ -29,7 +29,7 @@
"nl": "Verlaat de rotonde richting Destination 1",
"no": "Kjør ut av rundkjøringen mot Destination 1",
"pl": "Skręć w lewo w kierunku Destination 1",
"pt-BR": "Exit the traffic circle towards Destination 1",
"pt-BR": "Exit the roundabout towards Destination 1",
"pt-PT": "Saia da rotunda em direção a Destination 1",
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
"ru": "Сверните с круговой развязки в направлении Destination 1",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/left_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ar": "اخرج من مسار الدوران على Way Name",
"da": "Forlad rundkørslen ad Way Name",
"de": "Links abbiegen auf Way Name",
"en": "Exit the traffic circle onto Way Name",
"en": "Exit the roundabout onto Way Name",
"eo": "Elveturu trafikcirklegon al Way Name",
"es": "Sal la rotonda en Way Name",
"es-ES": "Toma la salida por Way Name",
Expand All @@ -27,7 +27,7 @@
"nl": "Verlaat de rotonde en ga verder op Way Name",
"no": "Kjør ut av rundkjøringen og inn på Way Name",
"pl": "Skręć w lewo na Way Name",
"pt-BR": "Exit the traffic circle onto Way Name",
"pt-BR": "Exit the roundabout onto Way Name",
"pt-PT": "Saia da rotunda para Way Name",
"ro": "Ieșiți din sensul giratoriu pe Way Name",
"ru": "Сверните с круговой развязки на Way Name",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/exit_rotary/right_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ar": "اخرج من الدوّار",
"da": "Forlad rundkørslen",
"de": "Rechts abbiegen",
"en": "Exit the traffic circle",
"en": "Exit the roundabout",
"eo": "Eliru trafikcirklegon",
"es": "Sal la rotonda",
"es-ES": "Sal la rotonda",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/right_destination.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ar": "اسلك مسار الخروج Destination 1",
"da": "Forlad rundkørslen mod Destination 1",
"de": "Rechts abbiegen Richtung Destination 1",
"en": "Exit the traffic circle towards Destination 1",
"en": "Exit the roundabout towards Destination 1",
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
"es": "Sal la rotonda hacia Destination 1",
"es-ES": "Toma la salida hacia Destination 1",
Expand All @@ -28,7 +28,7 @@
"nl": "Verlaat de rotonde richting Destination 1",
"no": "Kjør ut av rundkjøringen mot Destination 1",
"pl": "Skręć w prawo w kierunku Destination 1",
"pt-BR": "Exit the traffic circle towards Destination 1",
"pt-BR": "Exit the roundabout towards Destination 1",
"pt-PT": "Saia da rotunda em direção a Destination 1",
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
"ru": "Сверните с круговой развязки в направлении Destination 1",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/right_exit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ar": "اخرج من مسار الدوران على Way Name",
"da": "Forlad rundkørslen ad Way Name",
"de": "Rechts abbiegen auf Way Name",
"en": "Exit the traffic circle onto Way Name",
"en": "Exit the roundabout onto Way Name",
"eo": "Elveturu trafikcirklegon al Way Name",
"es": "Sal la rotonda en Way Name",
"es-ES": "Toma la salida por Way Name",
Expand All @@ -28,7 +28,7 @@
"nl": "Verlaat de rotonde en ga verder op Way Name",
"no": "Kjør ut av rundkjøringen og inn på Way Name",
"pl": "Skręć w prawo na Way Name",
"pt-BR": "Exit the traffic circle onto Way Name",
"pt-BR": "Exit the roundabout onto Way Name",
"pt-PT": "Saia da rotunda para Way Name",
"ro": "Ieșiți din sensul giratoriu pe Way Name",
"ru": "Сверните с круговой развязки на Way Name",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/right_exit_destination.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ar": "اسلك مسار الخروج Destination 1",
"da": "Forlad rundkørslen mod Destination 1",
"de": "Rechts abbiegen Richtung Destination 1",
"en": "Exit the traffic circle towards Destination 1",
"en": "Exit the roundabout towards Destination 1",
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
"es": "Sal la rotonda hacia Destination 1",
"es-ES": "Toma la salida hacia Destination 1",
Expand All @@ -29,7 +29,7 @@
"nl": "Verlaat de rotonde richting Destination 1",
"no": "Kjør ut av rundkjøringen mot Destination 1",
"pl": "Skręć w prawo w kierunku Destination 1",
"pt-BR": "Exit the traffic circle towards Destination 1",
"pt-BR": "Exit the roundabout towards Destination 1",
"pt-PT": "Saia da rotunda em direção a Destination 1",
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
"ru": "Сверните с круговой развязки в направлении Destination 1",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/right_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ar": "اخرج من مسار الدوران على Way Name",
"da": "Forlad rundkørslen ad Way Name",
"de": "Rechts abbiegen auf Way Name",
"en": "Exit the traffic circle onto Way Name",
"en": "Exit the roundabout onto Way Name",
"eo": "Elveturu trafikcirklegon al Way Name",
"es": "Sal la rotonda en Way Name",
"es-ES": "Toma la salida por Way Name",
Expand All @@ -27,7 +27,7 @@
"nl": "Verlaat de rotonde en ga verder op Way Name",
"no": "Kjør ut av rundkjøringen og inn på Way Name",
"pl": "Skręć w prawo na Way Name",
"pt-BR": "Exit the traffic circle onto Way Name",
"pt-BR": "Exit the roundabout onto Way Name",
"pt-PT": "Saia da rotunda para Way Name",
"ro": "Ieșiți din sensul giratoriu pe Way Name",
"ru": "Сверните с круговой развязки на Way Name",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/exit_rotary/sharp_left_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ar": "اخرج من الدوّار",
"da": "Forlad rundkørslen",
"de": "Scharf links abbiegen",
"en": "Exit the traffic circle",
"en": "Exit the roundabout",
"eo": "Eliru trafikcirklegon",
"es": "Sal la rotonda",
"es-ES": "Sal la rotonda",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/sharp_left_destination.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ar": "اسلك مسار الخروج Destination 1",
"da": "Forlad rundkørslen mod Destination 1",
"de": "Scharf links abbiegen Richtung Destination 1",
"en": "Exit the traffic circle towards Destination 1",
"en": "Exit the roundabout towards Destination 1",
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
"es": "Sal la rotonda hacia Destination 1",
"es-ES": "Toma la salida hacia Destination 1",
Expand All @@ -28,7 +28,7 @@
"nl": "Verlaat de rotonde richting Destination 1",
"no": "Kjør ut av rundkjøringen mot Destination 1",
"pl": "Ostro w lewo w kierunku Destination 1",
"pt-BR": "Exit the traffic circle towards Destination 1",
"pt-BR": "Exit the roundabout towards Destination 1",
"pt-PT": "Saia da rotunda em direção a Destination 1",
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
"ru": "Сверните с круговой развязки в направлении Destination 1",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/sharp_left_exit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ar": "اخرج من مسار الدوران على Way Name",
"da": "Forlad rundkørslen ad Way Name",
"de": "Scharf links abbiegen auf Way Name",
"en": "Exit the traffic circle onto Way Name",
"en": "Exit the roundabout onto Way Name",
"eo": "Elveturu trafikcirklegon al Way Name",
"es": "Sal la rotonda en Way Name",
"es-ES": "Toma la salida por Way Name",
Expand All @@ -28,7 +28,7 @@
"nl": "Verlaat de rotonde en ga verder op Way Name",
"no": "Kjør ut av rundkjøringen og inn på Way Name",
"pl": "Ostro w lewo na Way Name",
"pt-BR": "Exit the traffic circle onto Way Name",
"pt-BR": "Exit the roundabout onto Way Name",
"pt-PT": "Saia da rotunda para Way Name",
"ro": "Ieșiți din sensul giratoriu pe Way Name",
"ru": "Сверните с круговой развязки на Way Name",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/sharp_left_exit_destination.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ar": "اسلك مسار الخروج Destination 1",
"da": "Forlad rundkørslen mod Destination 1",
"de": "Scharf links abbiegen Richtung Destination 1",
"en": "Exit the traffic circle towards Destination 1",
"en": "Exit the roundabout towards Destination 1",
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
"es": "Sal la rotonda hacia Destination 1",
"es-ES": "Toma la salida hacia Destination 1",
Expand All @@ -29,7 +29,7 @@
"nl": "Verlaat de rotonde richting Destination 1",
"no": "Kjør ut av rundkjøringen mot Destination 1",
"pl": "Ostro w lewo w kierunku Destination 1",
"pt-BR": "Exit the traffic circle towards Destination 1",
"pt-BR": "Exit the roundabout towards Destination 1",
"pt-PT": "Saia da rotunda em direção a Destination 1",
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
"ru": "Сверните с круговой развязки в направлении Destination 1",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/sharp_left_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ar": "اخرج من مسار الدوران على Way Name",
"da": "Forlad rundkørslen ad Way Name",
"de": "Scharf links abbiegen auf Way Name",
"en": "Exit the traffic circle onto Way Name",
"en": "Exit the roundabout onto Way Name",
"eo": "Elveturu trafikcirklegon al Way Name",
"es": "Sal la rotonda en Way Name",
"es-ES": "Toma la salida por Way Name",
Expand All @@ -27,7 +27,7 @@
"nl": "Verlaat de rotonde en ga verder op Way Name",
"no": "Kjør ut av rundkjøringen og inn på Way Name",
"pl": "Ostro w lewo na Way Name",
"pt-BR": "Exit the traffic circle onto Way Name",
"pt-BR": "Exit the roundabout onto Way Name",
"pt-PT": "Saia da rotunda para Way Name",
"ro": "Ieșiți din sensul giratoriu pe Way Name",
"ru": "Сверните с круговой развязки на Way Name",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/exit_rotary/sharp_right_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ar": "اخرج من الدوّار",
"da": "Forlad rundkørslen",
"de": "Scharf rechts abbiegen",
"en": "Exit the traffic circle",
"en": "Exit the roundabout",
"eo": "Eliru trafikcirklegon",
"es": "Sal la rotonda",
"es-ES": "Sal la rotonda",
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/v5/exit_rotary/sharp_right_destination.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ar": "اسلك مسار الخروج Destination 1",
"da": "Forlad rundkørslen mod Destination 1",
"de": "Scharf rechts abbiegen Richtung Destination 1",
"en": "Exit the traffic circle towards Destination 1",
"en": "Exit the roundabout towards Destination 1",
"eo": "Elveturu trafikcirklegon direkte al Destination 1",
"es": "Sal la rotonda hacia Destination 1",
"es-ES": "Toma la salida hacia Destination 1",
Expand All @@ -28,7 +28,7 @@
"nl": "Verlaat de rotonde richting Destination 1",
"no": "Kjør ut av rundkjøringen mot Destination 1",
"pl": "Ostro w prawo w kierunku Destination 1",
"pt-BR": "Exit the traffic circle towards Destination 1",
"pt-BR": "Exit the roundabout towards Destination 1",
"pt-PT": "Saia da rotunda em direção a Destination 1",
"ro": "Ieșiți din sensul giratoriu spre Destination 1",
"ru": "Сверните с круговой развязки в направлении Destination 1",
Expand Down
Loading