Merge 14394:14533 from trunk.

This commit is contained in:
Tom Hughes 2009-04-16 21:11:12 +00:00
commit 5449cf4adc
18 changed files with 45 additions and 24 deletions

View file

@ -94,7 +94,7 @@
The OpenStreetMap database is currently offline while
essential database maintenance work is carried out.
</div>
<% elsif OSM_STATUS == :api_readonly %>
<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
<div id="alert">
The OpenStreetMap database is currently in read-only mode while
essential database maintenance work is carried out.

View file

@ -2,7 +2,7 @@
<p>The OpenStreetMap database is currently offline while
essential database maintenance work is carried out.
</p>
<% elsif OSM_STATUS == :api_readonly %>
<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
<p>The OpenStreetMap database is currently in read-only mode while
essential database maintenance work is carried out.
</p>

View file

@ -1,3 +1,9 @@
<% if OSM_STATUS == :database_offline %>
<p>The OpenStreetMap database is currently offline while
essential database maintenance work is carried out.
</p>
<% else %>
<p>The OpenStreetMap database is currently in read-only mode while
essential database maintenance work is carried out.
</p>
<% end %>