X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bf0d8b3a5e79cc94eb0206c82f58128ee4598e75..e72f35f8d9f9452dcc4da95d46d6c25ca3e063da:/app/views/site/edit.rhtml?ds=sidebyside

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 72ef5aa0d..d7c47101a 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -1,16 +1,14 @@
 <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
-<p>The OpenStreetMap database is currently offline while
-   essential database maintenance work is carried out.
+<p><%= t 'layouts.osm_offline' %>
 </p>
-<% elsif OSM_STATUS == :api_readonly %>
-<p>The OpenStreetMap database is currently in read-only mode while
-   essential database maintenance work is carried out.
+<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
+<p><%= t 'layouts.osm_read_only' %>
 </p>
 <% elsif !@user.data_public? %>
-<p>You haven't set your edits to be public.</p>
-<p>You can't use the online editor unless you do so. You can set your edits as public from your 
-<%= link_to 'user page', {:controller => 'user', :action => 'account', :display_name => @user.display_name}%>.</p>
-<p>(<a href="http://wiki.openstreetmap.org/index.php/Disabling_anonymous_edits">Find out why this is the case.</a>)</p>
+<p><%= t 'site.edit.not_public' %></p>
+<p><%= t 'site.edit.not_public_description', 
+:user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
+<p><%= t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edit_link_text'), t('site.edit.anon_edits_link')) %> (<a href=""></a>)</p>
 <% else %>
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
@@ -24,28 +22,37 @@
 <%
 session[:token] = @user.tokens.create.token unless session[:token]
 
-if params['mlon'] and params['mlat'] 
+# Decide on a lat lon to initialise potlatch with. Various ways of doing this
+if params['lon'] and params['lat']
+	lon =  h(params['lon']) 
+	lat =  h(params['lat']) 
+	zoom =  h(params['zoom'])
+
+elsif params['mlon'] and params['mlat'] 
 	lon =  h(params['mlon']) 
 	lat =  h(params['mlat']) 
-	zoom =  h(params['zoom'] || '14')
+	zoom =  h(params['zoom'])
+	
+elsif params['gpx']
+	#use gpx id to locate (dealt with below)
 	
-elsif @user and params['lon'].nil? and params['lat'].nil? and params['gpx'].nil?
+elsif cookies.key?("_osm_location")
+	lon,lat,zoom,layers = cookies["_osm_location"].split("|")
+	
+elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? 
 	lon =  @user.home_lon
 	lat =  @user.home_lat
-	zoom = '14'
+
 else
-	lon =  h(params['lon'] || 'null') 
-	lat =  h(params['lat'] || 'null') 
-	zoom =  h(params['zoom'] || '14') 
+	#catch all.  Do nothing.  lat=nil, lon=nil
+	#Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
 end
+
+zoom='14' if zoom.nil?
 %>
 
 <div id="map">
-	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/index.php/Editing">Several other options</a> are also available
-    for editing OpenStreetMap.
+	<%= t 'site.edit.flash_player_required' %>
 </div>
 
 <%= javascript_include_tag 'swfobject.js' %>
@@ -57,13 +64,16 @@ end
   var winie=false; if (document.all && window.print) { winie=true; }
   
   window.onbeforeunload=function() {
-	if (!changesaved && !winie) {
-	    return "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point.)";
-	}
+    if (!changesaved) {
+      return "<%= t 'site.edit.potlatch_unsaved_changes' %>";
+    }
   }
 
+  function markChanged(a) { changesaved=a; }
+
   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;
+    fo.addVariable('winie',winie);
     fo.addVariable('scale',sc);
     fo.addVariable('token','<%= session[:token] %>');
     if (lat) { fo.addVariable('lat',lat); }