cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2011-04-03 15:40:05 +01:00
parent d62da73ad7
commit cb6d6c2463
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/site/_potlatch2.html.erb
View file

@ -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");

1
config/locales/en.yml
View file

@ -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: