Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[rails.git] / app / views / changeset / list.html.erb

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index b6200a8ba9edd69cc309d17615cfbadbc8f0680f..36ec593793f85f0327edd7d2133748e36f2bcbbc 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -2,12 +2,16 @@
   <ol class="changesets">
     <%= render :partial => 'changeset', :collection => @edits %>
   </ol>
+<% if @edits.size == 20 -%>
   <div class="changeset_more">
     <%= link_to t('changeset.list.load_more'), url_for(params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %>
     <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
   </div>
-<% elsif params[:max_id] %>
-  <h4 class="inner22"><%= t('changeset.list.no_more') %></h4>
+<% end -%>
+<% elsif params[:bbox] %>
+  <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more_area' : 'changeset.list.empty_area') %></div>
+<% elsif params[:display_name] %>
+  <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more_user' : 'changeset.list.empty_user') %></div>
 <% else %>
-  <h4 class="inner22"><%= t('changeset.list.empty') %></h4>
+  <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more' : 'changeset.list.empty') %></div>
 <% end %>