From 00e561dd01e832200a85ec10f833ab274e9f5a27 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Tue, 20 Sep 2011 00:05:56 -0700
Subject: [PATCH] comments -> reactions

---
 app/views/shared/_stream_element.mobile.haml | 2 +-
 config/locales/diaspora/en.yml               | 8 ++++++++
 public/stylesheets/sass/mobile.scss          | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml
index 4967542b7..24c184551 100644
--- a/app/views/shared/_stream_element.mobile.haml
+++ b/app/views/shared/_stream_element.mobile.haml
@@ -47,5 +47,5 @@
       - else
         = link_to '', '#', :class => "image_link like_action inactive", 'data-post-id' => post.id
 
-    = link_to "#{t('comments', :count => post.comments.length)}", post_path(post), :class => 'comment_link'
+    = link_to "#{t('reactions', :count => (post.comments.length + post.likes_count))}", post_path(post), :class => 'comment_link'
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 60c12d4b0..9242ad92f 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -210,6 +210,14 @@ en:
       comment: "Comment"
       commenting: "Commenting..."
 
+  reactions:
+    zero: "No reactions"
+    one: "1 reaction"
+    two: "%{count} reactions"
+    few: "%{count} reactions"
+    many: "%{count} reactions"
+    other: "%{count} reactions"
+
   contacts:
     zero: "no contacts"
     one: "1 contact"
diff --git a/public/stylesheets/sass/mobile.scss b/public/stylesheets/sass/mobile.scss
index 787381e89..08511acee 100644
--- a/public/stylesheets/sass/mobile.scss
+++ b/public/stylesheets/sass/mobile.scss
@@ -368,7 +368,7 @@ footer {
 
 .like_action {
   background-image: url("/images/icons/heart_mobile_grey.png");
-  .active {
+  &.active {
     background-image: url("/images/icons/heart_mobile_red.png"); } }
 
 .comment_action {