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

Change direction string ids to force retranslation

Browse source
This commit is contained in:
Tom Hughes 2015-07-08 20:37:56 +01:00
parent b5b9f9972b
commit d28ae2ad0a
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@ function OSRMEngine() {
getRoute: function (points, callback) {
var TURN_INSTRUCTIONS = [
"",
'javascripts.directions.instructions.continue_on', // 1
'javascripts.directions.instructions.continue', // 1
'javascripts.directions.instructions.slight_right', // 2
'javascripts.directions.instructions.turn_right', // 3
'javascripts.directions.instructions.sharp_right', // 4
@ -66,9 +66,9 @@ function OSRMEngine() {
var instText = "<b>" + (i + 1) + ".</b> ";
var name = s[1] ? "<b>" + s[1] + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
if (instCodes[0] === "11" && instCodes[1]) {
instText += I18n.t('javascripts.directions.instructions.roundabout_with_exit', { exit: instCodes[1], name: name } );
instText += I18n.t(TURN_INSTRUCTIONS[instCodes[0]] + '_with_exit', { exit: instCodes[1], name: name } );
} else {
instText += I18n.t(TURN_INSTRUCTIONS[instCodes[0]], { name: name });
instText += I18n.t(TURN_INSTRUCTIONS[instCodes[0]] + '_without_exit', { name: name });
}
if ((i + 1) < data.route_instructions.length) {
linesegend = data.route_instructions[i + 1][3] + 1;

34
config/locales/en.yml
View file

@ -2241,23 +2241,23 @@ en:
no_route: "Couldn't find a route between those two places."
no_place: "Sorry - couldn't find that place."
instructions:
continue_on: Continue on %{name}
slight_right: Slight right onto %{name}
turn_right: Turn right onto %{name}
sharp_right: Sharp right onto %{name}
uturn: U-turn along %{name}
sharp_left: Sharp left onto %{name}
turn_left: Turn left onto %{name}
slight_left: Slight left onto %{name}
via_point: (via point)
follow: Follow %{name}
roundabout: At roundabout take %{name}
leave_roundabout: Leave roundabout - %{name}
stay_roundabout: Stay on roundabout - %{name}
start: Start at end of %{name}
destination: Reach destination
against_oneway: Go against one-way on %{name}
end_oneway: End of one-way on %{name}
continue_without_exit: Continue on %{name}
slight_right_without_exit: Slight right onto %{name}
turn_right_without_exit: Turn right onto %{name}
sharp_right_without_exit: Sharp right onto %{name}
uturn_without_exit: U-turn along %{name}
sharp_left_without_exit: Sharp left onto %{name}
turn_left_without_exit: Turn left onto %{name}
slight_left_without_exit: Slight left onto %{name}
via_point_without_exit: (via point)
follow_without_exit: Follow %{name}
roundabout_without_exit: At roundabout take %{name}
leave_roundabout_without_exit: Leave roundabout - %{name}
stay_roundabout_without_exit: Stay on roundabout - %{name}
start_without_exit: Start at end of %{name}
destination_without_exit: Reach destination
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}
unnamed: "unnamed road"
courtesy: "Directions courtesy of %{link}"