From a4c4032b0d4e42a3a19ec24273e43acd6146fabb Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 16 Aug 2019 21:15:59 +0000
Subject: [PATCH] [CORL-546] Adjusted rejected username copy (#2483)

* fix: fixed copy, removed broken translations

* chore: version bump
---
 client/coral-embed-stream/src/containers/Embed.js             | 2 +-
 .../src/tabs/stream/components/ChangeUsername.js              | 2 +-
 locales/ar.yml                                                | 2 --
 locales/da.yml                                                | 2 --
 locales/de.yml                                                | 2 --
 locales/en.yml                                                | 4 ++--
 locales/es.yml                                                | 2 --
 locales/fi_FI.yml                                             | 2 --
 locales/fr.yml                                                | 2 --
 locales/he.yml                                                | 2 --
 locales/it.yml                                                | 2 --
 locales/nl_NL.yml                                             | 2 --
 locales/pt_BR.yml                                             | 2 --
 locales/sr.yml                                                | 2 --
 locales/zh_CN.yml                                             | 2 --
 locales/zh_TW.yml                                             | 2 --
 package.json                                                  | 2 +-
 17 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/client/coral-embed-stream/src/containers/Embed.js b/client/coral-embed-stream/src/containers/Embed.js
index ef7c361a5..4484f1505 100644
--- a/client/coral-embed-stream/src/containers/Embed.js
+++ b/client/coral-embed-stream/src/containers/Embed.js
@@ -81,7 +81,7 @@ class EmbedContainer extends React.Component {
               },
             }
           ) => {
-            notify('info', t('your_username_has_been_rejected'));
+            notify('info', t('your_username_has_been_rejected_not_in_line'));
             props.updateStatus(state.status);
           },
         },
diff --git a/client/coral-embed-stream/src/tabs/stream/components/ChangeUsername.js b/client/coral-embed-stream/src/tabs/stream/components/ChangeUsername.js
index d90d36733..96468d887 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/ChangeUsername.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ChangeUsername.js
@@ -48,7 +48,7 @@ class ChangeUsername extends Component {
     return (
       <RestrictedMessageBox>
         <div className="talk-change-username">
-          <span>{t('framework.edit_name.msg')}</span>
+          <span>{t('framework.edit_name.rejected')}</span>
           <div className={styles.alert}>{alert}</div>
           <label htmlFor="username" className="screen-reader-text">
             {t('framework.edit_name.label')}
diff --git a/locales/ar.yml b/locales/ar.yml
index cf7177eb1..7aa316fea 100644
--- a/locales/ar.yml
+++ b/locales/ar.yml
@@ -312,7 +312,6 @@ ar:
       button: أرسل
       error: 'يمكن أن تحتوي أسماء المستخدمين على أحرف, أرقام و _ فقط'
       label: 'اسم مستخدم جديد'
-      msg: 'تم تعليق حسابك حاليا نظرا لأن اسم المستخدم قد اعتبر غير لائق. لاستعادة حسابك، يرجى إدخال اسم مستخدم جديد. يرجى الاتصال بنا إذا كان لديك أي أسئلة.'
     my_comments: تعليقاتي
     my_profile: ملفي
     new_count: 'شاهد {0} أكثر {1}'
@@ -559,4 +558,3 @@ ar:
   view_conversation: 'عرض المحادثة'
   your_account_has_been_banned: 'تم حظر حسابك.'
   your_account_has_been_suspended: 'تم تعليق حسابك مؤقتا.'
-  your_username_has_been_rejected: 'تم تعليق حسابك لعدم صلاحية اسم المستخدم الخاصة بك. لاستعادة حسابك رجاء أدخل اسم مستخدم جديدة.'
diff --git a/locales/da.yml b/locales/da.yml
index abcee5bfd..cdb5cb1b5 100644
--- a/locales/da.yml
+++ b/locales/da.yml
@@ -266,7 +266,6 @@ da:
       button: Indsend
       error: 'Brugernavne kan kun indeholde bogstaver og _'
       label: 'Nyt brugernavn'
-      msg: 'Din konto er midlertidigt suspenderet, fordi dit brugernavn er blevet anset for upassende. For at gendanne din konto skal du indtaste et nyt brugernavn. Kontakt os venligst, hvis du har spørgsmål.'
     my_comments: 'Mine kommentarer'
     my_profile: 'Min profil'
     new_count: 'Se {0} mere {1}'
@@ -473,4 +472,3 @@ da:
   view_conversation: 'Vis samtale'
   your_account_has_been_banned: 'Din konto er blevet banned.'
   your_account_has_been_suspended: 'Din konto er midlertidigt suspenderet'
-  your_username_has_been_rejected: 'Din konto er blevet suspenderet fordi dit brugernavn er blevet anset for upassende. For at gendanne din konto, venligst indtast et nyt brugernavn.'
diff --git a/locales/de.yml b/locales/de.yml
index 3c255c897..815d317c6 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -337,7 +337,6 @@ de:
       button: Senden
       error: 'Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten'
       label: 'Neuer Nutzername'
-      msg: 'Ihr Konto ist vorübergehend gesperrt, da Ihr Nutzername als unangemessen eingestuft wurde. Um Ihr Konto wieder herzustellen, geben Sie bitte einen neuen Nutzernamen ein. Bei Fragen, kontaktieren Sie uns bitte.'
     my_comments: 'Meine Kommentare'
     my_profile: 'Mein Profil'
     new_count: '{0} {1} mehr anzeigen'
@@ -593,4 +592,3 @@ de:
   view_conversation: 'Diskussion ansehen'
   your_account_has_been_banned: 'Ihr Zugang wurde gesperrt.'
   your_account_has_been_suspended: 'Ihr Zugang wurde vorübergehend gesperrt.'
-  your_username_has_been_rejected: 'Ihr Zugang wurde vorübergehend gesperrt, da Ihr Nutzername als unangemessen eingestuft wurde. Um Ihren Zugang wieder herzustellen, geben Sie bitte einen neuen Nutzernamen ein.'
diff --git a/locales/en.yml b/locales/en.yml
index 2336a3da6..a5eb948a4 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -337,7 +337,7 @@ en:
       button: Submit
       error: 'Usernames can contain letters numbers and _ only'
       label: 'New Username'
-      msg: 'Your account is currently suspended because your username has been deemed inappropriate. To restore your account please enter a new username. Please contact us if you have any questions.'
+      rejected: 'Your choice of username has been rejected because it is not in line with our username policies. Please submit another name for moderator approval.'
     my_comments: 'My Comments'
     my_profile: 'My profile'
     new_count: 'View {0} more {1}'
@@ -593,4 +593,4 @@ en:
   view_conversation: 'View Conversation'
   your_account_has_been_banned: 'Your account has been banned.'
   your_account_has_been_suspended: 'Your account has been temporarily suspended.'
-  your_username_has_been_rejected: 'Your choice of username has been rejected because it is not in line with our username policies. Please submit another name for moderator approval.'
+  your_username_has_been_rejected_not_in_line: 'Your choice of username has been rejected because it is not in line with our username policies. Please submit another name for moderator approval.'
diff --git a/locales/es.yml b/locales/es.yml
index ab6c08382..695d04afe 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -309,7 +309,6 @@ es:
       button: Enviar
       error: 'Nombres de usuarios pueden solamente incluir letras, números y _'
       label: 'Nuevo Nombre'
-      msg: 'Tu cuenta está suspendida porque tu nombre de usuario ha sido considerado no apropiado para el espacio. Para recuperar la cuenta, por favor ingresar un nuevo nombre de usuario. Contáctanos si tienes alguna pregunta.'
     my_comments: 'Mis Comentarios'
     my_profile: 'Mi perfil'
     new_count: 'Ver {0} más {1} '
@@ -542,4 +541,3 @@ es:
   view_conversation: 'Ver Conversación'
   your_account_has_been_banned: 'Su cuenta ha sido prohibida.'
   your_account_has_been_suspended: 'Su cuenta ha sido suspendida.'
-  your_username_has_been_rejected: 'Su cuenta ha sido suspendida porque tu nombre de usuario ha sido considerado no apropiado para el espacio. Para recuperar la cuenta, por favor ingresar un nuevo nombre de usuario.'
diff --git a/locales/fi_FI.yml b/locales/fi_FI.yml
index 3c04c796a..ec4f03c4d 100644
--- a/locales/fi_FI.yml
+++ b/locales/fi_FI.yml
@@ -269,7 +269,6 @@ fi_FI:
       button: Lähetä
       error: 'Käyttäjänimissä sallittuja merkkejä ovat ainoastaan kirjaimet, numerot, sekä alaviiva'
       label: 'Uusi käyttäjänimi'
-      msg: 'Tilisi on suljettu väliaikaisesti, koska käyttäjänimi on todettu sopimattomaksi. Vaihda käyttäjänimi, jos haluat jatkaa tilin käyttöä. Ole meihin yhteydessä, jos sinulla on aiheesta kysyttävää.'
     my_comments: Kommenttini
     my_profile: Profiilini
     new_count: 'Näytä {0} lisää {1}'
@@ -466,4 +465,3 @@ fi_FI:
   view_conversation: 'Näytä keskustelu'
   your_account_has_been_banned: 'Tilillesi on asetettu kirjoituskielto.'
   your_account_has_been_suspended: 'Tilisi on väliaikasesti suljettu.'
-  your_username_has_been_rejected: 'Tilisi on suljettu, koska käyttäjänimesi on epäsopiva. Vaihda käyttäjänimeä jatkaaksesi tilin käyttöä.'
diff --git a/locales/fr.yml b/locales/fr.yml
index 11ddde892..0df0700db 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -264,7 +264,6 @@ fr:
       button: Soumettre
       error: 'Les noms d''utilisateur ne peuvent contenir que des chiffres, des lettres et "_"'
       label: 'Nouveau nom d''utilisateur'
-      msg: 'Votre compte est actuellement suspendu car votre nom d''utilisateur a été jugé inapproprié. Pour restaurer votre compte, entrez un nouveau nom d''utilisateur. Contactez-nous si vous avez des questions.'
     my_comments: 'Mes commentaires'
     my_profile: 'Mon profil'
     new_count: 'Voir {0} plus {1}'
@@ -462,4 +461,3 @@ fr:
   view_conversation: 'Afficher la conversation'
   your_account_has_been_banned: 'Votre compte a été banni.'
   your_account_has_been_suspended: 'Votre compte a été temporairement suspendu.'
-  your_username_has_been_rejected: 'Votre compte a été suspendu en raison de votre nom d’utilisateur jugé inapproprié. Veuillez saisir un nouveau nom d’utilisateur pour restaurer votre compte.'
diff --git a/locales/he.yml b/locales/he.yml
index 71e2196ef..29607e1a0 100644
--- a/locales/he.yml
+++ b/locales/he.yml
@@ -1,7 +1,6 @@
 he:
   your_account_has_been_suspended: החשבון שלך הושעה באופן זמני.
   your_account_has_been_banned: החשבון שלך הורחק.
-  your_username_has_been_rejected: החשבון שלך הושעה מפני ששם המשתמש שלך נחשב לא הולם. כדי לשחזר את החשבון שלך, הזן שם משתמש חדש.
   embed_comments_tab: תגובות
   bandialog:
     are_you_sure: "האם אתה בטוח שאתה רוצה לאסור {0}?"
@@ -260,7 +259,6 @@ he:
       button: שלח
       error: "שמות משתמש יכולים להכיל מספרי אותיות ו- _ בלבד"
       label: "שם משתמש חדש"
-      msg: "החשבון שלך מושעה כרגע מפני ששם המשתמש שלך נחשב לא הולם. כדי לשחזר את החשבון שלך, הזן שם משתמש חדש. אנא צור איתנו קשר אם יש לך שאלות."
     changed_name:
       msg: "שינוי שם המשתמש שלך נמצא בבדיקה על ידי צוות הניהול שלנו."
     my_comments: "התגובות שלי"
diff --git a/locales/it.yml b/locales/it.yml
index cb6a8e261..617cd842d 100644
--- a/locales/it.yml
+++ b/locales/it.yml
@@ -321,7 +321,6 @@ it:
       button: Invia
       error: 'L''username può contenere solo lettere numeri o _'
       label: 'Nuovo username'
-      msg: 'Il tuo account è attualmente sospeso perchè il tuo username è considerato inappropriato. Per ripristinare il tuo account inserisci un nuovo username. Contattaci se hai qualche domanda.'
     my_comments: 'I miei commenti'
     my_profile: 'Il mio profilo'
     new_count: 'Visualizza {0} e {1}'
@@ -571,4 +570,3 @@ it:
   view_conversation: 'Visualizza conversazione'
   your_account_has_been_banned: 'Il tuo account è stato bloccato.'
   your_account_has_been_suspended: 'Il tuo account è stato temporaneamente sospeso.'
-  your_username_has_been_rejected: 'Il tuo account è stato sospeso perchè il tuo username è ritenuto inappropriato. Per ripristinare il tuo account inserisci un nuovo username.'
diff --git a/locales/nl_NL.yml b/locales/nl_NL.yml
index faf9bed5d..de2495d0c 100644
--- a/locales/nl_NL.yml
+++ b/locales/nl_NL.yml
@@ -324,7 +324,6 @@ nl_NL:
       button: Versturen
       error: "Gebruikersnamen kunnen alleen cijfers, letters en _ bevatten."
       label: "Nieuwe gebruikersnaam"
-      msg: "Je account is momenteel geschorst omdat je gebruikersnaam ongepast is bevonden. Om je account te herstellen, moet je je gebruikersnaam herstellen. Neem contact met ons op wanneer je vragen hebt."
     my_comments: "Mijn reacties"
     my_profile: "Mijn profiel"
     new_count: "Bekijk {0} meer {1}"
@@ -574,4 +573,3 @@ nl_NL:
   view_conversation: "Bekijk conversatie"
   your_account_has_been_banned: "Je account is verbannen."
   your_account_has_been_suspended: "Je account is tijdelijk geschorst."
-  your_username_has_been_rejected: "Je account is geschorst omdat we je gebruikersnaam ongepast vinden. Verander je gebruikersnaam om hem weer te activeren."
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index cb74ba35e..620e7ceeb 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -285,7 +285,6 @@ pt_BR:
       button: Enviar
       error: 'Nomes de usuários podem conter números de letras e _ somente'
       label: 'Novo usuário'
-      msg: 'Sua conta está suspensa porque seu nome de usuário foi considerado inapropriado. Para restaurar sua conta, insira um novo nome de usuário. Entre em contato conosco se você tiver alguma dúvida.'
     my_comments: 'Meus comentários'
     my_profile: 'Meu perfil'
     new_count: 'Ver {0} {1}'
@@ -522,4 +521,3 @@ pt_BR:
   view_conversation: 'Ver conversa'
   your_account_has_been_banned: 'Sua conta foi banida.'
   your_account_has_been_suspended: 'Sua conta foi temporariamente suspensa.'
-  your_username_has_been_rejected: 'Sua conta foi rejeitada porque seu nome de usuário foi considerado inapropriado. Para restaurar sua conta, insira um novo nome de usuário.'
diff --git a/locales/sr.yml b/locales/sr.yml
index 8e8e4d922..23977fd47 100644
--- a/locales/sr.yml
+++ b/locales/sr.yml
@@ -323,7 +323,6 @@ sr:
       button: 'Podnesi'
       error: 'Došlo je do greške'
       label: 'Novo korisničko ime'
-      msg: 'Izmjena vašeg korisničkog imena prolazi provjeru našeg tima moderatora'
     my_comments: 'Moji komentari'
     my_profile: 'Moj profil'
     new_count: 'Vidi još {0} / {1}'
@@ -573,4 +572,3 @@ sr:
   view_conversation: 'Vidi razgovor'
   your_account_has_been_banned: 'Vaš nalog je banovan'
   your_account_has_been_suspended: 'Vaš nalog je privremeno suspendovan'
-  your_username_has_been_rejected: 'Vaš nalog je suspendovan jer je korisničko ime označeno kao neprikladno. Da povratite nalog, unesite novo korisničko ime'
diff --git a/locales/zh_CN.yml b/locales/zh_CN.yml
index aa983688a..e495cc0d5 100644
--- a/locales/zh_CN.yml
+++ b/locales/zh_CN.yml
@@ -232,7 +232,6 @@ zh_CN:
       button: 提交
       error: 用户名只能包含字母、数字跟下划线
       label: 新用户名
-      msg: 由于您的用户名不当，您的帐号目前被暂停使用。如要恢复您的帐户，请输入一个新的用户名。如有任何疑问，请与我们联系。
     my_comments: 我的评论
     my_profile: 我的资料
     new_count: '查看 {0} 更多 {1}'
@@ -411,4 +410,3 @@ zh_CN:
   view_conversation: 查看对话
   your_account_has_been_banned: 您的帐户已被禁用。
   your_account_has_been_suspended: 您的帐户已被暂时停用。
-  your_username_has_been_rejected: 由于您使用了不恰当的用户名，您的帐户已被暂停使用。若需恢复帐户，请输入一个新的用户名
diff --git a/locales/zh_TW.yml b/locales/zh_TW.yml
index 208cfddc8..3e36b4cbd 100644
--- a/locales/zh_TW.yml
+++ b/locales/zh_TW.yml
@@ -228,7 +228,6 @@ zh_TW:
       button: 提交
       error: 用戶名只能包含字母、數字和下劃線。
       label: 新用戶名
-      msg: 由於您的用戶名不當，您的帳號目前已被暫停使用。如要恢復您的帳戶，請輸入一個新的用戶名。如有任何疑問，請與我們聯繫。
     my_comments: 我的評論
     my_profile: 我的概況
     new_count: '查看{0}更多{1}'
@@ -407,4 +406,3 @@ zh_TW:
   view_conversation: 查看對話
   your_account_has_been_banned: 您的賬戶已被禁用。
   your_account_has_been_suspended: 您的賬戶已被暫停使用。
-  your_username_has_been_rejected: 由於您使用了不恰當的用戶名，您的帳戶已被暫停使用。若需恢復帳戶，請輸入一個新的用戶名。
diff --git a/package.json b/package.json
index 3dce7491f..6a628c7b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "4.10.2",
+  "version": "4.10.3",
   "description": "A better commenting experience from Vox Media.",
   "main": "app.js",
   "private": true,