Skip to content

Russian translation and grammar update for named junctions #296

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Russian translation and grammar update for named junctions #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ffab6a
Russian translation and grammar update for named junctions
yuryleb Dec 9, 2019
3548663
Change log update and missing whitespace between PR links
yuryleb Dec 9, 2019
bf2ceba
Updated Russian grammar with missing "interchange" status street name
yuryleb Jan 15, 2020
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: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. For change

## master

- Updated Russian translation and grammar for named intersections. [#296](https://github.com/Project-OSRM/osrm-text-instructions/pull/296)

## 0.14.0 2019-12-04

- Update Japanese localization, add named intersections. [#290](https://github.com/Project-OSRM/osrm-text-instructions/pull/290)
Expand All @@ -23,7 +25,7 @@ All notable changes to this project will be documented in this file. For change
- Added an Arabic localization. [#267](https://github.com/Project-OSRM/osrm-text-instructions/pull/267)
- Added a Slovenian localization. [#264](https://github.com/Project-OSRM/osrm-text-instructions/pull/264)
- Updated Russian arrive instructions. [#278](https://github.com/Project-OSRM/osrm-text-instructions/pull/278)
- Updated French grammar with 'chaussée' status street name and better articles matching. [#268](https://github.com/Project-OSRM/osrm-text-instructions/pull/268)[#279](https://github.com/Project-OSRM/osrm-text-instructions/pull/279)
- Updated French grammar with 'chaussée' status street name and better articles matching. [#268](https://github.com/Project-OSRM/osrm-text-instructions/pull/268) [#279](https://github.com/Project-OSRM/osrm-text-instructions/pull/279)

## 0.13.2 2018-08-13

Expand Down
24 changes: 24 additions & 0 deletions languages/grammar/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
["^ (\\d+)-я (\\S+)ая [Аа]ллея ", " $1-ю $2ую аллею "],
["^ [Аа]ллея ", " аллею "],

["^ (\\S+)ая [Аа]вторазвязка ", " $1ую авторазвязку "],
["^ (\\S+)ья [Аа]вторазвязка ", " $1ью авторазвязку "],
["^ (\\S+)яя [Аа]вторазвязка ", " $1юю авторазвязку "],
["^ (\\d+)-я (\\S+)ая [Аа]вторазвязка ", " $1-ю $2ую авторазвязку "],
["^ [Аа]вторазвязка ", " авторазвязку "],

["^ (\\S+)ая-(\\S+)ая [Уу]лица ", " $1ую-$2ую улицу "],
["^ (\\S+)ая [Уу]лица ", " $1ую улицу "],
["^ (\\S+)ья [Уу]лица ", " $1ью улицу "],
Expand Down Expand Up @@ -107,6 +113,12 @@
["^ (\\d+)-я (\\S+)ая [Аа]ллея ", " $1-й $2ой аллее "],
["^ [Аа]ллея ", " аллее "],

["^ (\\S+)ая [Аа]вторазвязка ", " $1ой авторазвязке "],
["^ (\\S+)ья [Аа]вторазвязка ", " $1ьей авторазвязке "],
["^ (\\S+)яя [Аа]вторазвязка ", " $1ей авторазвязке "],
["^ (\\d+)-я (\\S+)ая [Аа]вторазвязка ", " $1-й $2ой авторазвязке "],
["^ [Аа]вторазвязка ", " авторазвязке "],

["^ (\\S+)ая-(\\S+)ая [Уу]лица ", " $1ой-$2ой улице "],
["^ (\\S+)ая [Уу]лица ", " $1ой улице "],
["^ (\\S+)ья [Уу]лица ", " $1ьей улице "],
Expand Down Expand Up @@ -415,6 +427,12 @@
["^ (\\d+)-я (\\S+)ая [Аа]ллея ", " $1-й $2ой аллеи "],
["^ [Аа]ллея ", " аллеи "],

["^ (\\S+)ая [Аа]вторазвязка ", " $1ой авторазвязки "],
["^ (\\S+)ья [Аа]вторазвязка ", " $1ьей авторазвязки "],
["^ (\\S+)яя [Аа]вторазвязка ", " $1ей авторазвязки "],
["^ (\\d+)-я (\\S+)ая [Аа]вторазвязка ", " $1-й $2ой авторазвязки "],
["^ [Аа]вторазвязка ", " авторазвязки "],

["^ (\\S+)ая-(\\S+)ая [Уу]лица ", " $1ой-$2ой улицы "],
["^ (\\S+)ая [Уу]лица ", " $1ой улицы "],
["^ (\\S+)ья [Уу]лица ", " $1ьей улицы "],
Expand Down Expand Up @@ -722,6 +740,12 @@
["^ (\\d+)-я (\\S+)ая [Аа]ллея ", " $1-й $2ой аллее "],
["^ [Аа]ллея ", " аллее "],

["^ (\\S+)ая [Аа]вторазвязка ", " $1ой авторазвязке "],
["^ (\\S+)ья [Аа]вторазвязка ", " $1ьей авторазвязке "],
["^ (\\S+)яя [Аа]вторазвязка ", " $1ей авторазвязке "],
["^ (\\d+)-я (\\S+)ая [Аа]вторазвязка ", " $1-й $2ой авторазвязке "],
["^ [Аа]вторазвязка ", " авторазвязке "],

["^ (\\S+)ая-(\\S+)ая [Уу]лица ", " $1ой-$2ой улице "],
["^ (\\S+)ая [Уу]лица ", " $1ой улице "],
["^ (\\S+)ья [Уу]лица ", " $1ьей улице "],
Expand Down
1 change: 1 addition & 0 deletions languages/overrides/ru.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var replaces = [
['(на) +\{((way_name)|(rotary_name))\} +по', '$1 {$2:prepositional} по'], // eslint-disable-line no-useless-escape
['(в +конце) +\{((way_name)|(rotary_name))\}', '$1 {$2:genitive}'], // eslint-disable-line no-useless-escape
['(по) +\{((way_name)|(rotary_name))\}', '$1 {$2:dative}'], // eslint-disable-line no-useless-escape
['\{(junction_name)\}', '{$1:dative}'], // eslint-disable-line no-useless-escape
['(на) +\{((way_name)|(rotary_name))\}', '$1 {$2:accusative}'] // eslint-disable-line no-useless-escape
];

Expand Down
28 changes: 14 additions & 14 deletions languages/translations/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
},
"straight": {
"default": "Вы прибыли в {nth} пункт назначения, он находится перед вами",
"upcoming": "Вы прибываете в {nth} пункт назначения, он будет перед вами",
"upcoming": "Вы прибываете в {nth} пункт назначения, он будет впереди",
"short": "Вы прибыли",
"short-upcoming": "Вы скоро прибудете",
"named": "Вы прибыли в пункт назначения, {waypoint_name}, он находится перед Вами"
"named": "Вы прибыли в пункт назначения, {waypoint_name}, он находится перед вами"
}
},
"continue": {
Expand All @@ -133,31 +133,31 @@
"default": "Резко поверните налево",
"name": "Резко поверните налево на {way_name:accusative}",
"destination": "Резко поверните налево в направлении {destination}",
"junction_name": "Резко поверните налево на {junction_name}"
"junction_name": "На {junction_name:dative} резко поверните налево"
},
"sharp right": {
"default": "Резко поверните направо",
"name": "Резко поверните направо на {way_name:accusative}",
"destination": "Резко поверните направо в направлении {destination}",
"junction_name": "Резко поверните направо на {junction_name}"
"junction_name": "На {junction_name:dative} резко поверните направо"
},
"slight left": {
"default": "Плавно поверните налево",
"name": "Плавно поверните налево на {way_name:accusative}",
"destination": "Плавно поверните налево в направлении {destination}",
"junction_name": "Плавно поверните налево на {junction_name}"
"junction_name": "На {junction_name:dative} плавно поверните налево"
},
"slight right": {
"default": "Плавно поверните направо",
"name": "Плавно поверните направо на {way_name:accusative}",
"destination": "Плавно поверните направо в направлении {destination}",
"junction_name": "Плавно поверните направо на {junction_name}"
"junction_name": "На {junction_name:dative} плавно поверните направо"
},
"uturn": {
"default": "Развернитесь",
"name": "Развернитесь и продолжите движение по {way_name:dative}",
"destination": "Развернитесь в направлении {destination}",
"junction_name": "Развернитесь и продолжите движение по {junction_name}"
"junction_name": "Развернитесь на {junction_name:dative}"
}
},
"depart": {
Expand All @@ -172,19 +172,19 @@
"default": "Поверните {modifier}",
"name": "Поверните {modifier} на {way_name:accusative}",
"destination": "Поверните {modifier} в направлении {destination}",
"junction_name": "Поверните {modifier} на {junction_name}"
"junction_name": "На {junction_name:dative} поверните {modifier}"
},
"straight": {
"default": "Двигайтесь прямо",
"name": "Двигайтесь прямо по {way_name:dative}",
"destination": "Двигайтесь прямо в направлении {destination}",
"junction_name": "Двигайтесь прямо по {junction_name}"
"junction_name": "На {junction_name:dative} двигатесь прямо"
},
"uturn": {
"default": "В конце дороги развернитесь",
"name": "Развернитесь в конце {way_name:genitive}",
"destination": "В конце дороги развернитесь в направлении {destination}",
"junction_name": "Развернитесь в конце {junction_name}"
"junction_name": "В конце дороги развернитесь на {junction_name:dative}"
}
},
"fork": {
Expand Down Expand Up @@ -472,25 +472,25 @@
"default": "Двигайтесь {modifier}",
"name": "Двигайтесь {modifier} на {way_name:accusative}",
"destination": "Двигайтесь {modifier} в направлении {destination}",
"junction_name": "Двигайтесь {modifier} на {junction_name}"
"junction_name": "На {junction_name:dative} двигайтесь {modifier}"
},
"left": {
"default": "Поверните налево",
"name": "Поверните налево на {way_name:accusative}",
"destination": "Поверните налево в направлении {destination}",
"junction_name": "Поверните налево на {junction_name}"
"junction_name": "На {junction_name:dative} поверните налево"
},
"right": {
"default": "Поверните направо",
"name": "Поверните направо на {way_name:accusative}",
"destination": "Поверните направо в направлении {destination}",
"junction_name": "Поверните направо на {junction_name}"
"junction_name": "На {junction_name:dative} поверните направо"
},
"straight": {
"default": "Двигайтесь прямо",
"name": "Двигайтесь по {way_name:dative}",
"destination": "Двигайтесь в направлении {destination}",
"junction_name": "Двигайтесь по {junction_name}"
"junction_name": "На {junction_name:dative} двигайтесь прямо"
}
},
"use lane": {
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/arrive_upcoming/straight.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"pt-BR": "Você vai chegar ao seu {nth} destino, em frente",
"pt-PT": "Está a chegar ao seu {nth} destino, em frente",
"ro": "Ați ajuns la {nth} destinație, în față",
"ru": "Вы прибываете в {nth} пункт назначения, он будет перед вами",
"ru": "Вы прибываете в {nth} пункт назначения, он будет впереди",
"sl": "Prispeli boste na {nth} cilj, ki bo pred vami",
"sv": "Du är snart framme vid din {nth} destination, rakt fram",
"tr": "{nth} hedefinize ulaştınız, hedefiniz karşınızdadır",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/arrive_waypoint_name/straight.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"pt-BR": "Você chegou a Somewhere, logo em frente",
"pt-PT": "Chegou a Somewhere, mesmo em frente",
"ro": "Ați ajuns Somewhere, în față",
"ru": "Вы прибыли в пункт назначения, Somewhere, он находится перед Вами",
"ru": "Вы прибыли в пункт назначения, Somewhere, он находится перед вами",
"sl": "Prispeli ste na Somewhere, ki je pred vami",
"sv": "Du är framme vid Somewhere, rakt fram",
"tr": "Somewhere ulaştınız, hedefiniz karşınızdadır",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/continue/sharp_left_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Faça uma curva fechada a esquerda em Shibuya Crossing",
"pt-PT": "Vire acentuadamente à esquerda em Shibuya Crossing",
"ro": "Virați puternic la stânga la Shibuya Crossing",
"ru": "Резко поверните налево на Shibuya Crossing",
"ru": "На Shibuya Crossing резко поверните налево",
"sl": "Zavijte ostro levo na Shibuya Crossing",
"sv": "Sväng vänster vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda sola keskin dönüş yap",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/continue/sharp_right_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Faça uma curva fechada a direita em Shibuya Crossing",
"pt-PT": "Vire acentuadamente à direita em Shibuya Crossing",
"ro": "Virați puternic la dreapta la Shibuya Crossing",
"ru": "Резко поверните направо на Shibuya Crossing",
"ru": "На Shibuya Crossing резко поверните направо",
"sl": "Zavijte ostro desno na Shibuya Crossing",
"sv": "Sväng höger vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda sağa keskin dönüş yap",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/continue/slight_left_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Faça uma curva suave a esquerda em Shibuya Crossing",
"pt-PT": "Vire ligeiramente à esquerda em Shibuya Crossing",
"ro": "Virați ușor la stânga la Shibuya Crossing",
"ru": "Плавно поверните налево на Shibuya Crossing",
"ru": "На Shibuya Crossing плавно поверните налево",
"sl": "Zavijte rahlo levo na Shibuya Crossing",
"sv": "Sväng vänster vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda sola hafif dönüş yap",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/continue/slight_right_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Faça uma curva suave a direita em Shibuya Crossing",
"pt-PT": "Vire ligeiramente à direita em Shibuya Crossing",
"ro": "Virați ușor la dreapta la Shibuya Crossing",
"ru": "Плавно поверните направо на Shibuya Crossing",
"ru": "На Shibuya Crossing плавно поверните направо",
"sl": "Zavijte rahlo desno na Shibuya Crossing",
"sv": "Sväng höger vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda sağa hafif dönüş yap",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/continue/uturn_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Faça o retorno em Shibuya Crossing",
"pt-PT": "Faça inversão de marcha em Shibuya Crossing",
"ro": "Întoarceți-vă la Shibuya Crossing",
"ru": "Развернитесь и продолжите движение по Shibuya Crossing",
"ru": "Развернитесь на Shibuya Crossing",
"sl": "Polkrožno obrnite na Shibuya Crossing",
"sv": "Gör en U-sväng vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda U dönüşü yapın",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/end_of_road/left_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Vire à esquerda em Shibuya Crossing",
"pt-PT": "Vire à esquerda em Shibuya Crossing",
"ro": "Virați stânga la Shibuya Crossing",
"ru": "Поверните налево на Shibuya Crossing",
"ru": "На Shibuya Crossing поверните налево",
"sl": "Zavijte levo na Shibuya Crossing",
"sv": "Sväng vänster vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda sol tarafa dönün",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/end_of_road/right_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Vire à direita em Shibuya Crossing",
"pt-PT": "Vire à direita em Shibuya Crossing",
"ro": "Virați dreapta la Shibuya Crossing",
"ru": "Поверните направо на Shibuya Crossing",
"ru": "На Shibuya Crossing поверните направо",
"sl": "Zavijte desno na Shibuya Crossing",
"sv": "Sväng höger vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda sağ tarafa dönün",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/end_of_road/sharp_left_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Vire fechada à esquerda em Shibuya Crossing",
"pt-PT": "Vire acentuadamente à esquerda em Shibuya Crossing",
"ro": "Virați puternic stânga la Shibuya Crossing",
"ru": "Поверните налево на Shibuya Crossing",
"ru": "На Shibuya Crossing поверните налево",
"sl": "Zavijte ostro levo na Shibuya Crossing",
"sv": "Sväng vänster vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda keskin sol tarafa dönün",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/end_of_road/sharp_right_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Vire fechada à direita em Shibuya Crossing",
"pt-PT": "Vire acentuadamente à direita em Shibuya Crossing",
"ro": "Virați puternic dreapta la Shibuya Crossing",
"ru": "Поверните направо на Shibuya Crossing",
"ru": "На Shibuya Crossing поверните направо",
"sl": "Zavijte ostro desno na Shibuya Crossing",
"sv": "Sväng höger vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda keskin sağ tarafa dönün",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/end_of_road/slight_left_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Vire suave à esquerda em Shibuya Crossing",
"pt-PT": "Vire ligeiramente à esquerda em Shibuya Crossing",
"ro": "Virați ușor stânga la Shibuya Crossing",
"ru": "Поверните левее на Shibuya Crossing",
"ru": "На Shibuya Crossing поверните левее",
"sl": "Zavijte rahlo levo na Shibuya Crossing",
"sv": "Sväng vänster vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda hafif sol tarafa dönün",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/end_of_road/slight_right_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Vire suave à direita em Shibuya Crossing",
"pt-PT": "Vire ligeiramente à direita em Shibuya Crossing",
"ro": "Virați ușor dreapta la Shibuya Crossing",
"ru": "Поверните правее на Shibuya Crossing",
"ru": "На Shibuya Crossing поверните правее",
"sl": "Zavijte rahlo desno na Shibuya Crossing",
"sv": "Sväng höger vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda hafif sağ tarafa dönün",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/v5/end_of_road/straight_junction_name.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"pt-BR": "Continue em frente em Shibuya Crossing",
"pt-PT": "Continue em frente em Shibuya Crossing",
"ro": "Continuați înainte la Shibuya Crossing",
"ru": "Двигайтесь прямо по Shibuya Crossing",
"ru": "На Shibuya Crossing двигатесь прямо",
"sl": "Nadaljujte naravnost na Shibuya Crossing",
"sv": "Fortsätt rakt fram vid Shibuya Crossing",
"tr": "Shibuya Crossing konumunda düz devam et",
Expand Down
Loading