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

Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)

Browse source
This commit is contained in:
goobertron 2014-01-12 20:02:33 +00:00
parent 42f790fa13
commit a1ac848d62
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/views/profiles/_edit.haml
View file

@ -45,16 +45,19 @@
= t('search') = t('search')
%p{:class=>"checkbox_select"} %p{:class=>"checkbox_select"}
= label_tag 'profile[searchable]', t('profiles.edit.allow_search')
= check_box_tag 'profile[searchable]', true, profile.searchable = check_box_tag 'profile[searchable]', true, profile.searchable
= label_tag 'profile[searchable]', t('profiles.edit.allow_search')
%br %br
%br %br
%h4= t('nsfw') %h4
%p.nsfw_explanation=profile.nsfw? ? t('.you_are_nsfw') : t('.you_are_safe_for_work') = t('nsfw')
= t('profiles.edit.nsfw_explanation')
%p{:class=>"checkbox_select"} %p{:class=>"checkbox_select"}
= check_box_tag 'profile[nsfw]', true, profile.nsfw? = check_box_tag 'profile[nsfw]', true, profile.nsfw
= label_tag 'profile[nsfw]', "nsfw?" = label_tag 'profile[nsfw]', t('profiles.edit.nsfw_check')
= t('profiles.edit.nsfw_explanation2')
%br
%br %br
%br %br

11
app/views/profiles/_edit.mobile.haml
View file

@ -43,11 +43,14 @@
= check_box_tag 'profile[searchable]', true, profile.searchable = check_box_tag 'profile[searchable]', true, profile.searchable
%br %br
%h4= t('nsfw') %h4
%p.nsfw_explanation=profile.nsfw? ? t('.you_are_nsfw') : t('.you_are_safe_for_work') = t('nsfw')
= t('profiles.edit.nsfw_explanation')
%p{:class=>"checkbox_select"} %p{:class=>"checkbox_select"}
= check_box_tag 'profile[nsfw]', true, profile.nsfw? = check_box_tag 'profile[nsfw]', true, profile.nsfw
= label_tag 'profile[nsfw]', "nsfw?" = label_tag 'profile[nsfw]', t('profiles.edit.nsfw_check')
= t('profiles.edit.nsfw_explanation2')
%br
%br %br
.submit_block .submit_block

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

@ -873,8 +873,9 @@ en:
update_profile: "Update Profile" update_profile: "Update Profile"
allow_search: "Allow for people to search for you within Diaspora" allow_search: "Allow for people to search for you within Diaspora"
edit_profile: "Edit profile" edit_profile: "Edit profile"
you_are_nsfw: "You have marked yourself not safe for work, your content will not show up in people who have opted out of seeing objectionable content's streams." nsfw_explanation: "NSFW (‘not safe for work’) is diaspora*’s self-governing community standard for content which may not be suitable to view while at work. If you plan to share such material frequently, please check this option so that everything you share will be hidden from people’s streams unless they choose to view them."
you_are_safe_for_work: "You have marked yourself as safe for work, this means you agree the content you post will agree with the community guidelines." nsfw_explanation2: "If you choose not to select this option, please add the #nsfw tag each time you share such material."
nsfw_check: "Mark everything I share as NSFW"
update: update:
updated: "Profile updated" updated: "Profile updated"
failed: "Failed to update profile" failed: "Failed to update profile"