Merge pull request #5671 from giniouxe/5662-privacy-button-text
Issue #5662 Fix text on change button
This commit is contained in:
commit
e801c859a8
2 changed files with 4 additions and 3 deletions
|
|
@ -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)
|
* 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)
|
* 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 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
|
## Features
|
||||||
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
|
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
|
||||||
|
|
|
||||||
|
|
@ -31,16 +31,16 @@
|
||||||
= t('.strip_exif')
|
= t('.strip_exif')
|
||||||
|
|
||||||
.small-horizontal-spacer
|
.small-horizontal-spacer
|
||||||
= f.submit t('.change'), :class => 'btn'
|
= f.submit t('users.edit.change'), :class => 'btn'
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
.row-fluid
|
.row-fluid
|
||||||
.span3
|
.span3
|
||||||
.span5
|
.span5
|
||||||
%h3
|
%h3
|
||||||
= t('.ignored_users')
|
= t('.ignored_users')
|
||||||
|
|
||||||
- if @blocks.length.zero?
|
- if @blocks.length.zero?
|
||||||
= t('.no_user_ignored_message')
|
= t('.no_user_ignored_message')
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue