diff --git a/Changelog.md b/Changelog.md index 8dcc024dc073b745868309b8420a326458b6f40d..8c15bc863f3e5823e427f48fd286b963b06be7b2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -130,6 +130,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a * Don't error out when adding a too long location to the profile [#5614](https://github.com/diaspora/diaspora/pull/5614) * Correctly decrease unread count for conversations [#5646](https://github.com/diaspora/diaspora/pull/5646) * Fix automatic scroll for conversations [#5646](https://github.com/diaspora/diaspora/pull/5646) +* Fix missing translation on privacy settings page [#5671](https://github.com/diaspora/diaspora/pull/5671) ## Features * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105) diff --git a/app/views/users/privacy_settings.html.haml b/app/views/users/privacy_settings.html.haml index 7fec95c9121e98b3cde529e5c7fbc246ff2a704c..09c83429671c0fb1fa96cf32227af11528ee7eff 100644 --- a/app/views/users/privacy_settings.html.haml +++ b/app/views/users/privacy_settings.html.haml @@ -31,16 +31,16 @@ = t('.strip_exif') .small-horizontal-spacer - = f.submit t('.change'), :class => 'btn' + = f.submit t('users.edit.change'), :class => 'btn' %hr - + .row-fluid .span3 .span5 %h3 = t('.ignored_users') - + - if @blocks.length.zero? = t('.no_user_ignored_message')