X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7d900f15dcedc682d042433673bf169aaec1bbae..7bf44e6870ba3448080a5453a43799562174ae48:/app/views/site/_potlatch2.html.erb?ds=sidebyside

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index b2eda87d5..c91a01984 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -4,7 +4,13 @@
 
 <%= javascript_include_tag 'swfobject.js' %>
 
+<% if defined? POTLATCH2_KEY %>
 <% token = @user.access_token(POTLATCH2_KEY) %>
+<% else%>
+<script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
+<% end %>
+
+<% locale = request.compatible_language_from(Potlatch2::LOCALES.keys) || "en" %>
 
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
@@ -24,6 +30,7 @@
     fo.addParam("base","/potlatch2");
     if (lat) { fo.addVariable("lat",lat); }
     if (lon) { fo.addVariable("lon",lon); }
+    fo.addVariable("locale", "<%= Potlatch2::LOCALES[locale] %>");
     <% if params['gpx'] %>
     fo.addVariable('gpx' ,'<%= h(params['gpx']) %>');
     <% end %>
@@ -34,10 +41,13 @@
     fo.addVariable("api","<%= request.protocol + request.host_with_port %>/api/<%= API_VERSION %>/");
     fo.addVariable("policy","<%= request.protocol + request.host_with_port %>/api/crossdomain.xml");
     fo.addVariable("connection","XML");
+    fo.addVariable("show_help","once");
+    <% if token %>
     fo.addVariable("oauth_token","<%= token.token %>");
     fo.addVariable("oauth_token_secret","<%= token.secret %>");
     fo.addVariable("oauth_consumer_key","<%= token.client_application.key %>");
     fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>");
+    <% end %>
     fo.addVariable("maximise_function","maximiseMap");
     fo.addVariable("minimise_function","minimiseMap");
     fo.addVariable("move_function","mapMoved");