Merge pull request #136 from pmclanahan/add-sms-messages-1169026

Bug 1169026: Add SMS messages for spring campaign.
mozmeao · May 28, 2015 · d9a3be6 · d9a3be6
2 parents b4c375c + ae85b44
commit d9a3be6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/news/tasks.py b/news/tasks.py
@@ -29,7 +29,10 @@
 CONFIRMATION_MESSAGE = "confirmation_email"
 
 SMS_MESSAGES = {
-    'SMS_Android': 'MTo3ODow'
+    'SMS_Android': 'MTo3ODow',
+    'android': 'NTo3ODow',
+    'ios': 'Njo3ODow',
+    'mobile': 'Nzo3ODow',
 }
 PHONEBOOK_GROUPS = (
     'SYSTEMS_ADMINISTRATION',
@@ -670,7 +673,7 @@ def confirm_user(token, user_data):
                  'is already confirmed' % token)
         return
 
-    if not 'email' in user_data or not user_data['email']:
+    if not ('email' in user_data and user_data['email']):
         raise BasketError('token has no email in ET')
 
     # Add user's token to the confirmation database at ET. A nightly