Add title to changeset feeds

Fixes #1051
Closes #1180
This commit is contained in:
Simon Legner 2016-03-13 21:22:42 +01:00 committed by Tom Hughes
parent 359d030a5b
commit 5175ee68b0
3 changed files with 16 additions and 11 deletions

View file

@ -31,4 +31,16 @@ module ChangesetHelper
:user => changeset_user_link(changeset) :user => changeset_user_link(changeset)
end end
end end
def changeset_list_title(params, user)
if params[:friends] && user
t "changeset.list.title_friend"
elsif params[:nearby] && user
t "changeset.list.title_nearby"
elsif params[:display_name]
t "changeset.list.title_user", :user => params[:display_name]
else
t "changeset.list.title"
end
end
end end

View file

@ -5,18 +5,11 @@
<% end -%> <% end -%>
<% <%
if params[:friends] and @user set_title(changeset_list_title(params, @user))
set_title(t 'changeset.list.title_friend') if params[:display_name]
@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])
@heading = t('changeset.list.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe
else else
set_title(t 'changeset.list.title') @heading = @title
@heading = t 'changeset.list.title'
end end
%> %>

View file

@ -2,7 +2,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
:id => url_for(params.merge({ :only_path => false })), :id => url_for(params.merge({ :only_path => false })),
:root_url => url_for(params.merge({ :action => :list, :format => nil, :only_path => false })), :root_url => url_for(params.merge({ :action => :list, :format => nil, :only_path => false })),
"xmlns:georss" => "http://www.georss.org/georss") do |feed| "xmlns:georss" => "http://www.georss.org/georss") do |feed|
feed.title @title feed.title changeset_list_title(params, @user)
feed.updated @edits.map {|e| [e.created_at, e.closed_at].max }.max feed.updated @edits.map {|e| [e.created_at, e.closed_at].max }.max
feed.icon "http://#{SERVER_URL}/favicon.ico" feed.icon "http://#{SERVER_URL}/favicon.ico"