diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index be45ed46e..7c3391d45 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -48,8 +48,8 @@ module NotificationsHelper end end - def notification_people_link(note) - actors = note.actors + def notification_people_link(note, people=nil) + actors =people || note.actors number_of_actors = actors.count sentence_translations = {:two_words_connector => " #{t('notifications.index.and')} ", :last_word_connector => ", #{t('notifications.index.and')} " } actor_links = actors.collect{ |person| link_to("#{h(person.name.titlecase.strip)}", person_path(person))} diff --git a/app/views/likes/_likes.haml b/app/views/likes/_likes.haml index 33e5fc45e..f1098a305 100644 --- a/app/views/likes/_likes.haml +++ b/app/views/likes/_likes.haml @@ -8,5 +8,5 @@ = image_tag('icons/heart.png') = link_to t('.people_like_this', :count => likes.length), "#", :class => "expand_likes" %span.hidden.likes_list - = likes_list(likes) + = notification_people_link(nil, likes.map{|x| x.author})