nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DG MS; updated text to reflect the fact that hiding posts now

Browse source 
mutes notifications as well
This commit is contained in:
Maxwell Salzberg 2011-09-09 10:52:19 -07:00
parent 328269e40d
commit 1fa01a811e
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/post_visibilities/update.js.erb
View file

@ -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");
}

9
app/views/shared/_stream_element.html.haml
View file

@ -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)

4
config/locales/diaspora/en.yml
View file

@ -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"