From 067a8bcb21a5efe6ffcbfa4f1eafa865e6ca327e Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Tue, 3 Jan 2023 10:34:33 +0400 Subject: [PATCH] make the email token tooltip more informative Previously it said just "Token", but now it will provide more explicit instructions about copying and pasting the token received by email. Resolves #1339 --- .../apps/remark42/app/components/auth/auth.messsages.ts | 2 +- frontend/apps/remark42/app/components/auth/auth.spec.tsx | 8 ++++---- .../comment-form__subscribe-by-email.tsx | 2 +- frontend/apps/remark42/app/locales/ar.json | 2 +- frontend/apps/remark42/app/locales/be.json | 2 +- frontend/apps/remark42/app/locales/bg.json | 6 +++--- frontend/apps/remark42/app/locales/bp.json | 2 +- frontend/apps/remark42/app/locales/cs.json | 2 +- frontend/apps/remark42/app/locales/de.json | 2 +- frontend/apps/remark42/app/locales/en.json | 2 +- frontend/apps/remark42/app/locales/es.json | 2 +- frontend/apps/remark42/app/locales/fi.json | 2 +- frontend/apps/remark42/app/locales/fr.json | 2 +- frontend/apps/remark42/app/locales/it.json | 2 +- frontend/apps/remark42/app/locales/ja.json | 2 +- frontend/apps/remark42/app/locales/ko.json | 2 +- frontend/apps/remark42/app/locales/pl.json | 2 +- frontend/apps/remark42/app/locales/ru.json | 2 +- frontend/apps/remark42/app/locales/th.json | 2 +- frontend/apps/remark42/app/locales/tr.json | 6 +++--- frontend/apps/remark42/app/locales/ua.json | 2 +- frontend/apps/remark42/app/locales/vi.json | 2 +- frontend/apps/remark42/app/locales/zh-tw.json | 2 +- frontend/apps/remark42/app/locales/zh.json | 2 +- 24 files changed, 31 insertions(+), 31 deletions(-) diff --git a/frontend/apps/remark42/app/components/auth/auth.messsages.ts b/frontend/apps/remark42/app/components/auth/auth.messsages.ts index 261d040c..c990620c 100644 --- a/frontend/apps/remark42/app/components/auth/auth.messsages.ts +++ b/frontend/apps/remark42/app/components/auth/auth.messsages.ts @@ -27,7 +27,7 @@ export const messages = defineMessages({ }, token: { id: 'token', - defaultMessage: 'Token', + defaultMessage: 'Copy and paste the token from the email', }, expiredToken: { id: 'token.expired', diff --git a/frontend/apps/remark42/app/components/auth/auth.spec.tsx b/frontend/apps/remark42/app/components/auth/auth.spec.tsx index 0bfb905f..726ce4fe 100644 --- a/frontend/apps/remark42/app/components/auth/auth.spec.tsx +++ b/frontend/apps/remark42/app/components/auth/auth.spec.tsx @@ -158,9 +158,9 @@ describe('', () => { expect(screen.getByText('Back')).toHaveClass('auth-back-button'); expect(screen.getByTitle('Close sign-in dropdown')).toHaveClass('auth-close-button'); - expect(screen.getByPlaceholderText('Token')).toHaveClass('auth-token-textarea'); + expect(screen.getByPlaceholderText('Copy and paste the token from the email')).toHaveClass('auth-token-textarea'); - fireEvent.change(screen.getByPlaceholderText('Token'), { + fireEvent.change(screen.getByPlaceholderText('Copy and paste the token from the email'), { target: { value: 'token' }, }); @@ -187,9 +187,9 @@ describe('', () => { expect(getByText('Back')).toHaveClass('auth-back-button'); expect(getByTitle('Close sign-in dropdown')).toHaveClass('auth-close-button'); - expect(getByPlaceholderText('Token')).toHaveClass('auth-token-textarea'); + expect(getByPlaceholderText('Copy and paste the token from the email')).toHaveClass('auth-token-textarea'); - fireEvent.change(getByPlaceholderText('Token'), { target: { value: 'token' } }); + fireEvent.change(getByPlaceholderText('Copy and paste the token from the email'), { target: { value: 'token' } }); fireEvent.click(getByText('Submit')); await waitFor(() => expect(utils.getTokenInvalidReason).toBeCalled()); diff --git a/frontend/apps/remark42/app/components/comment-form/__subscribe-by-email/comment-form__subscribe-by-email.tsx b/frontend/apps/remark42/app/components/comment-form/__subscribe-by-email/comment-form__subscribe-by-email.tsx index 005d2666..49dc1792 100644 --- a/frontend/apps/remark42/app/components/comment-form/__subscribe-by-email/comment-form__subscribe-by-email.tsx +++ b/frontend/apps/remark42/app/components/comment-form/__subscribe-by-email/comment-form__subscribe-by-email.tsx @@ -35,7 +35,7 @@ enum Step { const messages = defineMessages({ token: { id: 'token', - defaultMessage: 'Token', + defaultMessage: 'Copy and paste the token from the email', }, expiredToken: { id: 'token.expired', diff --git a/frontend/apps/remark42/app/locales/ar.json b/frontend/apps/remark42/app/locales/ar.json index 3edfd31a..e317577f 100644 --- a/frontend/apps/remark42/app/locales/ar.json +++ b/frontend/apps/remark42/app/locales/ar.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "الموقع", "subscribeByRSS.thread": "سلسلة ردود", "subscribeByRSS.title": "RSS", - "token": "رمز", + "token": "انسخ والصق الرمز المميز من البريد الإلكتروني", "token.expired": "الرمز انتهت صلاحيته", "token.invalid": "الرمز غير صالح", "toolbar.attach-image": "أرفق صورةً، أو اسحبها وأسقطها، أو الصقها من الحافظة", diff --git a/frontend/apps/remark42/app/locales/be.json b/frontend/apps/remark42/app/locales/be.json index 0db062fa..988bb839 100644 --- a/frontend/apps/remark42/app/locales/be.json +++ b/frontend/apps/remark42/app/locales/be.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Сайт", "subscribeByRSS.thread": "Гутарка", "subscribeByRSS.title": "RSS", - "token": "Токен", + "token": "Скапіруйце і ўстаўце токен з электроннага ліста", "token.expired": "Час дзеяння токена сышоў", "token.invalid": "Токен несапраўдны", "toolbar.attach-image": "Прымацаваць выяву, перацягніце або ўстаўце выяву з буфера абмену", diff --git a/frontend/apps/remark42/app/locales/bg.json b/frontend/apps/remark42/app/locales/bg.json index dd494804..d6a33ba9 100644 --- a/frontend/apps/remark42/app/locales/bg.json +++ b/frontend/apps/remark42/app/locales/bg.json @@ -152,9 +152,9 @@ "subscribeByRSS.site": "Сайт", "subscribeByRSS.thread": "Нишка", "subscribeByRSS.title": "RSS", - "token": "Жетон", - "token.expired": "Изтекъл жетон", - "token.invalid": "Token is invalid", + "token": "Копирайте и поставете токена от имейла", + "token.expired": "Изтекъл токен", + "token.invalid": "Токенът е невалиден", "toolbar.attach-image": "Добави картина, премести или копирай от клипборда", "toolbar.bold": "Добави удебелен текст {shortcut}", "toolbar.code": "Вмъкни код", diff --git a/frontend/apps/remark42/app/locales/bp.json b/frontend/apps/remark42/app/locales/bp.json index 0d388107..bbb48fdf 100644 --- a/frontend/apps/remark42/app/locales/bp.json +++ b/frontend/apps/remark42/app/locales/bp.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Site", "subscribeByRSS.thread": "Tópico", "subscribeByRSS.title": "RSS", - "token": "Token", + "token": "Copiar e colar a ficha do e-mail", "token.expired": "O token expirou", "token.invalid": "Token inválido", "toolbar.attach-image": "Anexe a imagem, arraste e solte ou cole da área de transferência", diff --git a/frontend/apps/remark42/app/locales/cs.json b/frontend/apps/remark42/app/locales/cs.json index 9881334c..dc0075c0 100644 --- a/frontend/apps/remark42/app/locales/cs.json +++ b/frontend/apps/remark42/app/locales/cs.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Web", "subscribeByRSS.thread": "Vlákno", "subscribeByRSS.title": "RSS", - "token": "Token", + "token": "Zkopírujte a vložte token z e-mailu", "token.expired": "Token expiroval", "token.invalid": "Token je neplatný", "toolbar.attach-image": "Obrázek", diff --git a/frontend/apps/remark42/app/locales/de.json b/frontend/apps/remark42/app/locales/de.json index 0a0d46ce..9ab18f76 100644 --- a/frontend/apps/remark42/app/locales/de.json +++ b/frontend/apps/remark42/app/locales/de.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Site", "subscribeByRSS.thread": "Thread", "subscribeByRSS.title": "RSS-Feed", - "token": "Token", + "token": "Kopieren und Einfügen des Tokens aus der E-Mail", "token.expired": "Token ist abgelaufen", "token.invalid": "Token ist ungültig", "toolbar.attach-image": "Bild als Anhang, per Drag & Drop oder aus der Zwischenablage einfügen", diff --git a/frontend/apps/remark42/app/locales/en.json b/frontend/apps/remark42/app/locales/en.json index 67430c98..0a8e0fe5 100644 --- a/frontend/apps/remark42/app/locales/en.json +++ b/frontend/apps/remark42/app/locales/en.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Site", "subscribeByRSS.thread": "Thread", "subscribeByRSS.title": "RSS", - "token": "Token", + "token": "Copy and paste the token from the email", "token.expired": "Token is expired", "token.invalid": "Token is invalid", "toolbar.attach-image": "Attach the image, drag & drop or paste from clipboard", diff --git a/frontend/apps/remark42/app/locales/es.json b/frontend/apps/remark42/app/locales/es.json index b68f2281..56d05487 100644 --- a/frontend/apps/remark42/app/locales/es.json +++ b/frontend/apps/remark42/app/locales/es.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Sitio", "subscribeByRSS.thread": "Hilo", "subscribeByRSS.title": "RSS", - "token": "Token", + "token": "Kopeeri ja kleebi sümbol e-kirjast.", "token.expired": "Token expirado", "token.invalid": "El token no es válido", "toolbar.attach-image": "Adjunta la imágen, arrastra y suelta, o pega desde el portapapeles", diff --git a/frontend/apps/remark42/app/locales/fi.json b/frontend/apps/remark42/app/locales/fi.json index 6cd3a87b..0212cf4d 100644 --- a/frontend/apps/remark42/app/locales/fi.json +++ b/frontend/apps/remark42/app/locales/fi.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Sivusto", "subscribeByRSS.thread": "Teema", "subscribeByRSS.title": "RSS", - "token": "Tunnus", + "token": "Kopioi ja liitä tunniste sähköpostista", "token.expired": "Tunnus on vanhentunut", "token.invalid": "Token is invalid", "toolbar.attach-image": "Liitä kuva, vedä ja pudota tai liitä leikepöydältä", diff --git a/frontend/apps/remark42/app/locales/fr.json b/frontend/apps/remark42/app/locales/fr.json index 58c38436..a1ea3c9a 100644 --- a/frontend/apps/remark42/app/locales/fr.json +++ b/frontend/apps/remark42/app/locales/fr.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Site", "subscribeByRSS.thread": "Fil d'actualités", "subscribeByRSS.title": "RSS", - "token": "Jeton", + "token": "Copiez et collez le jeton de l'e-mail", "token.expired": "Le jeton a expiré", "token.invalid": "Le jeton n'est pas valide", "toolbar.attach-image": "Joindre une image, la glisser-déposer ou la coller à partir du presse-papier", diff --git a/frontend/apps/remark42/app/locales/it.json b/frontend/apps/remark42/app/locales/it.json index 628cab3d..aaf55d42 100644 --- a/frontend/apps/remark42/app/locales/it.json +++ b/frontend/apps/remark42/app/locales/it.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Sito", "subscribeByRSS.thread": "Argomento", "subscribeByRSS.title": "RSS", - "token": "Token", + "token": "Copiare e incollare il token dall'e-mail", "token.expired": "Il token è scaduto", "token.invalid": "Il token non è valido", "toolbar.attach-image": "Allega immagini, trascina o incolla qui", diff --git a/frontend/apps/remark42/app/locales/ja.json b/frontend/apps/remark42/app/locales/ja.json index d0de42b4..68e2e8bc 100644 --- a/frontend/apps/remark42/app/locales/ja.json +++ b/frontend/apps/remark42/app/locales/ja.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "サイト", "subscribeByRSS.thread": "スレッド", "subscribeByRSS.title": "RSS", - "token": "トークン", + "token": "メールに記載されているトークンをコピー＆ペーストしてください。", "token.expired": "トークンの有効期限が切れています", "token.invalid": "トークンが無効です", "toolbar.attach-image": "画像を添付、ドラッグアンドドロップ、またはクリップボードから貼り付けてください", diff --git a/frontend/apps/remark42/app/locales/ko.json b/frontend/apps/remark42/app/locales/ko.json index 29d84fb5..a73b2d5c 100644 --- a/frontend/apps/remark42/app/locales/ko.json +++ b/frontend/apps/remark42/app/locales/ko.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "사이트", "subscribeByRSS.thread": "스레드", "subscribeByRSS.title": "RSS", - "token": "토큰", + "token": "이메일에서 토큰 복사 및 붙여넣기", "token.expired": "토큰이 만료되었습니다", "token.invalid": "토큰이 유효하지 않습니다", "toolbar.attach-image": "이미지를 첨부하거나 드래그앤드롭하거나 클립보드에서 붙여넣으세요", diff --git a/frontend/apps/remark42/app/locales/pl.json b/frontend/apps/remark42/app/locales/pl.json index cffbbdae..09b584df 100644 --- a/frontend/apps/remark42/app/locales/pl.json +++ b/frontend/apps/remark42/app/locales/pl.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Strona", "subscribeByRSS.thread": "Wątek", "subscribeByRSS.title": "RSS", - "token": "Token", + "token": "Skopiuj i wklej token z wiadomości e-mail", "token.expired": "Wygasły token", "token.invalid": "Token jest nieprawidłowy.", "toolbar.attach-image": "Załącz zdjęcie, przeciągnij i upuść lub wklej ze schowka", diff --git a/frontend/apps/remark42/app/locales/ru.json b/frontend/apps/remark42/app/locales/ru.json index 44966f96..c4678a64 100644 --- a/frontend/apps/remark42/app/locales/ru.json +++ b/frontend/apps/remark42/app/locales/ru.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Сайт", "subscribeByRSS.thread": "Ветка", "subscribeByRSS.title": "RSS", - "token": "Токен", + "token": "Скопируйте и вставьте токен из электронного письма", "token.expired": "Время действия токена истекло", "token.invalid": "Токен недействителен", "toolbar.attach-image": "Прикрепить изображение, перетащить или вставить изображение из буфера обмена", diff --git a/frontend/apps/remark42/app/locales/th.json b/frontend/apps/remark42/app/locales/th.json index 3b943258..f8453bdb 100644 --- a/frontend/apps/remark42/app/locales/th.json +++ b/frontend/apps/remark42/app/locales/th.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "เว็บไซต์", "subscribeByRSS.thread": "เทรด", "subscribeByRSS.title": "RSS", - "token": "โทเค็น", + "token": "คัดลอกและวางโทเค็นจากอีเมล", "token.expired": "โทเค็นหมดอายุ", "token.invalid": "โทเค็นไม่ถูกต้อง", "toolbar.attach-image": "แนบรูปภาพ หรือลากและวาง", diff --git a/frontend/apps/remark42/app/locales/tr.json b/frontend/apps/remark42/app/locales/tr.json index 9029f1d1..095b9315 100644 --- a/frontend/apps/remark42/app/locales/tr.json +++ b/frontend/apps/remark42/app/locales/tr.json @@ -152,9 +152,9 @@ "subscribeByRSS.site": "Site", "subscribeByRSS.thread": "Başlık", "subscribeByRSS.title": "RSS", - "token": "Parola", - "token.expired": "Eski parola", - "token.invalid": "Geçersiz parola", + "token": "E-postadaki belirteci kopyalayıp yapıştırın", + "token.expired": "Belirtecin süresi doldu", + "token.invalid": "Belirteç geçersiz", "toolbar.attach-image": "Resim ekleyin, sürükleyip-bıraın veya kopyaladığınız resmi yapıştırın", "toolbar.bold": "Kalın yazı ekle {shortcut}", "toolbar.code": "Kod ekle", diff --git a/frontend/apps/remark42/app/locales/ua.json b/frontend/apps/remark42/app/locales/ua.json index 40e4833c..2caff945 100644 --- a/frontend/apps/remark42/app/locales/ua.json +++ b/frontend/apps/remark42/app/locales/ua.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Сайт", "subscribeByRSS.thread": "Гілка", "subscribeByRSS.title": "RSS", - "token": "Токен", + "token": "Скопіюйте та вставте токен з листа", "token.expired": "Час дії токена минув", "token.invalid": "Токен недійсний", "toolbar.attach-image": "Прикріпити зображення, перетягніть або вставте зображення з буфера обміну", diff --git a/frontend/apps/remark42/app/locales/vi.json b/frontend/apps/remark42/app/locales/vi.json index 2f7625ed..55e89550 100644 --- a/frontend/apps/remark42/app/locales/vi.json +++ b/frontend/apps/remark42/app/locales/vi.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "Trang", "subscribeByRSS.thread": "Chủ đề", "subscribeByRSS.title": "RSS", - "token": "Token", + "token": "Sao chép và dán token từ email", "token.expired": "token đã hết hạn", "token.invalid": "Token không hợp lệ", "toolbar.attach-image": "Đính kèm hình ảnh, kéo và thả hoặc dán từ khay nhớ tạm", diff --git a/frontend/apps/remark42/app/locales/zh-tw.json b/frontend/apps/remark42/app/locales/zh-tw.json index 3cea6070..fff002ee 100644 --- a/frontend/apps/remark42/app/locales/zh-tw.json +++ b/frontend/apps/remark42/app/locales/zh-tw.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "網站", "subscribeByRSS.thread": "Thread", "subscribeByRSS.title": "RSS", - "token": "Token", + "token": "從電子郵件中復制並粘貼 token", "token.expired": "Token 已過期", "token.invalid": "無效的 Token", "toolbar.attach-image": "透過托放或從剪貼簿貼上來添加圖片。", diff --git a/frontend/apps/remark42/app/locales/zh.json b/frontend/apps/remark42/app/locales/zh.json index f5b294bc..2ce06415 100644 --- a/frontend/apps/remark42/app/locales/zh.json +++ b/frontend/apps/remark42/app/locales/zh.json @@ -152,7 +152,7 @@ "subscribeByRSS.site": "网站", "subscribeByRSS.thread": "会话", "subscribeByRSS.title": "RSS", - "token": "令牌", + "token": "复制并粘贴电子邮件中的令牌", "token.expired": "令牌已经过期", "token.invalid": "令牌无效", "toolbar.attach-image": "附加、拖放或从剪贴板粘贴图片",