Merge remote-tracking branch 'upstream/pull/5518'

[rails.git] / app / assets / javascripts / embed.js.erb

diff --git a/app/assets/javascripts/embed.js.erb b/app/assets/javascripts/embed.js.erb
index 9a0ec07d31d85855c06a02d0179d29f7a298d207..b9e9a2eaf41ee7607881ef681003080bd0456090 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -11,6 +11,9 @@ if (navigator.languages) {
   I18n.locale = navigator.language;
 }
 
+I18n.default_locale = <%= I18n.default_locale.to_json %>;
+I18n.fallbacks = true;
+
 window.onload = function () {
   var query = (window.location.search || '?').slice(1),
       args  = {};
@@ -37,18 +40,16 @@ window.onload = function () {
   map.attributionControl.setPrefix('');
   map.removeControl(map.attributionControl);
 
-  if (!args.layer || args.layer === "mapnik" || args.layer === "osmarender" || args.layer === "mapquest") {
-    new L.OSM.Mapnik(mapnikOptions).addTo(map);
-  } else if (args.layer === "cyclosm") {
+  if (args.layer === "cyclosm") {
     new L.OSM.CyclOSM().addTo(map);
   } else if (args.layer === "cyclemap" || args.layer === "cycle map") {
     new L.OSM.CycleMap(thunderforestOptions).addTo(map);
   } else if (args.layer === "transportmap") {
     new L.OSM.TransportMap(thunderforestOptions).addTo(map);
-  } else if (args.layer === "opnvkarte") {
-    new L.OSM.OPNVKarte().addTo(map);
   } else if (args.layer === "hot") {
     new L.OSM.HOT().addTo(map);
+  } else {
+    new L.OSM.Mapnik(mapnikOptions).addTo(map);
   }
 
   if (args.marker) {