diff options
Diffstat (limited to 'app/views/general/search.rhtml')
| -rw-r--r-- | app/views/general/search.rhtml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index 15e00b85e..3e6a89582 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -164,7 +164,11 @@ <% if @xapian_requests_hits == 1 && @page == 1 %> <h1><%= _("One FOI request matching your search", :user_search_query => h(@query)) %></h1> <% else %> +<<<<<<< HEAD <h1><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}}", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> +======= + <h1><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}}", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> +>>>>>>> e8ff6d861faefb76c11475a112002cd1b0095590 <% end %> <% if @track_thing %> |