From 1fa01a811e5440a6c06f9485762e2b031f5caaf9 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Fri, 9 Sep 2011 10:52:19 -0700
Subject: [PATCH] DG MS; updated text to reflect the fact that hiding posts now
 mutes notifications as well

---
 app/views/post_visibilities/update.js.erb  | 1 +
 app/views/shared/_stream_element.html.haml | 9 ++++++---
 config/locales/diaspora/en.yml             | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/views/post_visibilities/update.js.erb b/app/views/post_visibilities/update.js.erb
index 1b444dc2a..f679cdb68 100644
--- a/app/views/post_visibilities/update.js.erb
+++ b/app/views/post_visibilities/update.js.erb
@@ -6,4 +6,5 @@ target.find(".hide_loader").toggleClass("hidden");
 var hide_icon = target.find(".stream_element_delete")
 if (target.find(".undo_text").hasClass("hidden")) {
   hide_icon.toggleClass("hidden");
+  target.find(".hide_loader").toggleClass("hidden");
 }
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 71dd75bba..a41533ec8 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -8,12 +8,15 @@
     - if current_user && post.author.owner_id == current_user.id
       = link_to image_tag('deletelabel.png'), post_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete stream_element_delete", :title => t('delete')
     - else
-      = link_to image_tag('deletelabel.png'), post_visibility_path(:id => "42", :post_id => post.id), :method => :put, :remote => true, :class => "delete stream_element_delete vis_hide", :title => t('hide')
+      = link_to image_tag('deletelabel.png'), post_visibility_path(:id => "42", :post_id => post.id), :method => :put, :remote => true, :class => "delete stream_element_delete vis_hide", :title => t('.hide_and_mute')
     = image_tag 'ajax-loader.gif', :class => "hide_loader hidden"
 
   .undo_text.hidden
-    = t('post_visibilites.update.post_hidden', :name => post.author.name)
-    = link_to t('undo'), post_visibility_path(:id => "42", :post_id => post.id), :method => :put, :remote => true, :class => "delete stream_element_hide_undo"
+    %p
+      = t('post_visibilites.update.post_hidden_and_muted', :name => post.author.name)
+    %p  
+      = t('post_visibilites.update.see_it_on_their_profile', :name => post.author.name)
+    = link_to t('undo'), post_visibility_path(:id => "42", :post_id => post.id), :method => :put, :remote => true
 
   .sm_body
     = person_image_link(post.author, :size => :thumb_small)
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index d6e3d6fc5..e7206804d 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -574,7 +574,8 @@ en:
 
   post_visibilites:
     update:
-      post_hidden: "%{name}'s post has been hidden."
+      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
+      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
 
   profiles:
     edit:
@@ -736,6 +737,7 @@ en:
     stream_element:
       viewable_to_anyone: "This post is viewable to anyone on the web"
       via: "via %{link}"
+      hide_and_mute: "Hide and Mute"
       like: "Like"
       unlike: "Unlike"
       dislike: "Dislike"