From 197944edaac66408d861f03baf1b0ab8fb7b9ba4 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 9 Aug 2017 13:42:49 -0400
Subject: [PATCH] UX: when staff change their email address, show a message
 saying an email has been sent to their current address, not their new one

---
 .../javascripts/discourse/templates/preferences-email.hbs | 8 +++++++-
 config/locales/client.en.yml                              | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index f9872e0f8ed..27e7b28cef7 100644
--- a/app/assets/javascripts/discourse/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs
@@ -10,7 +10,13 @@
     {{#if success}}
       <div class="control-group">
         <div class="instructions">
-          <p>{{i18n 'user.change_email.success'}}</p>
+          <p>
+            {{#if currentUser.staff}}
+              {{i18n 'user.change_email.success_staff'}}
+            {{else}}
+              {{i18n 'user.change_email.success'}}
+            {{/if}}
+          </p>
         </div>
       </div>
     {{else}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d009742429d..6246b61fc85 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -706,6 +706,7 @@ en:
         taken: "Sorry, that email is not available."
         error: "There was an error changing your email. Perhaps that address is already in use?"
         success: "We've sent an email to that address. Please follow the confirmation instructions."
+        success_staff: "We've sent an email to your current address. Please follow the confirmation instructions."
 
       change_avatar:
         title: "Change your profile picture"