cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added exit counts as seperate keys in locale file

Browse source
This commit is contained in:
J Guthrie 2018-04-26 00:35:41 +01:00
parent 4b4449f724
commit 4330dcdf94
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/assets/javascripts/index/directions/osrm.js
View file

@ -60,19 +60,11 @@ function OSRMEngine() {
'depart': 8,
'arrive': 14
};
var convertExitNumber = function(exitNum) {
var j = exitNum % 10,
k = exitNum % 100;
if (j === 1 && k !== 11) {
return exitNum + "st";
var numToWord = function(num) {
if(num > 10) {
num = 11;
}
if (j === 2 && k !== 12) {
return exitNum + "nd";
}
if (j === 3 && k !== 13) {
return exitNum + "rd";
}
return exitNum + "th";
return ["zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "gt_ten"][num];
};
var transformed_steps = input_steps.map(function(step, idx) {
var maneuver_id;
@ -126,7 +118,7 @@ function OSRMEngine() {
if (step.maneuver.type.match(/rotary|roundabout/)) {
if (step.maneuver.exit) {
instText += I18n.t(template + '_with_exit', { exit: convertExitNumber(step.maneuver.exit), name: name } );
instText += I18n.t(template + '_with_exit', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name } );
} else {
instText += I18n.t(template + '_without_exit', { name: name } );
}