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

[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 15839a2ecbc4af23102a608c0804a4b988d92916..ceb488f987681871e05c87476e5a464de126c79d 100644 (file)
--- a/app/assets/javascripts/embed.js.erb
+++ b/app/assets/javascripts/embed.js.erb
@@ -1,6 +1,7 @@
 //= require leaflet
 //= require leaflet.osm
 //= require leaflet
 //= require leaflet.osm

-//= require i18n/translations
+//= require i18n
+//= require i18n/embed

 
 window.onload = function () {
   if (navigator.languages) {
 
 window.onload = function () {
   if (navigator.languages) {


@@ -19,8 +20,8 @@ window.onload = function () {
   }
 
   var thunderforestOptions = {
   }
 
   var thunderforestOptions = {

-<% if defined?(THUNDERFOREST_KEY) %>
-    apikey: <%= THUNDERFOREST_KEY.to_json %>
+<% if Settings.key?(:thunderforest_key) %>
+    apikey: <%= Settings.thunderforest_key.to_json %>

 <% end %>
   };
 
 <% end %>
   };