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

feat: [Magic Link Login] add placeholder to invalidEmail to return user email. #1145

Merged
merged 31 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ce32ec7
add email to translation
warcooft Jul 17, 2024
9df5b50
update lang[id] add placheholder for email
warcooft Jul 17, 2024
50591b5
update lang[en] add placheholder for email
warcooft Jul 17, 2024
09a27a8
update test
warcooft Jul 18, 2024
1a76a6c
missing comma
warcooft Jul 18, 2024
829a327
lang: add temp lang
warcooft Jul 18, 2024
9889424
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
55b3475
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
6e76788
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
0711286
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
fa0416b
lang: add temp lang
warcooft Jul 18, 2024
a6f196b
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
2c59425
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
6080c95
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
cc5fb61
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
d4fa7dd
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
758cb25
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
2734645
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
b952676
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
6f7e9eb
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
ece0a3b
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
0f7a6ee
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
795eda0
'invalidEmail' => '(To be translated) Unable to verify the e…
warcooft Jul 18, 2024
20b7105
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
ba9ee48
lang: add temp lang [invalidEmail]
warcooft Jul 18, 2024
1829443
Escaping content for prevention of XSS attacks.
warcooft Jul 18, 2024
93d6177
add double quotes
warcooft Jul 19, 2024
b01d858
add double quotes
warcooft Jul 20, 2024
c80a6cc
escape errors content
warcooft Jul 20, 2024
1f4e260
add double quotation marks for all language.
warcooft Jul 22, 2024
a15e3fb
update all language.
warcooft Jul 23, 2024
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
2 changes: 1 addition & 1 deletion src/Controllers/MagicLinkController.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function loginAction()
$user = $this->provider->findByCredentials(['email' => $email]);

if ($user === null) {
return redirect()->route('magic-link')->with('error', lang('Auth.invalidEmail'));
return redirect()->route('magic-link')->with('error', lang('Auth.invalidEmail', [$email]));
warcooft marked this conversation as resolved.
Show resolved Hide resolved
}

/** @var UserIdentityModel $identityModel */
Expand Down
2 changes: 1 addition & 1 deletion src/Language/ar/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'رمز الوصول (Token) غير صالح.',
'oldToken' => 'انتهت صلاحية رمز الوصول.',
'noUserEntity' => 'يجب توفير كيان المستخدم للتحقق من صحة كلمة المرور.',
'invalidEmail' => 'تعذر التحقق من تطابق عنوان البريد الإلكتروني مع البريد الإلكتروني المسجل.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'عذرا ، كانت هناك مشكلة في إرسال البريد الإلكتروني. لم نتمكن من إرسال بريد إلكتروني إلى "{0}".',
'throttled' => 'تم إجراء العديد من الطلبات من عنوان IP هذا. يمكنك المحاولة مرة أخرى في غضون {0} ثانية.',
'notEnoughPrivilege' => 'ليس لديك الإذن اللازم لإجراء العملية المطلوبة.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/bg/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Токенът за достъп не е валиден.',
'oldToken' => 'Токенът за достъп е изтекъл.',
'noUserEntity' => 'Потребителското съдържание трябва да бъде предоставено за потвърждение на паролата.',
'invalidEmail' => 'Не може да се потвърди, че имейл адресът съвпада с имейл адреса от записа.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Съжаляваме, имаше проблем с изпращането на имейла. Не можем да изпратим имейл до "{0}".',
'throttled' => 'Твърде много заявки са направени от този IP адрес. Може да опитате отново след {0} секунди.',
'notEnoughPrivilege' => 'Нямате необходимите права за изпълнение на желаната операция.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/cs/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Přístupový token je neplatný.',
'oldToken' => 'Přístupový token je neplatný (vypršel).',
'noUserEntity' => 'Pro ověření hesla je třeba zadat uživatele.',
'invalidEmail' => 'Není možné ověřit, zda e-mailová adresa odpovídá záznamu.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Omlouváme se, došlo k problému s odesláním e-mailu. E-mail se nám nepodařilo odeslat na adresu "{0}".',
'throttled' => 'Z této IP adresy bylo odesláno příliš mnoho požadavků. Můžete to zkusit znovu za {0} sekund.',
'notEnoughPrivilege' => 'Nemáte potřebné oprávnění k provedení požadované operace.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/de/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Das Zugriffstoken ist ungültig.',
'oldToken' => 'Das Zugriffstoken ist abgelaufen.',
'noUserEntity' => 'Die Benutzerentität muss für die Passwortüberprüfung angegeben werden.',
'invalidEmail' => 'Es konnte nicht überprüft werden, ob die E-Mail-Adresse mit der gespeicherten übereinstimmt.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Leider gab es ein Problem beim Senden der E-Mail. Wir konnten keine E-Mail an "{0}" senden.',
'throttled' => 'Es wurden zu viele Anfragen von dieser IP-Adresse gestellt. Sie können es in {0} Sekunden erneut versuchen.',
'notEnoughPrivilege' => 'Sie haben nicht die erforderliche Berechtigung, um den gewünschten Vorgang auszuführen.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/en/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'The access token is invalid.',
'oldToken' => 'The access token has expired.',
'noUserEntity' => 'User Entity must be provided for password validation.',
'invalidEmail' => 'Unable to verify the email address matches the email on record.',
'invalidEmail' => 'Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Sorry, there was a problem sending the email. We could not send an email to "{0}".',
'throttled' => 'Too many requests made from this IP address. You may try again in {0} seconds.',
'notEnoughPrivilege' => 'You do not have the necessary permission to perform the desired operation.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/es/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'El token de acceso no es válido.',
'oldToken' => 'El token de acceso ha caducado.',
'noUserEntity' => 'Se debe proporcionar una entidad de usuario para la validación de contraseña.',
'invalidEmail' => 'No se puede verificar que la dirección de correo electrónico coincida con la registrada.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Lo siento, hubo un problema al enviar el correo electrónico. No pudimos enviar un correo electrónico a "{0}".',
'throttled' => 'Se han realizado demasiadas solicitudes desde esta dirección IP. Puedes intentarlo de nuevo en {0} segundos.',
'notEnoughPrivilege' => 'No tienes los permisos necesarios para realizar la operación deseada.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/fa/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'توکن دسترسی معتبر نمی باشد.',
'oldToken' => 'توکن دسترسی منقضی شده است.',
'noUserEntity' => 'برای اعتبار سنجی هویت کاربر بایستی رمز عبور ارائه شود',
'invalidEmail' => 'امکان تایید ایمیلی که با آدرس ایمیل ثبت شده یکسان نیست، وجود ندارد.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'متاسفانه, در ارسال ایمیل مشکلی پیش آمد. ما نتوانستیم ایمیلی را به "{0}" ارسال کنیم.',
'throttled' => 'درخواست های بسیار زیادی از این آدرس IP انجام شده است. می توانید بعد از {0} ثانیه دوباره امتحان کنید.',
'notEnoughPrivilege' => 'شما مجوز لازم برای انجام عملیات مورد نظر را ندارید.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/fr/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Le jeton d\'accès est invalide.',
'oldToken' => 'Le jeton d\'accès a expiré.',
'noUserEntity' => 'User Entity doit être fournie pour la validation du mot de passe.',
'invalidEmail' => 'Impossible de vérifier que l\'adresse email existe.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Désolé, il y a eu un problème lors de l\'envoi de l\'email. Nous ne pouvons pas envoyer un email à "{0}".',
'throttled' => 'Trop de requêtes faites depuis cette adresse IP. Vous pouvez réessayer dans {0} secondes.',
'notEnoughPrivilege' => 'Vous n\'avez pas l\'autorisation nécessaire pour effectuer l\'opération souhaitée.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/id/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Akses token tidak sah.',
'oldToken' => 'Akses token sudah tidak berlaku.',
'noUserEntity' => 'Entitas Pengguna harus disediakan untuk validasi kata sandi.',
'invalidEmail' => 'Tidak dapat memverifikasi alamat email yang cocok dengan email yang tercatat.',
'invalidEmail' => 'Tidak dapat memverifikasi alamat email yang cocok dengan email "{0}".',
'unableSendEmailToUser' => 'Maaf, ada masalah saat mengirim email. Kami tidak dapat mengirim email ke "{0}".',
'throttled' => 'Terlalu banyak permintaan yang dibuat dari alamat IP ini. Anda dapat mencoba lagi dalam {0} detik.',
'notEnoughPrivilege' => 'Anda tidak memiliki izin yang diperlukan untuk melakukan operasi yang diinginkan.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/it/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Il token di accesso non è valido.',
'oldToken' => 'Il token di accesso è scaduto.',
'noUserEntity' => 'Deve essere fornita una User Entity per la validazione della password.',
'invalidEmail' => 'Impossibile verificare che l\'indirizzo email corrisponda all\'email nel record.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Spiacente, c\'è stato un problema inviando l\'email. Non possiamo inviare un\'email a "{0}".',
'throttled' => 'Troppe richieste effettuate da questo indirizzo IP. Potrai riprovare tra {0} secondi.',
'notEnoughPrivilege' => 'Non si dispone dell\'autorizzazione necessaria per eseguire l\'operazione desiderata.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/ja/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'アクセストークンが無効です。', // 'The access token is invalid.'
'oldToken' => 'アクセストークンの有効期限が切れています。', // 'The access token has expired.'
'noUserEntity' => 'パスワード検証のため、Userエンティティを指定する必要があります。', // 'User Entity must be provided for password validation.'
'invalidEmail' => 'メールアドレスが一致しません。', // 'Unable to verify the email address matches the email on record.'
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".', // 'Unable to verify the email address matches the email {0}.'
'unableSendEmailToUser' => '申し訳ありませんが、メールの送信に問題がありました。 "{0}"にメールを送信できませんでした。', // 'Sorry, there was a problem sending the email. We could not send an email to "{0}".'
'throttled' => 'このIPアドレスからのリクエストが多すぎます。 {0}秒後に再試行できます。', // 'Too many requests made from this IP address. You may try again in {0} seconds.'
'notEnoughPrivilege' => '目的の操作を実行するために必要な権限がありません。', // 'You do not have the necessary permission to perform the desired operation.'
Expand Down
2 changes: 1 addition & 1 deletion src/Language/lt/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Prieigos raktas neteisingas.',
'oldToken' => 'Prieigos raktas nebegalioja.',
'noUserEntity' => 'Slaptažodžio patikrinimui turi būti pateiktas vartotojo subjektas.',
'invalidEmail' => 'Neišeina patvirtinti, kad pateiktas el. pašto adresas atitinka turimą el. pašto įrašą.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Deja, nepavyko išsiųsti el. laiško. Nepavyko išsiųsti laiško adresu "{0}".',
'throttled' => 'Per daug užklausų iš šio IP adreso. Galite pamėginti iš naujo po {0} sekundžių.',
'notEnoughPrivilege' => 'Neturite operacijai atlikti užtektinų leidimų.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/nl/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Ongeldige toegangstoken.',
'oldToken' => 'Vervallen toegangstoken.',
'noUserEntity' => 'Gebruikersentiteit moet worden opgegeven voor wachtwoordvalidatie.',
'invalidEmail' => 'We kunnen geen gebruiker vinden met dat e-mailadres.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Sorry, er is een probleem opgetreden bij het verzenden van de e-mail. We konden geen e-mail versturen naar "{0}".',
'throttled' => 'Te veel inlogpogingen van dit IP adres. Probeer het over {0} seconden opnieuw.',
'notEnoughPrivilege' => 'U hebt niet de nodige rechten om de gewenste bewerking uit te voeren.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/pl/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Token dostępu jest nieprawidłowy.',
'oldToken' => 'Token dostępu wygasł.',
'noUserEntity' => 'User Entity jest niezbędne do sprawdzania poprawności hasła.',
'invalidEmail' => 'Nie można zweryfikować zgodności adresu e-mail z zarejestrowanym adresem e-mail.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Przepraszamy, był problem z wysłaniem wiadomości e-mail. Nie mogliśmy wysłać wiadomości e-mail do "{0}".',
'throttled' => 'Zbyt wiele żądań z tego adresu IP. Możesz spróbować ponownie za {0} sekund.',
'notEnoughPrivilege' => 'Nie masz uprawnień niezbędnych do wykonania żądanej operacji.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/pt-BR/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'O token de acesso é inválido.',
'oldToken' => 'O token de acesso expirou.',
'noUserEntity' => 'A entidade de usuário deve ser fornecida para validação de senha.',
'invalidEmail' => 'Não foi possível verificar se o endereço de email corresponde ao e-mail registrado.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Desculpe, houve um problema ao enviar o email. Não pudemos enviar um email para {0}.',
'throttled' => 'Muitas solicitações feitas a partir deste endereço IP. Você pode tentar novamente em {0} segundos.',
'notEnoughPrivilege' => 'Você não tem a permissão necessária para realizar a operação desejada.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/pt/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'O token de acesso é inválido.',
'oldToken' => 'O token de acesso expirou.',
'noUserEntity' => 'A entidade do utilizador deve ser fornecida para validação da password.',
'invalidEmail' => 'Não foi possível verificar se o endereço de email corresponde ao e-mail registado.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Desculpe, houve um problema ao enviar o email. Não pudemos enviar um email para {0}.',
'throttled' => 'Muitas solicitações feitas a partir deste endereço IP. Pode tentar novamente em {0} segundos.',
'notEnoughPrivilege' => 'Não tem a permissão necessária para realizar a operação desejada.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/ru/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Токен доступа недействителен.',
'oldToken' => 'Срок действия токена доступа истёк.',
'noUserEntity' => 'Для проверки пароля необходимо предоставить сущность пользователя.',
'invalidEmail' => 'Не удалось подтвердить, что адрес электронной почты соответствует зарегистрированному.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Извините, возникла проблема с отправкой электронного письма. Не удалось отправить электронное письмо на "{0}".',
'throttled' => 'С этого IP-адреса было сделано слишком много запросов. Вы можете попробовать снова через {0} секунд.',
'notEnoughPrivilege' => 'У вас нет необходимых разрешений для выполнения требуемой операции.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/sk/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Prístupový token je neplatný.',
'oldToken' => 'Platnosť prístupového tokenu vypršala.',
'noUserEntity' => 'Na overenie hesla je potrebné zadať entitu používateľa.',
'invalidEmail' => 'Nie je možné overiť, či sa e-mailová adresa zhoduje so zaznamenaným e-mailom.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Ľutujeme, pri odosielaní e-mailu sa vyskytol problém. Nepodarilo sa nám odoslať e-mail na adresu „{0}".',
'throttled' => 'Z tejto adresy IP bolo odoslaných príliš veľa žiadostí. Môžete to skúsiť znova o {0} sekúnd.',
'notEnoughPrivilege' => 'Nemáte potrebné povolenie na vykonanie požadovanej operácie.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/sr/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Pristupni token nije validan.',
'oldToken' => 'Pristupni token je istekao.',
'noUserEntity' => 'Korisnički entitet mora postojati za verifikaciju naloga.',
'invalidEmail' => 'Nije moguće potvrditi email adresu ne postoje pogodci u bazi podataka.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Žao nam je ali slanje email poruke nije moguće. Nismo u mogućnosti poslati poruku na "{0}".',
'throttled' => 'Preveliki broj zahteva sa vaše IP adrese. Možete pokušati ponovo za {0} secondi.',
'notEnoughPrivilege' => 'Nemate dovoljan nivo autorizacije za zahtevanu akciju.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/sv-SE/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Access token är ogiltig.',
'oldToken' => 'Access token har gått ut.',
'noUserEntity' => 'User Entity måste anges för lösenordsvalidering.',
'invalidEmail' => 'Kan inte verifiera att epostadressen stämmer med den sparade.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Det var inte möjligt att skicka epost. Det gick inte att skicka till "{0}".',
'throttled' => 'För många anrop från denna IP-adress. Du kan försöka igen om {0} sekunder.',
'notEnoughPrivilege' => 'Du har inte nödvändiga rättigheter för detta kommando.',
Expand Down
2 changes: 1 addition & 1 deletion src/Language/tr/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'badToken' => 'Erişim anahtarı geçersiz.',
'oldToken' => 'Erişim anahtarının süresi doldu.',
'noUserEntity' => 'Parola doğrulaması için Kullanıcı Varlığı sağlanmalıdır.',
'invalidEmail' => 'E-posta adresinin kayıtlı e-posta ile eşleştiği doğrulanamıyor.',
'invalidEmail' => '(To be translated) Unable to verify the email address matches the email "{0}".',
'unableSendEmailToUser' => 'Üzgünüz, e-posta gönderilirken bir sorun oluştu. "{0}" adresine e-posta gönderemedik.',
'throttled' => 'Bu IP adresinden çok fazla istek yapıldı. {0} saniye sonra tekrar deneyebilirsiniz.',
'notEnoughPrivilege' => 'İstediğiniz işlemi gerçekleştirmek için gerekli izne sahip değilsiniz.',
Expand Down
Loading
Loading