Merge pull request #5434 from DharmaCommunity/5430-missing-empty-list-msg-on-default-privacy-page

issue #5430 : message added
This commit is contained in:
Jonne Haß 2014-11-29 16:01:06 +01:00
commit da718c9d11
3 changed files with 5 additions and 0 deletions

View file

@ -112,6 +112,7 @@ This is disabled by default since it requires the installation of additional pac
* Allow page-specific styling via individual CSS classes [#5282](https://github.com/diaspora/diaspora/pull/5282)
* Change diaspora logo in the header on hover [#5355](https://github.com/diaspora/diaspora/pull/5355)
* Display diaspora handle in search results [#5419](https://github.com/diaspora/diaspora/pull/5419)
* Show a message on the ignored users page when there are none [#5434](https://github.com/diaspora/diaspora/pull/5434)
# 0.4.1.2

View file

@ -20,6 +20,9 @@
.span5
%h3
= t('.ignored_users')
- if @blocks.length.zero?
= t('.no_user_ignored_message')
- @blocks.each do |block|
= block.person_name

View file

@ -1305,6 +1305,7 @@ en:
title: "Privacy Settings"
ignored_users: "Ignored Users"
stop_ignoring: "Stop ignoring"
no_user_ignored_message: "You are currently ignoring no other user"
destroy:
success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying diaspora*."