X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/68a3df4d53c84508bf443058040379c3a18eb1a7..79bd177:/app/views/changeset/history.html.erb?ds=sidebyside diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb index 77118b4b4..17faf7f8d 100644 --- a/app/views/changeset/history.html.erb +++ b/app/views/changeset/history.html.erb @@ -1,22 +1,15 @@ <% 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.merge(:max_id => nil, :xhr => nil, :action => :feed) %> <% end -%> <% end -%> <% - if params[:friends] and @user - set_title(t 'changeset.list.title_friend') - @heading = t 'changeset.list.title_friend' - elsif params[:nearby] and @user - set_title(t 'changeset.list.title_nearby') - @heading = t 'changeset.list.title_nearby' - elsif params[:display_name] - set_title(t 'changeset.list.title_user', :user => params[:display_name]) + set_title(changeset_list_title(params, current_user)) + if params[:display_name] @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe else - set_title(t 'changeset.list.title') - @heading = t 'changeset.list.title' + @heading = @title end %>