From: Tom Hughes <tom@compton.nu>
Date: Sun, 3 Apr 2011 14:40:05 +0000 (+0100)
Subject: Report a friendly(ish) error if no OAauth key is set for Potlatch 2
X-Git-Tag: live~6250^2~71
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cb6d6c246332ffe3230df31f3acc1ed82e2b80ce

Report a friendly(ish) error if no OAauth key is set for Potlatch 2
---

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index b2eda87d5..760927a82 100644
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -4,7 +4,11 @@
 
 <%= 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 %>
 
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
@@ -34,10 +38,12 @@
     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");
+    <% 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");
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1f3529ee7..7641d5532 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1252,6 +1252,7 @@ en:
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
       potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
+      potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
       potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     sidebar: