X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/75189bd17d42166871c7ffce07917fdd73dbcfa4..e47187a8fb45c9372ad3a7422f96d357e087676d:/app/views/changesets/history.html.erb?ds=sidebyside diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb index 1117f01b3..a536677b0 100644 --- a/app/views/changesets/history.html.erb +++ b/app/views/changesets/history.html.erb @@ -1,23 +1,22 @@ <% content_for :auto_discovery_link_tag do -%> <% unless params[:friends] or params[:nearby] -%> - <%= auto_discovery_link_tag :atom, @params.merge(:max_id => nil, :xhr => nil, :action => :feed) %> + <%= auto_discovery_link_tag :atom, @params.to_h.merge(:max_id => nil, :xhr => nil, :action => :feed) %> <% end -%> <% end -%> -<% - set_title(changeset_index_title(params, current_user)) - if params[:display_name] - @heading = t('changesets.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe - else - @heading = @title - end -%> +<% set_title(changeset_index_title(params, current_user)) + @heading = if params[:display_name] + t("changesets.index.title_user_link_html", :user_link => link_to(params[:display_name], user_path(params[:display_name]))) + else + @title + end %> -

- - <%= @heading %> -

+<%= render "sidebar_header", :title => @heading %> -
- <%= image_tag "searching.gif", :class => "loader" %> +
+
+
+ <%= t("browse.start_rjs.loading") %> +
+