diff --git a/Changelog.md b/Changelog.md index 4c479ce09..bb64d1e7b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -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 diff --git a/app/views/users/privacy_settings.html.haml b/app/views/users/privacy_settings.html.haml index 9ed9c8d0d..830f65eb8 100644 --- a/app/views/users/privacy_settings.html.haml +++ b/app/views/users/privacy_settings.html.haml @@ -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 diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 9826d2716..e2b3c227c 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -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*."