From effb66a08954f7f8ab4c3d576b09c826da878e33 Mon Sep 17 00:00:00 2001
From: Joanna Cholewa <34255500+jcholewa@users.noreply.github.com>
Date: Mon, 9 Mar 2020 14:48:54 +0000
Subject: [PATCH] Replace setUsernameNotificationBody setting with
 changeUsernameDisclaimer and alter disclaimer text (#11953)

---
 .../src/components/header/notifications/verifyUsername.vue     | 2 +-
 website/common/locales/en/settings.json                        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/website/client/src/components/header/notifications/verifyUsername.vue b/website/client/src/components/header/notifications/verifyUsername.vue
index 5cf9e7307a..4a4c508df3 100644
--- a/website/client/src/components/header/notifications/verifyUsername.vue
+++ b/website/client/src/components/header/notifications/verifyUsername.vue
@@ -13,7 +13,7 @@
       <div class="username-notification-title">
         {{ $t('setUsernameNotificationTitle') }}
       </div>
-      <div>{{ $t('setUsernameNotificationBody') }}</div>
+      <div>{{ $t('changeUsernameDisclaimer') }}</div>
       <div class="current-username-container mx-auto">
         <label class="font-weight-bold">{{ $t('currentUsername') + " " }}</label>
         <label>@</label>
diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json
index 1e7bec50e1..afc364d3a5 100644
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -195,7 +195,6 @@
     "push": "Push",
     "about": "About",
     "setUsernameNotificationTitle": "Confirm your username!",
-    "setUsernameNotificationBody": "We will be transitioning login names to unique, public usernames soon. This username will be used for invitations, @mentions in chat, and messaging.",
     "usernameIssueSlur": "Usernames may not contain inappropriate language.",
     "usernameIssueForbidden": "Usernames may not contain restricted words.",
     "usernameIssueLength": "Usernames must be between 1 and 20 characters.",
@@ -206,7 +205,7 @@
     "goToSettings": "Go to Settings",
     "usernameVerifiedConfirmation": "Your username, <%= username %>, is confirmed!",
     "usernameNotVerified": "Please confirm your username.",
-    "changeUsernameDisclaimer": "This username will be used for invitations, @mentions in chat, and messaging.",
+    "changeUsernameDisclaimer": "Your username is used for invitations, @mentions in chat, and messaging. It must be 1 to 20 characters, containing only letters a to z, numbers 0 to 9, hyphens, or underscores, and cannot include any inappropriate terms.",
     "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!",
     "mentioning": "Mentioning",
     "suggestMyUsername": "Suggest my username",