Merge pull request #1573 from coralproject/copy-changes

Copy and bug fixes

plugins/talk-plugin-local-auth/client/translations.yml

@@ -11,7 +11,7 @@ en:
       changed_password_msg: "Changed Password - Your password has been successfully changed"
       forgot_password_sent: "Forgot Password - We sent you an email to recover your password"
     change_username:
-      change_username_note: "Usernames can be changed every 14 days"
+      change_username_note: "Usernames can only be changed once every 14 days. Your username is not currently eligible to be updated."
       save: "Save"
       edit_profile: "Edit Profile"
       cancel: "Cancel"

plugins/talk-plugin-profile-data/client/components/AccountDeletionRequestedSign.js

@@ -37,13 +37,13 @@ class AccountDeletionRequestedSign extends React.Component {
         </h4>
         <p className={styles.description}>
           {t('delete_request.received_on')}
-          {deletionScheduledFor}.
+          {deletionScheduledOn}.
         </p>
         <p className={styles.description}>
           {t('delete_request.cancel_request_description')}
           <b>
             {' '}
-            {t('delete_request.before')} {deletionScheduledOn}
+            {t('delete_request.before')} {deletionScheduledFor}
           </b>.
         </p>
         <div className={styles.actions}>

plugins/talk-plugin-profile-data/client/translations.yml

@@ -20,9 +20,9 @@ en:
     cancel_account_deletion_request: "Cancel Account Deletion Request"
     delete_my_account: "Delete My Account"
     delete_my_account_description: "Deleting your account will permanently erase your profile and remove all your comments from this site."
-    already_submitted_request_description: "You have already submitted a request to delete your account. Your account will be deleted on {0}. You may cancel the request until that time"
+    already_submitted_request_description: "You have already submitted a request to delete your account. Your account will be deleted after {0}. You may cancel the request until that time"
     your_request_submitted_description: "Your request has been submitted and confirmation has been sent to the email address associated with your account."
-    your_account_deletion_scheduled: "Your account is scheduled to be deleted at:"
+    your_account_deletion_scheduled: "Your account is scheduled to be deleted after:"
     changed_your_mind: "Changed your mind?"
     simply_go_to: "Simply go to your account again before this time and click"
     tell_us_why: "Tell us why"