From 937f979327fdb19a188c9cf4d2777af127edde6a Mon Sep 17 00:00:00 2001
From: Saleem Latif <saleem_ee@hotmail.com>
Date: Tue, 23 May 2017 11:42:42 +0500
Subject: [PATCH] Update account activation message on login page

---
 .../student/tests/test_activate_account.py        |  2 +-
 common/djangoapps/student/views.py                | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/common/djangoapps/student/tests/test_activate_account.py b/common/djangoapps/student/tests/test_activate_account.py
index 42f6caf697..62e89a6cbe 100644
--- a/common/djangoapps/student/tests/test_activate_account.py
+++ b/common/djangoapps/student/tests/test_activate_account.py
@@ -174,7 +174,7 @@ class TestActivateAccount(TestCase):
         # Access activation link, message should say that account has been activated.
         response = self.client.get(reverse('activate', args=[self.registration.activation_key]), follow=True)
         self.assertRedirects(response, login_page_url)
-        self.assertContains(response, 'You have activated your account.')
+        self.assertContains(response, 'Success! You have activated your account.')
 
         # Access activation link again, message should say that account is already active.
         response = self.client.get(reverse('activate', args=[self.registration.activation_key]), follow=True)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 3850ef7b3d..ebbd3ae0eb 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -2315,10 +2315,21 @@ def activate_account(request, key):
     else:
         if not registration.user.is_active:
             registration.activate()
-            # Add account activation success message for display later
+            # Success message for logged in users.
+            message = _('{html_start}Success{html_end} You have activated your account.')
+
+            if not request.user.is_authenticated():
+                # Success message for logged out users
+                message = _(
+                    '{html_start}Success! You have activated your account.{html_end}'
+                    'You will now receive email updates and alerts from us related to'
+                    ' the courses you are enrolled in. Sign In to continue.'
+                )
+
+            # Add message for later use.
             messages.success(
                 request,
-                HTML(_('{html_start}Success{html_end} You have activated your account.')).format(
+                HTML(message).format(
                     html_start=HTML('<p class="message-title">'),
                     html_end=HTML('</p>'),
                 ),