diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 46891862123b6410208978fe0f93ab80fec34a53..cf73c7d58110834421b72d0a2d0f7887333e8159 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -9,7 +9,8 @@ class UserPreference < ActiveRecord::Base "private_message", "started_sharing", "also_commented", - "liked"] + "liked", + "reshared"] def must_be_valid_email_type unless VALID_EMAIL_TYPES.include?(self.email_type) diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index ee3f8ecc4d575e3c69926d137d78985d592fe3f5..0ffec0260efe66e45d0a1abcce9e8d8f18560dcd 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -109,6 +109,10 @@ = type.label t('.liked') = type.check_box :liked, {:checked => @email_prefs['liked']}, false, true + %br + %p.checkbox_select + = type.label t('.reshared') + = type.check_box :reshared, {:checked => @email_prefs['reshared']}, false, true %br = f.submit t('.change') diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index c2783abccf9fdbab0575d3717e3423e25f325d88..5ad645f55558590a6fa0ff389c516e5c5ae5bb1a 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -795,6 +795,7 @@ en: started_sharing: "...someone starts sharing with you?" private_message: "...you receive a private message?" liked: "...someone likes your post?" + reshared: "...someone reshares your post?" change: "Change" email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}." destroy: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora."