From 4ffab6a691cd76090a998cfcec08b076226aff72 Mon Sep 17 00:00:00 2001 From: Yury Lebedev Date: Mon, 9 Dec 2019 18:11:19 +0300 Subject: [PATCH 1/3] Russian translation and grammar update for named junctions --- languages/overrides/ru.js | 1 + languages/translations/ru.json | 28 +++++++++---------- .../fixtures/v5/arrive_upcoming/straight.json | 2 +- .../v5/arrive_waypoint_name/straight.json | 2 +- .../v5/continue/sharp_left_junction_name.json | 2 +- .../continue/sharp_right_junction_name.json | 2 +- .../continue/slight_left_junction_name.json | 2 +- .../continue/slight_right_junction_name.json | 2 +- .../v5/continue/uturn_junction_name.json | 2 +- .../v5/end_of_road/left_junction_name.json | 2 +- .../v5/end_of_road/right_junction_name.json | 2 +- .../end_of_road/sharp_left_junction_name.json | 2 +- .../sharp_right_junction_name.json | 2 +- .../slight_left_junction_name.json | 2 +- .../slight_right_junction_name.json | 2 +- .../end_of_road/straight_junction_name.json | 2 +- .../v5/end_of_road/uturn_junction_name.json | 2 +- test/fixtures/v5/turn/left_junction_name.json | 2 +- .../fixtures/v5/turn/right_junction_name.json | 2 +- .../v5/turn/sharp_left_junction_name.json | 2 +- .../v5/turn/sharp_right_junction_name.json | 2 +- .../v5/turn/slight_left_junction_name.json | 2 +- .../v5/turn/slight_right_junction_name.json | 2 +- .../v5/turn/straight_junction_name.json | 2 +- .../fixtures/v5/turn/uturn_junction_name.json | 2 +- 25 files changed, 38 insertions(+), 37 deletions(-) diff --git a/languages/overrides/ru.js b/languages/overrides/ru.js index 74d8083c5..03612418e 100644 --- a/languages/overrides/ru.js +++ b/languages/overrides/ru.js @@ -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 ]; diff --git a/languages/translations/ru.json b/languages/translations/ru.json index ec16db200..45f2dde99 100644 --- a/languages/translations/ru.json +++ b/languages/translations/ru.json @@ -109,10 +109,10 @@ }, "straight": { "default": "Вы прибыли в {nth} пункт назначения, он находится перед вами", - "upcoming": "Вы прибываете в {nth} пункт назначения, он будет перед вами", + "upcoming": "Вы прибываете в {nth} пункт назначения, он будет впереди", "short": "Вы прибыли", "short-upcoming": "Вы скоро прибудете", - "named": "Вы прибыли в пункт назначения, {waypoint_name}, он находится перед Вами" + "named": "Вы прибыли в пункт назначения, {waypoint_name}, он находится перед вами" } }, "continue": { @@ -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": { @@ -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": { @@ -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": { diff --git a/test/fixtures/v5/arrive_upcoming/straight.json b/test/fixtures/v5/arrive_upcoming/straight.json index 8b5d9eb1d..d853e1146 100644 --- a/test/fixtures/v5/arrive_upcoming/straight.json +++ b/test/fixtures/v5/arrive_upcoming/straight.json @@ -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", diff --git a/test/fixtures/v5/arrive_waypoint_name/straight.json b/test/fixtures/v5/arrive_waypoint_name/straight.json index 2b5feb76b..94e04f11d 100644 --- a/test/fixtures/v5/arrive_waypoint_name/straight.json +++ b/test/fixtures/v5/arrive_waypoint_name/straight.json @@ -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", diff --git a/test/fixtures/v5/continue/sharp_left_junction_name.json b/test/fixtures/v5/continue/sharp_left_junction_name.json index 13fbd0b1e..2d8376cd2 100644 --- a/test/fixtures/v5/continue/sharp_left_junction_name.json +++ b/test/fixtures/v5/continue/sharp_left_junction_name.json @@ -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", diff --git a/test/fixtures/v5/continue/sharp_right_junction_name.json b/test/fixtures/v5/continue/sharp_right_junction_name.json index 15635615a..fcc3f9235 100644 --- a/test/fixtures/v5/continue/sharp_right_junction_name.json +++ b/test/fixtures/v5/continue/sharp_right_junction_name.json @@ -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", diff --git a/test/fixtures/v5/continue/slight_left_junction_name.json b/test/fixtures/v5/continue/slight_left_junction_name.json index edbc6c790..42c4c99f2 100644 --- a/test/fixtures/v5/continue/slight_left_junction_name.json +++ b/test/fixtures/v5/continue/slight_left_junction_name.json @@ -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", diff --git a/test/fixtures/v5/continue/slight_right_junction_name.json b/test/fixtures/v5/continue/slight_right_junction_name.json index 622065538..a3cf079f2 100644 --- a/test/fixtures/v5/continue/slight_right_junction_name.json +++ b/test/fixtures/v5/continue/slight_right_junction_name.json @@ -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", diff --git a/test/fixtures/v5/continue/uturn_junction_name.json b/test/fixtures/v5/continue/uturn_junction_name.json index fcb54beb2..6239a877a 100644 --- a/test/fixtures/v5/continue/uturn_junction_name.json +++ b/test/fixtures/v5/continue/uturn_junction_name.json @@ -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", diff --git a/test/fixtures/v5/end_of_road/left_junction_name.json b/test/fixtures/v5/end_of_road/left_junction_name.json index 370822b7c..7f8e418aa 100644 --- a/test/fixtures/v5/end_of_road/left_junction_name.json +++ b/test/fixtures/v5/end_of_road/left_junction_name.json @@ -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", diff --git a/test/fixtures/v5/end_of_road/right_junction_name.json b/test/fixtures/v5/end_of_road/right_junction_name.json index e43ccb412..9e945e118 100644 --- a/test/fixtures/v5/end_of_road/right_junction_name.json +++ b/test/fixtures/v5/end_of_road/right_junction_name.json @@ -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", diff --git a/test/fixtures/v5/end_of_road/sharp_left_junction_name.json b/test/fixtures/v5/end_of_road/sharp_left_junction_name.json index eabd996c8..7df0e0ddd 100644 --- a/test/fixtures/v5/end_of_road/sharp_left_junction_name.json +++ b/test/fixtures/v5/end_of_road/sharp_left_junction_name.json @@ -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", diff --git a/test/fixtures/v5/end_of_road/sharp_right_junction_name.json b/test/fixtures/v5/end_of_road/sharp_right_junction_name.json index db34eadaf..68073d23e 100644 --- a/test/fixtures/v5/end_of_road/sharp_right_junction_name.json +++ b/test/fixtures/v5/end_of_road/sharp_right_junction_name.json @@ -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", diff --git a/test/fixtures/v5/end_of_road/slight_left_junction_name.json b/test/fixtures/v5/end_of_road/slight_left_junction_name.json index 11e1ce950..10d132657 100644 --- a/test/fixtures/v5/end_of_road/slight_left_junction_name.json +++ b/test/fixtures/v5/end_of_road/slight_left_junction_name.json @@ -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", diff --git a/test/fixtures/v5/end_of_road/slight_right_junction_name.json b/test/fixtures/v5/end_of_road/slight_right_junction_name.json index 65a79a2f7..c9c92a71e 100644 --- a/test/fixtures/v5/end_of_road/slight_right_junction_name.json +++ b/test/fixtures/v5/end_of_road/slight_right_junction_name.json @@ -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", diff --git a/test/fixtures/v5/end_of_road/straight_junction_name.json b/test/fixtures/v5/end_of_road/straight_junction_name.json index 2eac552c7..bb0311f58 100644 --- a/test/fixtures/v5/end_of_road/straight_junction_name.json +++ b/test/fixtures/v5/end_of_road/straight_junction_name.json @@ -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", diff --git a/test/fixtures/v5/end_of_road/uturn_junction_name.json b/test/fixtures/v5/end_of_road/uturn_junction_name.json index 0114ad090..f79c8865e 100644 --- a/test/fixtures/v5/end_of_road/uturn_junction_name.json +++ b/test/fixtures/v5/end_of_road/uturn_junction_name.json @@ -31,7 +31,7 @@ "pt-BR": "Faça o retorno em Shibuya Crossing", "pt-PT": "Faça uma 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 bir U-dönüşü yap", diff --git a/test/fixtures/v5/turn/left_junction_name.json b/test/fixtures/v5/turn/left_junction_name.json index b2a3b92c9..8fc7c4200 100644 --- a/test/fixtures/v5/turn/left_junction_name.json +++ b/test/fixtures/v5/turn/left_junction_name.json @@ -31,7 +31,7 @@ "pt-BR": "Vire à esquerda em Shibuya Crossing", "pt-PT": "Vire à esquerda em Shibuya Crossing", "ro": "Virați la 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 sola dön", diff --git a/test/fixtures/v5/turn/right_junction_name.json b/test/fixtures/v5/turn/right_junction_name.json index 041d53500..1f266b635 100644 --- a/test/fixtures/v5/turn/right_junction_name.json +++ b/test/fixtures/v5/turn/right_junction_name.json @@ -31,7 +31,7 @@ "pt-BR": "Vire à direita em Shibuya Crossing", "pt-PT": "Vire à direita em Shibuya Crossing", "ro": "Virați la 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ğa dön", diff --git a/test/fixtures/v5/turn/sharp_left_junction_name.json b/test/fixtures/v5/turn/sharp_left_junction_name.json index b21af57a2..3f69f1a69 100644 --- a/test/fixtures/v5/turn/sharp_left_junction_name.json +++ b/test/fixtures/v5/turn/sharp_left_junction_name.json @@ -31,7 +31,7 @@ "pt-BR": "Siga fechada à esquerda em Shibuya Crossing", "pt-PT": "Siga 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 yöne dön", diff --git a/test/fixtures/v5/turn/sharp_right_junction_name.json b/test/fixtures/v5/turn/sharp_right_junction_name.json index 04806ad33..1eb9f1e72 100644 --- a/test/fixtures/v5/turn/sharp_right_junction_name.json +++ b/test/fixtures/v5/turn/sharp_right_junction_name.json @@ -31,7 +31,7 @@ "pt-BR": "Siga fechada à direita em Shibuya Crossing", "pt-PT": "Siga 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ğ yöne dön", diff --git a/test/fixtures/v5/turn/slight_left_junction_name.json b/test/fixtures/v5/turn/slight_left_junction_name.json index e5a82e24e..3cb913c5c 100644 --- a/test/fixtures/v5/turn/slight_left_junction_name.json +++ b/test/fixtures/v5/turn/slight_left_junction_name.json @@ -31,7 +31,7 @@ "pt-BR": "Siga suave à esquerda em Shibuya Crossing", "pt-PT": "Siga 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 yöne dön", diff --git a/test/fixtures/v5/turn/slight_right_junction_name.json b/test/fixtures/v5/turn/slight_right_junction_name.json index 0a55b8b7b..3d9fe6174 100644 --- a/test/fixtures/v5/turn/slight_right_junction_name.json +++ b/test/fixtures/v5/turn/slight_right_junction_name.json @@ -31,7 +31,7 @@ "pt-BR": "Siga suave à direita em Shibuya Crossing", "pt-PT": "Siga 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ğ yöne dön", diff --git a/test/fixtures/v5/turn/straight_junction_name.json b/test/fixtures/v5/turn/straight_junction_name.json index eab1841be..aef116575 100644 --- a/test/fixtures/v5/turn/straight_junction_name.json +++ b/test/fixtures/v5/turn/straight_junction_name.json @@ -31,7 +31,7 @@ "pt-BR": "Siga em frente em Shibuya Crossing", "pt-PT": "Vá em frente em Shibuya Crossing", "ro": "Mergeți înainte la Shibuya Crossing", - "ru": "Двигайтесь по Shibuya Crossing", + "ru": "На Shibuya Crossing двигайтесь прямо", "sl": "Peljite naravnost na Shibuya Crossing", "sv": "Kör rakt fram vid Shibuya Crossing", "tr": "Shibuya Crossing konumunda düz git", diff --git a/test/fixtures/v5/turn/uturn_junction_name.json b/test/fixtures/v5/turn/uturn_junction_name.json index ea9ac1b5b..bde654a49 100644 --- a/test/fixtures/v5/turn/uturn_junction_name.json +++ b/test/fixtures/v5/turn/uturn_junction_name.json @@ -31,7 +31,7 @@ "pt-BR": "Siga retorno em Shibuya Crossing", "pt-PT": "Siga inversão de marcha em Shibuya Crossing", "ro": "Virați întoarcere la Shibuya Crossing", - "ru": "Двигайтесь на разворот на Shibuya Crossing", + "ru": "На Shibuya Crossing двигайтесь на разворот", "sl": "Zavijte polkrožni obrat na Shibuya Crossing", "sv": "Sväng U-sväng vid Shibuya Crossing", "tr": "Shibuya Crossing konumunda U dönüşü yöne dön", From 35486630f5469195b1a5b20ee7630d415b41c81b Mon Sep 17 00:00:00 2001 From: Yury Lebedev Date: Mon, 9 Dec 2019 18:20:50 +0300 Subject: [PATCH 2/3] Change log update and missing whitespace between PR links --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 039ec2f14..28f07d1c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) @@ -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 From bf2cebab97a1aeea12b22fbdba097321568f6714 Mon Sep 17 00:00:00 2001 From: Yury Lebedev Date: Wed, 15 Jan 2020 13:36:37 +0300 Subject: [PATCH 3/3] Updated Russian grammar with missing "interchange" status street name --- languages/grammar/ru.json | 24 ++++++++++++++++++++++++ test/grammar_test.js | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/languages/grammar/ru.json b/languages/grammar/ru.json index 6fddfea6a..adbec262a 100644 --- a/languages/grammar/ru.json +++ b/languages/grammar/ru.json @@ -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ью улицу "], @@ -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ьей улице "], @@ -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ьей улицы "], @@ -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ьей улице "], diff --git a/test/grammar_test.js b/test/grammar_test.js index 8e30e0978..0fc82617c 100644 --- a/test/grammar_test.js +++ b/test/grammar_test.js @@ -284,6 +284,10 @@ const grammarTests = { ['главная аллея «Годы войны»', 'dative', 'главной аллее «Годы войны»'], ['главная аллея «Годы войны»', 'genitive', 'главной аллеи «Годы войны»'], ['главная аллея «Годы войны»', 'prepositional', 'главной аллее «Годы войны»'], + ['Черкасовская авторазвязка', 'accusative', 'Черкасовскую авторазвязку'], + ['Черкасовская авторазвязка', 'dative', 'Черкасовской авторазвязке'], + ['Черкасовская авторазвязка', 'genitive', 'Черкасовской авторазвязки'], + ['Черкасовская авторазвязка', 'prepositional', 'Черкасовской авторазвязке'], ['1-я линия В.О.', 'accusative', '1-ю линию В.О.'], ['1-я линия В.О.', 'dative', '1-й линии В.О.'], ['1-я линия В.О.', 'genitive', '1-й линии В.О.'],