Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the email token tooltip more informative #1557

Merged
merged 1 commit into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const messages = defineMessages<string>({
},
token: {
id: 'token',
defaultMessage: 'Token',
defaultMessage: 'Copy and paste the token from the email',
},
expiredToken: {
id: 'token.expired',
Expand Down
8 changes: 4 additions & 4 deletions frontend/apps/remark42/app/components/auth/auth.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ describe('<Auth/>', () => {

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' },
});

Expand All @@ -187,9 +187,9 @@ describe('<Auth/>', () => {

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());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"subscribeByRSS.site": "الموقع",
"subscribeByRSS.thread": "سلسلة ردود",
"subscribeByRSS.title": "RSS",
"token": "رمز",
"token": "انسخ والصق الرمز المميز من البريد الإلكتروني",
"token.expired": "الرمز انتهت صلاحيته",
"token.invalid": "الرمز غير صالح",
"toolbar.attach-image": "أرفق صورةً، أو اسحبها وأسقطها، أو الصقها من الحافظة",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"subscribeByRSS.site": "Сайт",
"subscribeByRSS.thread": "Гутарка",
"subscribeByRSS.title": "RSS",
"token": "Токен",
"token": "Скапіруйце і ўстаўце токен з электроннага ліста",
"token.expired": "Час дзеяння токена сышоў",
"token.invalid": "Токен несапраўдны",
"toolbar.attach-image": "Прымацаваць выяву, перацягніце або ўстаўце выяву з буфера абмену",
Expand Down
6 changes: 3 additions & 3 deletions frontend/apps/remark42/app/locales/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "Вмъкни код",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/bp.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -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ä",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"subscribeByRSS.site": "サイト",
"subscribeByRSS.thread": "スレッド",
"subscribeByRSS.title": "RSS",
"token": "トークン",
"token": "メールに記載されているトークンをコピー&ペーストしてください。",
"token.expired": "トークンの有効期限が切れています",
"token.invalid": "トークンが無効です",
"toolbar.attach-image": "画像を添付、ドラッグアンドドロップ、またはクリップボードから貼り付けてください",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"subscribeByRSS.site": "사이트",
"subscribeByRSS.thread": "스레드",
"subscribeByRSS.title": "RSS",
"token": "토큰",
"token": "이메일에서 토큰 복사 및 붙여넣기",
"token.expired": "토큰이 만료되었습니다",
"token.invalid": "토큰이 유효하지 않습니다",
"toolbar.attach-image": "이미지를 첨부하거나 드래그앤드롭하거나 클립보드에서 붙여넣으세요",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"subscribeByRSS.site": "Сайт",
"subscribeByRSS.thread": "Ветка",
"subscribeByRSS.title": "RSS",
"token": "Токен",
"token": "Скопируйте и вставьте токен из электронного письма",
"token.expired": "Время действия токена истекло",
"token.invalid": "Токен недействителен",
"toolbar.attach-image": "Прикрепить изображение, перетащить или вставить изображение из буфера обмена",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/th.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"subscribeByRSS.site": "เว็บไซต์",
"subscribeByRSS.thread": "เทรด",
"subscribeByRSS.title": "RSS",
"token": "โทเค็น",
"token": "คัดลอกและวางโทเค็นจากอีเมล",
"token.expired": "โทเค็นหมดอายุ",
"token.invalid": "โทเค็นไม่ถูกต้อง",
"toolbar.attach-image": "แนบรูปภาพ หรือลากและวาง",
Expand Down
6 changes: 3 additions & 3 deletions frontend/apps/remark42/app/locales/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/ua.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"subscribeByRSS.site": "Сайт",
"subscribeByRSS.thread": "Гілка",
"subscribeByRSS.title": "RSS",
"token": "Токен",
"token": "Скопіюйте та вставте токен з листа",
"token.expired": "Час дії токена минув",
"token.invalid": "Токен недійсний",
"toolbar.attach-image": "Прикріпити зображення, перетягніть або вставте зображення з буфера обміну",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "透過托放或從剪貼簿貼上來添加圖片。",
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/remark42/app/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"subscribeByRSS.site": "网站",
"subscribeByRSS.thread": "会话",
"subscribeByRSS.title": "RSS",
"token": "令牌",
"token": "复制并粘贴电子邮件中的令牌",
"token.expired": "令牌已经过期",
"token.invalid": "令牌无效",
"toolbar.attach-image": "附加、拖放或从剪贴板粘贴图片",
Expand Down