From f831e92c42f4023fc71dc683cf327f7692ef8612 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Wed, 15 Feb 2017 16:11:34 -0800
Subject: [PATCH] copyedit to improved invite page

---
 .../javascripts/discourse/templates/invites/show.hbs  | 11 +++++------
 config/locales/client.en.yml                          |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 7c75e8bda24..ae3174918ff 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -14,12 +14,13 @@
 
       {{#if successMessage}}
         <p>{{successMessage}}</p>
-      {{else}}
-        <p>{{i18n 'invites.form_instructions'}}</p>
+      {{else}}        
 
+        <p>{{{yourEmailMessage}}} 
         {{#if externalAuthsEnabled}}
-          <p>{{i18n 'invites.social_login_available'}}</p>
+             {{i18n 'invites.social_login_available'}}
         {{/if}}
+        </p>
 
         <form>
           <label>{{i18n 'user.username.title'}}</label>
@@ -38,9 +39,7 @@
 
           <div class="instructions">
             <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
-          </div>
-
-          <p>{{{yourEmailMessage}}}</p>
+          </div>         
 
           <button class='btn btn-primary' {{action "submit"}} disabled={{submitDisabled}}>{{i18n 'invites.accept_invite'}}</button>
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7eee6facba0..c4c006454df 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1069,7 +1069,6 @@ en:
       accept_title: "Invitation"
       welcome_to: "Welcome to %{site_name}!"
       invited_by: "You were invited by:"
-      form_instructions: "You can choose your username and set your password now, or later from your preferences."
       social_login_available: "After your account is created, you'll be able to sign in with social login."
       your_email: "Your account's email address will be <b>%{email}</b>."
       accept_invite: "Accept Invitation"