Move localised text to locale file

[rails.git] / app / views / site / _potlatch2.html.erb

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index bb811d65210fec1ef14d27dbe64a23f8145a73d9..1c203b2fb3e57ee6c9c5dfd2b80cdf5a559908bb 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -10,7 +10,7 @@
 <script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
 <% end %>
 
 <script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
 <% end %>
 

-<% locale = select_locale(Potlatch2::LOCALES.keys).to_s %>
+<% locale = Locale.list(Potlatch2::LOCALES.keys).preferred(preferred_languages).to_s %>

 
 <script type="text/javascript" defer="defer">
   var changesaved=true;
 
 <script type="text/javascript" defer="defer">
   var changesaved=true;


@@ -70,22 +70,12 @@
     }
   }
 
     }
   }
 

+<% if @lat && @lon -%>
+  doSWF(<%= @lat %>, <%= @lon %>, <%= @zoom %>);
+<% else -%>

   var mapParams = OSM.mapParams();
   var mapParams = OSM.mapParams();

-  <% if @lat && @lon -%>
-    doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>);
-  <% else -%>
-    doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
-  <% end -%>
-
-  $("body").on("click", "a.set_position", function (e) {
-    e.preventDefault();
-
-    var data = $(this).data();
-
-    $("#potlatch").each(function () {
-      this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13));
-    });
-  });
+  doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
+<% end -%>

 
   var mapMoved = $.throttle(250, function(lon, lat, zoom) {
     updateLinks({ lon: lon, lat: lat }, zoom);
 
   var mapMoved = $.throttle(250, function(lon, lat, zoom) {
     updateLinks({ lon: lon, lat: lat }, zoom);