From e833ef6315f40bb455884249b2bcc90b08e5155e Mon Sep 17 00:00:00 2001 From: J Guthrie Date: Sun, 29 Apr 2018 21:59:54 +0100 Subject: [PATCH] Separated ordinal roundabout exit text from normal exit text --- app/assets/javascripts/index/directions/osrm.js | 10 +++++++--- config/locales/en.yml | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js index 38b220430..b49d93e06 100644 --- a/app/assets/javascripts/index/directions/osrm.js +++ b/app/assets/javascripts/index/directions/osrm.js @@ -117,10 +117,14 @@ function OSRMEngine() { } if (step.maneuver.type.match(/rotary|roundabout/)) { - if (step.maneuver.exit && step.maneuver.exit <= 10) { - instText += I18n.t(template + '_with_exit', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name } ); + if (step.maneuver.exit) { + if (step.maneuver.exit <= 10) { + instText += I18n.t(template + '_with_exit_ordinal', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name }); + } else { + instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name }); + } } else { - instText += I18n.t(template + '_without_exit', { name: name } ); + instText += I18n.t(template + '_without_exit', { name: name }); } } else if (step.maneuver.type.match(/on ramp|off ramp/)) { var params = {}; diff --git a/config/locales/en.yml b/config/locales/en.yml index 3b5e5ffa2..4dd1762e1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2377,6 +2377,7 @@ en: against_oneway_without_exit: Go against one-way on %{name} end_oneway_without_exit: End of one-way on %{name} roundabout_with_exit: At roundabout take exit %{exit} onto %{name} + roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name} turn_left_with_exit: Exit onto %{name} slight_left_with_exit: Exit onto %{name} turn_right_with_exit: Exit onto %{name} -- 2.39.5