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

Merge pull request #4682 from goobertron/NSFW_profile_text

Browse source 
Change NSFW explanation on profile settings page
This commit is contained in:
Jonne Haß 2014-01-13 14:13:35 -08:00
commit 88e0580982
6 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
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"

9
features/desktop/not_safe_for_work.feature
View file

@ -7,14 +7,15 @@ Scenario: Setting not safe for work
| pr0n king | tommy@pr0n.xxx | | pr0n king | tommy@pr0n.xxx |
And I sign in as "tommy@pr0n.xxx" And I sign in as "tommy@pr0n.xxx"
When I go to the edit profile page When I go to the edit profile page
And I should see the "you are safe for work" message
And I mark myself as not safe for work And I mark myself as not safe for work
And I submit the form And I submit the form
Then I should be on the edit profile page Then I should be on the edit profile page
And I should see the "you are nsfw" message And the "profile[nsfw]" checkbox should be checked
When I mark myself as safe for work When I go to the edit profile page
And I mark myself as safe for work
And I submit the form And I submit the form
Then I should see the "you are safe for work" message Then I should be on the edit profile page
And the "profile[nsfw]" checkbox should not be checked
Scenario: Toggling nsfw state Scenario: Toggling nsfw state
#Nsfw users posts are marked nsfw #Nsfw users posts are marked nsfw

4
features/step_definitions/message_steps.rb
View file

@ -5,10 +5,6 @@ Then /^I should see the "(.*)" message$/ do |message|
I18n.translate('invitation_codes.excited', :name => @alice.name) I18n.translate('invitation_codes.excited', :name => @alice.name)
when "welcome to diaspora" when "welcome to diaspora"
I18n.translate('users.getting_started.well_hello_there') I18n.translate('users.getting_started.well_hello_there')
when 'you are safe for work'
I18n.translate('profiles.edit.you_are_safe_for_work')
when 'you are nsfw'
I18n.translate('profiles.edit.you_are_nsfw')
when 'post not public' when 'post not public'
I18n.translate('error_messages.post_not_public_or_not_exist') I18n.translate('error_messages.post_not_public_or_not_exist')
else else

1
features/step_definitions/profile_steps.rb
View file

@ -5,3 +5,4 @@ end
And /^I mark myself as safe for work$/ do And /^I mark myself as safe for work$/ do
uncheck('profile[nsfw]') uncheck('profile[nsfw]')
end end