Add title to changeset feeds

Fixes #1051
Closes #1180

diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb
index 45c8be681972bf1f0a12a18a7fb2df456b3e6295..cc008aab758ff568ba970a19e55b03e78cebdc3f 100644 (file)
--- a/app/helpers/changeset_helper.rb
+++ b/app/helpers/changeset_helper.rb
@@ -31,4 +31,16 @@ module ChangesetHelper
         :user => changeset_user_link(changeset)
     end
   end
         :user => changeset_user_link(changeset)
     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

diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb
index 77118b4b4b5214c9183ded9af5af5dd4c8cfc041..7f08a40b3ff5ddc5dda534c1d6b82cbecb38f5a9 100644 (file)
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@ -5,18 +5,11 @@
 <% 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, @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
      @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
 %>
 
    end
 %>
 

diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder
index 619dc4a082d2009d3bc1fc3534a29da0913d0e95..3e0cd9ec58c6624bf3c27535f93cc5568351a607 100644 (file)
--- a/app/views/changeset/list.atom.builder
+++ b/app/views/changeset/list.atom.builder
@@ -2,7 +2,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
           :id => url_for(params.merge({ :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|
           :id => url_for(params.merge({ :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|

-  feed.title @title
+  feed.title changeset_list_title(params, @user)

 
   feed.updated @edits.map {|e|  [e.created_at, e.closed_at].max }.max
   feed.icon "http://#{SERVER_URL}/favicon.ico"
 
   feed.updated @edits.map {|e|  [e.created_at, e.closed_at].max }.max
   feed.icon "http://#{SERVER_URL}/favicon.ico"