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

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

diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb
index cc008aab758ff568ba970a19e55b03e78cebdc3f..bc19bc8571ce6fe9ab9f22034f7c2b341a0639a6 100644 (file)
--- a/app/helpers/changeset_helper.rb
+++ b/app/helpers/changeset_helper.rb
@@ -3,14 +3,14 @@ module ChangesetHelper
     if changeset.user.status == "deleted"
       t("user.no_such_user.deleted")
     elsif changeset.user.data_public?
     if changeset.user.status == "deleted"
       t("user.no_such_user.deleted")
     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)


@@ -32,15 +32,15 @@ module ChangesetHelper
     end
   end
 
     end
   end
 

-  def changeset_list_title(params, user)
+  def changeset_index_title(params, user)

     if params[:friends] && user
     if params[:friends] && user

-      t "changeset.list.title_friend"
+      t "changeset.index.title_friend"

     elsif params[:nearby] && user
     elsif params[:nearby] && user

-      t "changeset.list.title_nearby"
+      t "changeset.index.title_nearby"

     elsif params[:display_name]
     elsif params[:display_name]

-      t "changeset.list.title_user", :user => params[:display_name]
+      t "changeset.index.title_user", :user => params[:display_name]

     else
     else

-      t "changeset.list.title"
+      t "changeset.index.title"

     end
   end
 end
     end
   end
 end