From: John Firebaugh <john.firebaugh@gmail.com>
Date: Sat, 25 Aug 2012 02:00:59 +0000 (-0700)
Subject: Set OpenLayers lang unobtrusively
X-Git-Tag: live~5448
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dcb25f0c07ef0252fb411be35030ead67f5da5d1

Set OpenLayers lang unobtrusively

We output the locale code as the lang attribute, so
use that rather than interpolating into embedded JS.
---

diff --git a/app/assets/javascripts/openlayers.js.erb b/app/assets/javascripts/openlayers.js.erb
index ebb9578a3..66d991f82 100644
--- a/app/assets/javascripts/openlayers.js.erb
+++ b/app/assets/javascripts/openlayers.js.erb
@@ -35,3 +35,5 @@ OpenLayers.Util.origGetImageLocation = OpenLayers.Util.getImageLocation;
 OpenLayers.Util.getImageLocation = function(image) {
     return OpenLayers.Util.imageURLs[image] || OpenLayers.Util.origGetImageLocation(image);
 };
+
+OpenLayers.Lang.setCode($('html').attr('lang'));
diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index 2c29a0d00..b8077e682 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -41,8 +41,6 @@
 
 <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
   <script type="text/javascript">
-    OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
     function remoteEditHandler(event, bbox, select) {
       var left = bbox.left - 0.0001;
       var top = bbox.top + 0.0001;
diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb
index 8016378c8..3357057b1 100644
--- a/app/views/changeset/_map.html.erb
+++ b/app/views/changeset/_map.html.erb
@@ -5,8 +5,6 @@
 </div>
 
 <script type="text/javascript">
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
   var highlight;
 
   function highlightChangeset(id) {
diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index 6b4d9c177..54ed0cc70 100644
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -56,9 +56,7 @@
   <!--
   var marker;
 
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
-  function setLocation( e ) { 
+  function setLocation( e ) {
     closeMapPopup();
 
     var lonlat = getEventPosition(e);
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index b7a9df068..f604267d8 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -134,8 +134,6 @@ end
   var marker;
   var map;
 
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
   function mapInit(){
     map = createMap("map");
 
diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb
index 2d886527c..a142e99b9 100644
--- a/app/views/user/_map.html.erb
+++ b/app/views/user/_map.html.erb
@@ -20,8 +20,6 @@ end
   <!--
   var marker;
 
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
   function init(){
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     <% if params[:scale].to_f > 0 then -%>