Minor fixes to the I18n code of routing

MapQuest instructions still don't translate, as that backend doesn't accept
simple language locals but require country codes as well.
This commit is contained in:
Kai Krueger 2014-03-29 16:47:42 -06:00
parent 23ffdadb56
commit d24cba4345
6 changed files with 19 additions and 8 deletions

View file

@ -1,6 +1,7 @@
GraphHopperEngine = function(vehicleName, vehicleParam, locale) {
this.vehicleName = vehicleName;
this.vehicleParam = vehicleParam;
//At this point the local system isn't correctly initialised yet, so we don't have accurate information about current locale
this.locale = locale;
if (!locale)
this.locale = "en";
@ -10,12 +11,13 @@ GraphHopperEngine.prototype.createConfig = function() {
var that = this;
return {
name: "javascripts.directions.engines.graphhopper_"+this.vehicleName.toLowerCase(),
creditline: '<a href="http://graphhopper.com/" target="_blank">Graphhopper</a>',
draggable: false,
_hints: {},
getRoute: function(isFinal, points) {
var url = "http://graphhopper.com/routing/api/route?"
+ that.vehicleParam
+ "&locale=" + that.locale;
+ "&locale=" + I18n.currentLocale();
for (var i = 0; i < points.length; i++) {
var pair = points[i].join(',');
url += "&point=" + pair;

View file

@ -15,7 +15,7 @@ MapQuestEngine.prototype.createConfig = function() {
var that = this;
return {
name: "javascripts.directions.engines.mapquest_"+this.vehicleName.toLowerCase(),
creditline: 'Directions courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',
creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',
draggable: false,
_hints: {},
MQ_SPRITE_MAP: {
@ -45,7 +45,7 @@ MapQuestEngine.prototype.createConfig = function() {
url+="&from="+from.join(',');
url+="&to="+to.join(',');
url+="&"+that.vehicleParam;
//url+="&locale=" + I18n.currentLocale(); //Doesn't actually work. MapQuest requires full locale e.g. "de_DE", but I18n only provides language, e.g. "de"
//url+="&locale=" + I18n.currentLocale(); //Doesn't actually work. MapQuest requires full locale e.g. "de_DE", but I18n may only provides language, e.g. "de"
url+="&manMaps=false";
url+="&shapeFormat=raw&generalize=0&unit=k";
this.requestCORS(url);

View file

@ -13,7 +13,7 @@ OSRMEngine.prototype.createConfig = function() {
var that = this;
return {
name: "javascripts.directions.engines.osrm_"+this.vehicleName.toLowerCase(),
creditline: 'Directions courtesy of <a href="http://project-osrm.org/" target="_blank">OSRM</a>',
creditline: '<a href="http://project-osrm.org/" target="_blank">OSRM</a>',
draggable: true,
_hints: {},
getRoute: function(isFinal,points) {