From c8657c55a8b593e8dfbd0ed9e5a27a6e333d54c5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 22 Oct 2024 15:43:01 +0530 Subject: [PATCH 1/2] fix: parsing of `@` in i18n values (#10334) Vue i18n has a new [linked message syntax.](https://vue-i18n.intlify.dev/guide/essentials/syntax.html#linked-messages) When it encounters `@` it assumes that we're trying to use a linked message. And tries to parse it as such, in any case, it breaks since the syntax is not valid and the params are not present. So it causes an error. This works on dev but on production the error is bubbled up to the top and rendering breaks. A lot of folks use Chatwoot with default locale set in the env, this surfaced the issue for the languages for which the syntax was not updated Fixes: https://github.com/chatwoot/chatwoot/issues/10313 --- app/javascript/dashboard/i18n/locale/ar/login.json | 2 +- app/javascript/dashboard/i18n/locale/bg/login.json | 2 +- app/javascript/dashboard/i18n/locale/ca/login.json | 2 +- app/javascript/dashboard/i18n/locale/cs/login.json | 2 +- app/javascript/dashboard/i18n/locale/cs/signup.json | 2 +- app/javascript/dashboard/i18n/locale/da/login.json | 2 +- app/javascript/dashboard/i18n/locale/de/login.json | 2 +- app/javascript/dashboard/i18n/locale/el/login.json | 2 +- app/javascript/dashboard/i18n/locale/el/signup.json | 2 +- app/javascript/dashboard/i18n/locale/es/login.json | 2 +- app/javascript/dashboard/i18n/locale/es/signup.json | 2 +- app/javascript/dashboard/i18n/locale/fa/login.json | 2 +- app/javascript/dashboard/i18n/locale/fa/signup.json | 2 +- app/javascript/dashboard/i18n/locale/fi/login.json | 2 +- app/javascript/dashboard/i18n/locale/fi/signup.json | 2 +- app/javascript/dashboard/i18n/locale/fr/login.json | 2 +- app/javascript/dashboard/i18n/locale/he/login.json | 2 +- app/javascript/dashboard/i18n/locale/hi/login.json | 2 +- app/javascript/dashboard/i18n/locale/hr/login.json | 2 +- app/javascript/dashboard/i18n/locale/hu/login.json | 2 +- app/javascript/dashboard/i18n/locale/hu/signup.json | 2 +- app/javascript/dashboard/i18n/locale/hy/login.json | 2 +- app/javascript/dashboard/i18n/locale/id/login.json | 2 +- app/javascript/dashboard/i18n/locale/is/login.json | 2 +- app/javascript/dashboard/i18n/locale/it/login.json | 2 +- app/javascript/dashboard/i18n/locale/ko/signup.json | 2 +- app/javascript/dashboard/i18n/locale/lt/login.json | 2 +- app/javascript/dashboard/i18n/locale/lv/login.json | 2 +- app/javascript/dashboard/i18n/locale/nl/login.json | 2 +- app/javascript/dashboard/i18n/locale/no/signup.json | 2 +- app/javascript/dashboard/i18n/locale/pl/login.json | 2 +- app/javascript/dashboard/i18n/locale/pt/login.json | 2 +- app/javascript/dashboard/i18n/locale/pt/signup.json | 2 +- app/javascript/dashboard/i18n/locale/pt_BR/login.json | 2 +- app/javascript/dashboard/i18n/locale/pt_BR/signup.json | 2 +- app/javascript/dashboard/i18n/locale/ro/login.json | 2 +- app/javascript/dashboard/i18n/locale/ru/login.json | 2 +- app/javascript/dashboard/i18n/locale/tr/login.json | 2 +- app/javascript/dashboard/i18n/locale/zh/login.json | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/javascript/dashboard/i18n/locale/ar/login.json b/app/javascript/dashboard/i18n/locale/ar/login.json index 41ce73b55..c3f5e439a 100644 --- a/app/javascript/dashboard/i18n/locale/ar/login.json +++ b/app/javascript/dashboard/i18n/locale/ar/login.json @@ -3,7 +3,7 @@ "TITLE": "تسجيل الدخول إلى Chatwoot", "EMAIL": { "LABEL": "البريد الإلكتروني", - "PLACEHOLDER": "مثلاً: someone@example.com", + "PLACEHOLDER": "مثلاً: someone{'@'}example.com", "ERROR": "الرجاء إدخال عنوان بريد إلكتروني صحيح" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/bg/login.json b/app/javascript/dashboard/i18n/locale/bg/login.json index ee3712235..4033c9485 100644 --- a/app/javascript/dashboard/i18n/locale/bg/login.json +++ b/app/javascript/dashboard/i18n/locale/bg/login.json @@ -3,7 +3,7 @@ "TITLE": "Login to Chatwoot", "EMAIL": { "LABEL": "Email", - "PLACEHOLDER": "Email eg: someone@example.com", + "PLACEHOLDER": "Email eg: someone{'@'}example.com", "ERROR": "Please enter a valid email address" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/ca/login.json b/app/javascript/dashboard/i18n/locale/ca/login.json index f7892513a..40350a079 100644 --- a/app/javascript/dashboard/i18n/locale/ca/login.json +++ b/app/javascript/dashboard/i18n/locale/ca/login.json @@ -3,7 +3,7 @@ "TITLE": "Entra a Chatwoot", "EMAIL": { "LABEL": "Correu electrònic", - "PLACEHOLDER": "exemple@nomdelacompanyia.com", + "PLACEHOLDER": "exemple{'@'}nomdelacompanyia.com", "ERROR": "Introduïu una adreça de correu electrònic vàlida" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/cs/login.json b/app/javascript/dashboard/i18n/locale/cs/login.json index f63d825ab..d303e2440 100644 --- a/app/javascript/dashboard/i18n/locale/cs/login.json +++ b/app/javascript/dashboard/i18n/locale/cs/login.json @@ -3,7 +3,7 @@ "TITLE": "Přihlásit se do Chatwoot", "EMAIL": { "LABEL": "E-mailová adresa", - "PLACEHOLDER": "E-mail např: někdo@example.com", + "PLACEHOLDER": "E-mail např: někdo{'@'}example.com", "ERROR": "Zadejte prosím platnou e-mailovou adresu" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/cs/signup.json b/app/javascript/dashboard/i18n/locale/cs/signup.json index f05140e49..c7738805b 100644 --- a/app/javascript/dashboard/i18n/locale/cs/signup.json +++ b/app/javascript/dashboard/i18n/locale/cs/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "Pracovní e-mail", - "PLACEHOLDER": "Zadejte svou pracovní e-mailovou adresu. např.: jan@novak.spolecnost", + "PLACEHOLDER": "Zadejte svou pracovní e-mailovou adresu. např.: jan{'@'}novak.spolecnost", "ERROR": "Please enter a valid work email address" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/da/login.json b/app/javascript/dashboard/i18n/locale/da/login.json index 3fb3a66d9..884bbb7c3 100644 --- a/app/javascript/dashboard/i18n/locale/da/login.json +++ b/app/javascript/dashboard/i18n/locale/da/login.json @@ -3,7 +3,7 @@ "TITLE": "Log ind på Chatwoot", "EMAIL": { "LABEL": "E-mail", - "PLACEHOLDER": "E-mail, fx: navn@eksempel.dk", + "PLACEHOLDER": "E-mail, fx: navn{'@'}eksempel.dk", "ERROR": "Indtast venligst en gyldig e-mailadresse" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/de/login.json b/app/javascript/dashboard/i18n/locale/de/login.json index 5131d3952..73713415f 100644 --- a/app/javascript/dashboard/i18n/locale/de/login.json +++ b/app/javascript/dashboard/i18n/locale/de/login.json @@ -3,7 +3,7 @@ "TITLE": "Melden Sie sich bei Chatwoot an", "EMAIL": { "LABEL": "E-Mail", - "PLACEHOLDER": "E-Mail zB: jemand@example.com", + "PLACEHOLDER": "E-Mail zB: jemand{'@'}example.com", "ERROR": "Bitte geben Sie eine gültige E-Mail-Adresse ein" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/el/login.json b/app/javascript/dashboard/i18n/locale/el/login.json index 14b74d076..d2f593904 100644 --- a/app/javascript/dashboard/i18n/locale/el/login.json +++ b/app/javascript/dashboard/i18n/locale/el/login.json @@ -3,7 +3,7 @@ "TITLE": "Είσοδος στο Chatwoot", "EMAIL": { "LABEL": "Email", - "PLACEHOLDER": "Email π.χ.: someone@example.com", + "PLACEHOLDER": "Email π.χ.: someone{'@'}example.com", "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/el/signup.json b/app/javascript/dashboard/i18n/locale/el/signup.json index c610bb125..13d098283 100644 --- a/app/javascript/dashboard/i18n/locale/el/signup.json +++ b/app/javascript/dashboard/i18n/locale/el/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "email εργασίας", - "PLACEHOLDER": "συμπληρώστε το email εργασίας πχ: papadopoulos@wyane.com", + "PLACEHOLDER": "συμπληρώστε το email εργασίας πχ: papadopoulos{'@'}wyane.com", "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/es/login.json b/app/javascript/dashboard/i18n/locale/es/login.json index d2ccdf7b4..4ddfbc81c 100644 --- a/app/javascript/dashboard/i18n/locale/es/login.json +++ b/app/javascript/dashboard/i18n/locale/es/login.json @@ -3,7 +3,7 @@ "TITLE": "Iniciar sesión en Chatwoot", "EMAIL": { "LABEL": "E-mail", - "PLACEHOLDER": "Email por ejemplo: alguien@ejemplo.com", + "PLACEHOLDER": "Email por ejemplo: alguien{'@'}ejemplo.com", "ERROR": "Por favor, introduzca una dirección de correo válida" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/es/signup.json b/app/javascript/dashboard/i18n/locale/es/signup.json index a50166b4c..d0e0d8c63 100644 --- a/app/javascript/dashboard/i18n/locale/es/signup.json +++ b/app/javascript/dashboard/i18n/locale/es/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "E-mail", - "PLACEHOLDER": "bruce@wayne.empresas", + "PLACEHOLDER": "bruce{'@'}wayne.empresas", "ERROR": "Por favor, introduzca una dirección de correo válida" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/fa/login.json b/app/javascript/dashboard/i18n/locale/fa/login.json index 70c05892c..23c4b139a 100644 --- a/app/javascript/dashboard/i18n/locale/fa/login.json +++ b/app/javascript/dashboard/i18n/locale/fa/login.json @@ -3,7 +3,7 @@ "TITLE": "ورود به چت ووت", "EMAIL": { "LABEL": "ایمیل", - "PLACEHOLDER": "ایمیل به عنوان مثال: someone@example.com", + "PLACEHOLDER": "ایمیل به عنوان مثال: someone{'@'}example.com", "ERROR": "لطفا ایمیل خود را به شکل صحیح وارد کنید" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/fa/signup.json b/app/javascript/dashboard/i18n/locale/fa/signup.json index fef19a0cb..9562eba62 100644 --- a/app/javascript/dashboard/i18n/locale/fa/signup.json +++ b/app/javascript/dashboard/i18n/locale/fa/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "ایمیل کاری", - "PLACEHOLDER": "ایمیل کاری خود را وارد کنید به عنوان مثال: jafari@wayne.enterprises", + "PLACEHOLDER": "ایمیل کاری خود را وارد کنید به عنوان مثال: jafari{'@'}wayne.enterprises", "ERROR": "لطفا یک آدرس ایمیل کاری معتبر وارد کنید" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/fi/login.json b/app/javascript/dashboard/i18n/locale/fi/login.json index 9bd376f64..ea7e7d652 100644 --- a/app/javascript/dashboard/i18n/locale/fi/login.json +++ b/app/javascript/dashboard/i18n/locale/fi/login.json @@ -3,7 +3,7 @@ "TITLE": "Kirjaudu sisään Chatwootiin", "EMAIL": { "LABEL": "Sähköposti", - "PLACEHOLDER": "Sähköposti, esim: someone@example.fi", + "PLACEHOLDER": "Sähköposti, esim: someone{'@'}example.fi", "ERROR": "Ole hyvä ja syötä validi sähköposti" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/fi/signup.json b/app/javascript/dashboard/i18n/locale/fi/signup.json index efd64c37f..2ea149339 100644 --- a/app/javascript/dashboard/i18n/locale/fi/signup.json +++ b/app/javascript/dashboard/i18n/locale/fi/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "Työsähköposti", - "PLACEHOLDER": "Anna työsähköpostiosoiteeesi, esim: ismo@hassisenkone.fi", + "PLACEHOLDER": "Anna työsähköpostiosoiteeesi, esim: ismo{'@'}hassisenkone.fi", "ERROR": "Syötä voimassa oleva työsähköpostiosoite." }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/fr/login.json b/app/javascript/dashboard/i18n/locale/fr/login.json index 12f19f933..0418dcf7d 100644 --- a/app/javascript/dashboard/i18n/locale/fr/login.json +++ b/app/javascript/dashboard/i18n/locale/fr/login.json @@ -3,7 +3,7 @@ "TITLE": "Se connecter à Chatwoot", "EMAIL": { "LABEL": "Courriel", - "PLACEHOLDER": "exemple@nomentreprise.fr", + "PLACEHOLDER": "exemple{'@'}nomentreprise.fr", "ERROR": "Veuillez saisir une adresse de courriel valide" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/he/login.json b/app/javascript/dashboard/i18n/locale/he/login.json index f183ab730..34acf14fb 100644 --- a/app/javascript/dashboard/i18n/locale/he/login.json +++ b/app/javascript/dashboard/i18n/locale/he/login.json @@ -3,7 +3,7 @@ "TITLE": "התחבר ל Woot", "EMAIL": { "LABEL": "אימייל", - "PLACEHOLDER": "מייל לדוגמא: someone@example.com", + "PLACEHOLDER": "מייל לדוגמא: someone{'@'}example.com", "ERROR": "נא הכנס כתובת דוא\"ל תקינה" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/hi/login.json b/app/javascript/dashboard/i18n/locale/hi/login.json index 941565463..63231cad1 100644 --- a/app/javascript/dashboard/i18n/locale/hi/login.json +++ b/app/javascript/dashboard/i18n/locale/hi/login.json @@ -3,7 +3,7 @@ "TITLE": "Login to Chatwoot", "EMAIL": { "LABEL": "Email", - "PLACEHOLDER": "Email eg: someone@example.com", + "PLACEHOLDER": "Email eg: someone{'@'}example.com", "ERROR": "Please enter a valid email address" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/hr/login.json b/app/javascript/dashboard/i18n/locale/hr/login.json index 941565463..63231cad1 100644 --- a/app/javascript/dashboard/i18n/locale/hr/login.json +++ b/app/javascript/dashboard/i18n/locale/hr/login.json @@ -3,7 +3,7 @@ "TITLE": "Login to Chatwoot", "EMAIL": { "LABEL": "Email", - "PLACEHOLDER": "Email eg: someone@example.com", + "PLACEHOLDER": "Email eg: someone{'@'}example.com", "ERROR": "Please enter a valid email address" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/hu/login.json b/app/javascript/dashboard/i18n/locale/hu/login.json index 3cae5f036..f34568609 100644 --- a/app/javascript/dashboard/i18n/locale/hu/login.json +++ b/app/javascript/dashboard/i18n/locale/hu/login.json @@ -3,7 +3,7 @@ "TITLE": "Chatwoot belépés", "EMAIL": { "LABEL": "E-mail", - "PLACEHOLDER": "E-mail pl.: valaki@példa.hu", + "PLACEHOLDER": "E-mail pl.: valaki{'@'}példa.hu", "ERROR": "Kérjük helyes e-mailcímet adj meg" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/hu/signup.json b/app/javascript/dashboard/i18n/locale/hu/signup.json index dbaa05dc3..f111d4370 100644 --- a/app/javascript/dashboard/i18n/locale/hu/signup.json +++ b/app/javascript/dashboard/i18n/locale/hu/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "Munkahelyi e-mail", - "PLACEHOLDER": "Add meg munkahelyi e-mailcímed. Pl. kovacs.janos@email.hu", + "PLACEHOLDER": "Add meg munkahelyi e-mailcímed. Pl. kovacs.janos{'@'}email.hu", "ERROR": "Please enter a valid work email address" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/hy/login.json b/app/javascript/dashboard/i18n/locale/hy/login.json index 941565463..63231cad1 100644 --- a/app/javascript/dashboard/i18n/locale/hy/login.json +++ b/app/javascript/dashboard/i18n/locale/hy/login.json @@ -3,7 +3,7 @@ "TITLE": "Login to Chatwoot", "EMAIL": { "LABEL": "Email", - "PLACEHOLDER": "Email eg: someone@example.com", + "PLACEHOLDER": "Email eg: someone{'@'}example.com", "ERROR": "Please enter a valid email address" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/id/login.json b/app/javascript/dashboard/i18n/locale/id/login.json index 32c45965e..fd0728017 100644 --- a/app/javascript/dashboard/i18n/locale/id/login.json +++ b/app/javascript/dashboard/i18n/locale/id/login.json @@ -3,7 +3,7 @@ "TITLE": "Masuk ke Chatwoot", "EMAIL": { "LABEL": "Email", - "PLACEHOLDER": "contoh@perusahan-mu.com", + "PLACEHOLDER": "contoh{'@'}perusahan-mu.com", "ERROR": "Harap masukkan alamat email yang valid" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/is/login.json b/app/javascript/dashboard/i18n/locale/is/login.json index f77dc09e1..7c9f4b810 100644 --- a/app/javascript/dashboard/i18n/locale/is/login.json +++ b/app/javascript/dashboard/i18n/locale/is/login.json @@ -3,7 +3,7 @@ "TITLE": "Login to Chatwoot", "EMAIL": { "LABEL": "Tölvupóstfang", - "PLACEHOLDER": "Tölvupóstfang t.d. someone@example.com", + "PLACEHOLDER": "Tölvupóstfang t.d. someone{'@'}example.com", "ERROR": "Vinsamlegast skrifaðu gilt netfang" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/it/login.json b/app/javascript/dashboard/i18n/locale/it/login.json index 8e7ed71a9..830c11e5a 100644 --- a/app/javascript/dashboard/i18n/locale/it/login.json +++ b/app/javascript/dashboard/i18n/locale/it/login.json @@ -3,7 +3,7 @@ "TITLE": "Accedi a Chatwoot", "EMAIL": { "LABEL": "Email", - "PLACEHOLDER": "Email es.: qualcuno@esempio.com", + "PLACEHOLDER": "Email es.: qualcuno{'@'}esempio.com", "ERROR": "Inserisci un indirizzo email valido" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/ko/signup.json b/app/javascript/dashboard/i18n/locale/ko/signup.json index e38ef41f6..fc0a9f772 100644 --- a/app/javascript/dashboard/i18n/locale/ko/signup.json +++ b/app/javascript/dashboard/i18n/locale/ko/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "회사 이메일", - "PLACEHOLDER": "회사 이메일 주소를 입력하세요. 예: taeyeon@girls.generation", + "PLACEHOLDER": "회사 이메일 주소를 입력하세요. 예: taeyeon{'@'}girls.generation", "ERROR": "Please enter a valid work email address" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/lt/login.json b/app/javascript/dashboard/i18n/locale/lt/login.json index 1f7555e05..53ded068f 100644 --- a/app/javascript/dashboard/i18n/locale/lt/login.json +++ b/app/javascript/dashboard/i18n/locale/lt/login.json @@ -3,7 +3,7 @@ "TITLE": "Login to Chatwoot", "EMAIL": { "LABEL": "El. paštas", - "PLACEHOLDER": "email pavyzdys: someone@example.com", + "PLACEHOLDER": "email pavyzdys: someone{'@'}example.com", "ERROR": "Prašau įveskite teisingą el. pašto adresą" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/lv/login.json b/app/javascript/dashboard/i18n/locale/lv/login.json index 0c3782de8..f8a89b168 100644 --- a/app/javascript/dashboard/i18n/locale/lv/login.json +++ b/app/javascript/dashboard/i18n/locale/lv/login.json @@ -3,7 +3,7 @@ "TITLE": "Login to Chatwoot", "EMAIL": { "LABEL": "E-pasts", - "PLACEHOLDER": "piemers@firmasnosaukums.com", + "PLACEHOLDER": "piemers{'@'}firmasnosaukums.com", "ERROR": "Lūdzu, ievadiet derīgu e-pasta adresi" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/nl/login.json b/app/javascript/dashboard/i18n/locale/nl/login.json index a545ee69d..17c5ebab7 100644 --- a/app/javascript/dashboard/i18n/locale/nl/login.json +++ b/app/javascript/dashboard/i18n/locale/nl/login.json @@ -3,7 +3,7 @@ "TITLE": "Inloggen bij Chatwoot", "EMAIL": { "LABEL": "E-mailadres", - "PLACEHOLDER": "voorbeeld@bedrijfsnaam.nl", + "PLACEHOLDER": "voorbeeld{'@'}bedrijfsnaam.nl", "ERROR": "Voer een geldig e-mailadres in" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/no/signup.json b/app/javascript/dashboard/i18n/locale/no/signup.json index 0028ddd43..c22de5723 100644 --- a/app/javascript/dashboard/i18n/locale/no/signup.json +++ b/app/javascript/dashboard/i18n/locale/no/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "Bedriftse-postadresse", - "PLACEHOLDER": "Skriv inn din profesjonelle e-postadresse. F.eks: ola@olasbedrift.no", + "PLACEHOLDER": "Skriv inn din profesjonelle e-postadresse. F.eks: ola{'@'}olasbedrift.no", "ERROR": "Please enter a valid work email address" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/pl/login.json b/app/javascript/dashboard/i18n/locale/pl/login.json index 008005d27..f2d7df949 100644 --- a/app/javascript/dashboard/i18n/locale/pl/login.json +++ b/app/javascript/dashboard/i18n/locale/pl/login.json @@ -3,7 +3,7 @@ "TITLE": "Zaloguj się do Chatwoot", "EMAIL": { "LABEL": "E-mail", - "PLACEHOLDER": "przyklad@nazwafirmy.com", + "PLACEHOLDER": "przyklad{'@'}nazwafirmy.com", "ERROR": "Wprowadź poprawny adres e-mail" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/pt/login.json b/app/javascript/dashboard/i18n/locale/pt/login.json index 637ae8678..61991c750 100644 --- a/app/javascript/dashboard/i18n/locale/pt/login.json +++ b/app/javascript/dashboard/i18n/locale/pt/login.json @@ -3,7 +3,7 @@ "TITLE": "Entrar no Chatwoot", "EMAIL": { "LABEL": "E-mail", - "PLACEHOLDER": "exemplo@nomedaempresa.pt", + "PLACEHOLDER": "exemplo{'@'}nomedaempresa.pt", "ERROR": "Por favor, insira um endereço de e-mail válido" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/pt/signup.json b/app/javascript/dashboard/i18n/locale/pt/signup.json index edaa8e4ba..257cb12a2 100644 --- a/app/javascript/dashboard/i18n/locale/pt/signup.json +++ b/app/javascript/dashboard/i18n/locale/pt/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "E-mail de trabalho", - "PLACEHOLDER": "Digite o seu endereço de e-mail profissional. Por exemplo: geral@informatico.pt", + "PLACEHOLDER": "Digite o seu endereço de e-mail profissional. Por exemplo: geral{'@'}informatico.pt", "ERROR": "Please enter a valid work email address" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/login.json b/app/javascript/dashboard/i18n/locale/pt_BR/login.json index 3222d0672..d4b9e2160 100644 --- a/app/javascript/dashboard/i18n/locale/pt_BR/login.json +++ b/app/javascript/dashboard/i18n/locale/pt_BR/login.json @@ -3,7 +3,7 @@ "TITLE": "Entrar no Chatwoot", "EMAIL": { "LABEL": "e-mail", - "PLACEHOLDER": "exemplo@empresa.com", + "PLACEHOLDER": "exemplo{'@'}empresa.com", "ERROR": "Digite um endereço de e-mail válido" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json index 36b7b83f2..c9912c070 100644 --- a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json +++ b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json @@ -20,7 +20,7 @@ }, "EMAIL": { "LABEL": "E-mail comercial", - "PLACEHOLDER": "Digite seu e-mail de trabalho. Ex.: bruce@wayne.com.br", + "PLACEHOLDER": "Digite seu e-mail de trabalho. Ex.: bruce{'@'}wayne.com.br", "ERROR": "Por favor, insira um endereço de e-mail de trabalho válido." }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/ro/login.json b/app/javascript/dashboard/i18n/locale/ro/login.json index 47a8ae093..8eb566e34 100644 --- a/app/javascript/dashboard/i18n/locale/ro/login.json +++ b/app/javascript/dashboard/i18n/locale/ro/login.json @@ -3,7 +3,7 @@ "TITLE": "Conectează-te la Chatwoot", "EMAIL": { "LABEL": "E-mail", - "PLACEHOLDER": "exemplu@companyname.com", + "PLACEHOLDER": "exemplu{'@'}companyname.com", "ERROR": "Vă rugăm să introduceți o adresă de e-mail validă" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/ru/login.json b/app/javascript/dashboard/i18n/locale/ru/login.json index 71197f416..78ee4b55b 100644 --- a/app/javascript/dashboard/i18n/locale/ru/login.json +++ b/app/javascript/dashboard/i18n/locale/ru/login.json @@ -3,7 +3,7 @@ "TITLE": "Войти в Chatwoot", "EMAIL": { "LABEL": "Email", - "PLACEHOLDER": "пример @companyname.com", + "PLACEHOLDER": "пример {'@'}companyname.com", "ERROR": "Пожалуйста, введите действительный адрес электронной почты" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/tr/login.json b/app/javascript/dashboard/i18n/locale/tr/login.json index 6f5eb0b41..a6e57369c 100644 --- a/app/javascript/dashboard/i18n/locale/tr/login.json +++ b/app/javascript/dashboard/i18n/locale/tr/login.json @@ -3,7 +3,7 @@ "TITLE": "Chatwoot'ta oturum açın", "EMAIL": { "LABEL": "E-Posta", - "PLACEHOLDER": "ornek@firmadi.com", + "PLACEHOLDER": "ornek{'@'}firmadi.com", "ERROR": "Lütfen geçerli bir e-posta adresi girin" }, "PASSWORD": { diff --git a/app/javascript/dashboard/i18n/locale/zh/login.json b/app/javascript/dashboard/i18n/locale/zh/login.json index fb64d8045..a3a90e359 100644 --- a/app/javascript/dashboard/i18n/locale/zh/login.json +++ b/app/javascript/dashboard/i18n/locale/zh/login.json @@ -3,7 +3,7 @@ "TITLE": "登录到Chatwoot", "EMAIL": { "LABEL": "Email", - "PLACEHOLDER": "电子邮址 例如：somone@example.com" + "PLACEHOLDER": "电子邮址 例如：somone{'@'}example.com" }, "PASSWORD": { "LABEL": "密码", From 5133f4e579882838a3af1ada04c322527086e13d Mon Sep 17 00:00:00 2001 From: Vishnu Narayanan Date: Tue, 22 Oct 2024 16:03:22 +0530 Subject: [PATCH 2/2] Bump version to 3.14.1 --- config/app.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/app.yml b/config/app.yml index e2943aab9..ee9eb613f 100644 --- a/config/app.yml +++ b/config/app.yml @@ -1,5 +1,5 @@ shared: &shared - version: '3.14.0' + version: '3.14.1' development: <<: *shared diff --git a/package.json b/package.json index c10ee9b79..554e7594d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@chatwoot/chatwoot", - "version": "3.14.0", + "version": "3.14.1", "license": "MIT", "scripts": { "eslint": "eslint app/**/*.{js,vue}",