Merge remote-tracking branch 'upstream/pull/2009'

[rails.git] / app / helpers / changeset_helper.rb

diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb
index 45c8be681972bf1f0a12a18a7fb2df456b3e6295..9bcae4ad4d010ce0fe3de73bcb5b666b83e5db31 100644 (file)
--- a/app/helpers/changeset_helper.rb
+++ b/app/helpers/changeset_helper.rb
@@ -1,16 +1,16 @@
 module ChangesetHelper
   def changeset_user_link(changeset)
     if changeset.user.status == "deleted"
 module ChangesetHelper
   def changeset_user_link(changeset)
     if changeset.user.status == "deleted"

-      t("user.no_such_user.deleted")
+      t("users.no_such_user.deleted")

     elsif changeset.user.data_public?
     elsif changeset.user.data_public?

-      link_to(changeset.user.display_name, user_path(changeset.user.display_name))
+      link_to(changeset.user.display_name, user_path(changeset.user))

     else
       t("browse.anonymous")
     end
   end
 
   def changeset_details(changeset)
     else
       t("browse.anonymous")
     end
   end
 
   def changeset_details(changeset)

-    if changeset.closed_at > DateTime.now
+    if changeset.closed_at > Time.now

       action = :created
       time = distance_of_time_in_words_to_now(changeset.created_at)
       title = l(changeset.created_at)
       action = :created
       time = distance_of_time_in_words_to_now(changeset.created_at)
       title = l(changeset.created_at)


@@ -31,4 +31,16 @@ module ChangesetHelper
         :user => changeset_user_link(changeset)
     end
   end
         :user => changeset_user_link(changeset)
     end
   end

+
+  def changeset_index_title(params, user)
+    if params[:friends] && user
+      t "changeset.index.title_friend"
+    elsif params[:nearby] && user
+      t "changeset.index.title_nearby"
+    elsif params[:display_name]
+      t "changeset.index.title_user", :user => params[:display_name]
+    else
+      t "changeset.index.title"
+    end
+  end

 end
 end