Revert "added a podwide email preference"

This reverts commit 60c0a9839b.

app/mailers/notifier.rb

@@ -7,10 +7,8 @@ class Notifier < ActionMailer::Base
   def self.admin(string, recipients, opts = {})
     mails = []
     recipients.each do |rec|
-      if !rec.user_preferences.exists?(:email_type => "podwide")
+      mail = single_admin(string, rec)
-        mail = single_admin(string, rec)
+      mails << mail
-        mails << mail
-      end
     end
     mails
   end

app/models/user_preference.rb

@@ -9,8 +9,7 @@ class UserPreference < ActiveRecord::Base
    "private_message",
    "started_sharing",
    "also_commented",
-   "liked",
+   "liked"]
-   "podwide"]
 
   def must_be_valid_email_type
     unless VALID_EMAIL_TYPES.include?(self.email_type)

app/views/users/edit.html.haml

@@ -105,10 +105,6 @@
           = type.label t('.liked') 
           = type.check_box :liked, {:checked =>  @email_prefs['liked']}, false, true 
 
-        %br
-        %p.checkbox_select
-          = type.label t('.podwide') 
-          = type.check_box :podwide, {:checked =>  @email_prefs['podwide']}, false, true 
     %br
     = f.submit t('.change')
 

config/locales/diaspora/en.yml

@@ -633,7 +633,6 @@ en:
       started_sharing: "...someone starts sharing with you?"
       private_message: "...you receive a private message?"
       liked: "...someone likes your post?"
-      podwide: "...pod-wide news happen [new features, etc.]?"
       change: "Change"
     destroy: "Account successfully closed."
     getting_started:

spec/mailers/notifier_spec.rb

@@ -12,7 +12,6 @@ describe Notifier do
   before do
     Notifier.deliveries = []
   end
-
   describe '.administrative' do
     it 'mails a user' do
       mails = Notifier.admin("Welcome to bureaucracy!", [user])
@@ -22,7 +21,6 @@ describe Notifier do
       mail.body.encoded.should match /Welcome to bureaucracy!/
       mail.body.encoded.should match /#{user.username}/
     end
-
     it 'mails a bunch of users' do
       users = []
       5.times do
@@ -36,18 +34,6 @@ describe Notifier do
         mail.body.encoded.should match /#{this_user.username}/
       }
     end
-
-    it 'does not email the users who opted out of podwide emails' do
-      users = []
-      5.times do
-        users << Factory.create(:user)
-      end
-      2.times do |n|
-        users[n].user_preferences.create(:email_type => 'podwide')
-      end
-      mails = Notifier.admin("Welcome to bureaucracy!", users)
-      mails.length.should == 3
-    end
   end
 
   describe '.single_admin' do