From c858f9dfe350005af7a1958d58c928fb76eaedc1 Mon Sep 17 00:00:00 2001 From: sarog Date: Sun, 7 May 2023 18:24:14 +0300 Subject: [PATCH] add login link to magic link form view --- src/Language/bg/Auth.php | 1 + src/Language/de/Auth.php | 1 + src/Language/en/Auth.php | 1 + src/Language/es/Auth.php | 1 + src/Language/fa/Auth.php | 1 + src/Language/fr/Auth.php | 1 + src/Language/id/Auth.php | 1 + src/Language/it/Auth.php | 3 ++- src/Language/ja/Auth.php | 1 + src/Language/lt/Auth.php | 1 + src/Language/pt-BR/Auth.php | 1 + src/Language/pt/Auth.php | 1 + src/Language/sk/Auth.php | 1 + src/Language/sr/Auth.php | 1 + src/Language/sv-SE/Auth.php | 1 + src/Language/tr/Auth.php | 1 + src/Language/uk/Auth.php | 1 + src/Views/magic_link_form.php | 2 ++ tests/Controllers/MagicLinkTest.php | 6 ++++++ 19 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/Language/bg/Auth.php b/src/Language/bg/Auth.php index 751b68146..08d507169 100644 --- a/src/Language/bg/Auth.php +++ b/src/Language/bg/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Запомни ме?', 'forgotPassword' => 'Забравена парола?', 'useMagicLink' => 'Използвайте линк за вход', + 'usePassword' => 'Използвайте парола', 'magicLinkSubject' => 'Вашият линк за вход', 'magicTokenNotFound' => 'Не може да се потвърди линка.', 'magicLinkExpired' => 'Съжаляваме, линкът е изтекъл.', diff --git a/src/Language/de/Auth.php b/src/Language/de/Auth.php index a681516bd..dbc1cf922 100644 --- a/src/Language/de/Auth.php +++ b/src/Language/de/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Angemeldet bleiben', 'forgotPassword' => 'Passwort vergessen?', 'useMagicLink' => 'Einen Login-Link verwenden', + 'usePassword' => 'Ein Passwort verwenden', 'magicLinkSubject' => 'Ihr Login-Link', 'magicTokenNotFound' => 'Der Link konnte nicht verifiziert werden.', 'magicLinkExpired' => 'Sorry, der Link ist abgelaufen.', diff --git a/src/Language/en/Auth.php b/src/Language/en/Auth.php index 363fd4af7..0f1a1862f 100644 --- a/src/Language/en/Auth.php +++ b/src/Language/en/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Remember me?', 'forgotPassword' => 'Forgot your password?', 'useMagicLink' => 'Use a Login Link', + 'usePassword' => 'Use a Password', 'magicLinkSubject' => 'Your Login Link', 'magicTokenNotFound' => 'Unable to verify the link.', 'magicLinkExpired' => 'Sorry, link has expired.', diff --git a/src/Language/es/Auth.php b/src/Language/es/Auth.php index 2cf2c6211..38d477763 100644 --- a/src/Language/es/Auth.php +++ b/src/Language/es/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Recordarme', 'forgotPassword' => '¿Olvidaste tu contraseña', 'useMagicLink' => 'Usar un enlace de inicio de sesión', + 'usePassword' => 'Usar una contraseña', 'magicLinkSubject' => 'Tu enlace de inicio de sesión', 'magicTokenNotFound' => 'No se puede verificar el enlace.', 'magicLinkExpired' => 'Lo siento, el enlace ha caducado.', diff --git a/src/Language/fa/Auth.php b/src/Language/fa/Auth.php index 26d242525..e7a021a52 100644 --- a/src/Language/fa/Auth.php +++ b/src/Language/fa/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'مرا به خاطر بسپار؟', 'forgotPassword' => 'رمز عبور را فراموش کرده اید؟', 'useMagicLink' => 'از لینک ورود استفاده کنید', + 'usePassword' => 'استفاده از رمز عبور', 'magicLinkSubject' => 'لینک ورود شما', 'magicTokenNotFound' => 'تایید لینک ممکن نیست.', 'magicLinkExpired' => 'متاسفانه, لینک منقضی شده است.', diff --git a/src/Language/fr/Auth.php b/src/Language/fr/Auth.php index b43a354b0..0d51d0bb0 100644 --- a/src/Language/fr/Auth.php +++ b/src/Language/fr/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Se souvenir de moi', 'forgotPassword' => 'Mot de passe oublié ?', 'useMagicLink' => 'Utiliser un lien de connexion', + 'usePassword' => 'Utiliser un mot de passe', 'magicLinkSubject' => 'Votre lien de connexion', 'magicTokenNotFound' => 'Impossible de vérifier le lien.', 'magicLinkExpired' => 'Désolé, le lien a expiré.', diff --git a/src/Language/id/Auth.php b/src/Language/id/Auth.php index f2be28a35..f389a3623 100644 --- a/src/Language/id/Auth.php +++ b/src/Language/id/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Ingat saya?', 'forgotPassword' => 'Lupa kata sandi?', 'useMagicLink' => 'Gunakan tautan masuk', + 'usePassword' => 'Gunakan kata sandi', 'magicLinkSubject' => 'Tautan masuk Anda', 'magicTokenNotFound' => 'Tidak dapat memverifikasi tautan.', 'magicLinkExpired' => 'Maaf, tautan sudah tidak berlaku.', diff --git a/src/Language/it/Auth.php b/src/Language/it/Auth.php index af2b41e24..fc963259e 100644 --- a/src/Language/it/Auth.php +++ b/src/Language/it/Auth.php @@ -45,7 +45,8 @@ 'needAccount' => 'Hai bisogno di un account?', 'rememberMe' => 'Ricordami?', 'forgotPassword' => 'Password dimenticata?', - 'useMagicLink' => 'Usa un Login Link', + 'useMagicLink' => 'Usa un Login Link', + 'usePassword' => 'Usa una password', 'magicLinkSubject' => 'Il tuo Login Link', 'magicTokenNotFound' => 'Impossibile verificare il link.', 'magicLinkExpired' => 'Spiacente, il link è scaduto.', diff --git a/src/Language/ja/Auth.php b/src/Language/ja/Auth.php index 1ec2f346b..fa4416160 100644 --- a/src/Language/ja/Auth.php +++ b/src/Language/ja/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'ログイン状態を保持する', // 'Remember me?' 'forgotPassword' => 'パスワードをお忘れの方', // 'Forgot your password?' 'useMagicLink' => 'ログインリンクを使用する', // 'Use a Login Link' + 'usePassword' => 'パスワードを使用する', // 'Use a Password' 'magicLinkSubject' => 'あなたのログインリンク', // 'Your Login Link' 'magicTokenNotFound' => 'リンクを確認できません。', // 'Unable to verify the link.' 'magicLinkExpired' => '申し訳ございません、リンクは切れています。', // 'Sorry, link has expired.' diff --git a/src/Language/lt/Auth.php b/src/Language/lt/Auth.php index eed03fb6f..209d4e23f 100644 --- a/src/Language/lt/Auth.php +++ b/src/Language/lt/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Atsiminti mane?', 'forgotPassword' => 'Pamiršote slaptažodį?', 'useMagicLink' => 'Naudoti prisijungimo nuorodą', + 'usePassword' => 'Naudoti slaptažodį', 'magicLinkSubject' => 'Jūsų prisijungimo nuoroda', 'magicTokenNotFound' => 'Nepavyksta patvirtinti nuorodos.', 'magicLinkExpired' => 'Deja, nuorodos galiojimas baigėsi.', diff --git a/src/Language/pt-BR/Auth.php b/src/Language/pt-BR/Auth.php index b2506bcdd..e1c31aaea 100644 --- a/src/Language/pt-BR/Auth.php +++ b/src/Language/pt-BR/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Lembrar de mim?', 'forgotPassword' => 'Esqueceu sua senha?', 'useMagicLink' => 'Use um Link de Login', + 'usePassword' => 'Use uma senha', 'magicLinkSubject' => 'Seu Link de Login', 'magicTokenNotFound' => 'Não foi possível verificar o link.', 'magicLinkExpired' => 'Desculpe, o link expirou.', diff --git a/src/Language/pt/Auth.php b/src/Language/pt/Auth.php index a5cfa8492..00cb2fd25 100644 --- a/src/Language/pt/Auth.php +++ b/src/Language/pt/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Lembrar', 'forgotPassword' => 'Esqueceu a sua password?', 'useMagicLink' => 'Use um Link de Login', + 'usePassword' => 'Use uma senha', 'magicLinkSubject' => 'O seu Link de Login', 'magicTokenNotFound' => 'Não foi possível verificar o link.', 'magicLinkExpired' => 'Desculpe, o link expirou.', diff --git a/src/Language/sk/Auth.php b/src/Language/sk/Auth.php index 3424e88c4..9bc77aa2d 100644 --- a/src/Language/sk/Auth.php +++ b/src/Language/sk/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Zapamätať si ma?', 'forgotPassword' => 'Zabudli ste heslo?', 'useMagicLink' => 'Použiť odkaz na prihlásenie', + 'usePassword' => 'Použiť heslo', 'magicLinkSubject' => 'Váš odkaz na prihlásenie', 'magicTokenNotFound' => 'Odkaz sa nepodarilo overiť.', 'magicLinkExpired' => 'Ľutujeme, platnosť odkazu vypršala.', diff --git a/src/Language/sr/Auth.php b/src/Language/sr/Auth.php index 6c8e71f01..e388f20af 100644 --- a/src/Language/sr/Auth.php +++ b/src/Language/sr/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Zapmti me?', 'forgotPassword' => 'Zaboravljena lozinka?', 'useMagicLink' => 'Koristi pristupni link', + 'usePassword' => 'Koristi lozinku', 'magicLinkSubject' => 'Vaš pristupni link', 'magicTokenNotFound' => 'Nije moguća verifikacija linka.', 'magicLinkExpired' => 'Žao nam je, link je istekao.', diff --git a/src/Language/sv-SE/Auth.php b/src/Language/sv-SE/Auth.php index a37b09665..dff8841e0 100644 --- a/src/Language/sv-SE/Auth.php +++ b/src/Language/sv-SE/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Kom ihåg mig?', 'forgotPassword' => 'Glömt ditt lösenord?', 'useMagicLink' => 'Använd en login-länk', + 'usePassword' => 'Använd ett lösenord', 'magicLinkSubject' => 'Din login-länk', 'magicTokenNotFound' => 'Kan inte verifiera länken.', 'magicLinkExpired' => 'Tyvärr, länken har gått ut.', diff --git a/src/Language/tr/Auth.php b/src/Language/tr/Auth.php index 7a2b76710..8acbb16c3 100644 --- a/src/Language/tr/Auth.php +++ b/src/Language/tr/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Beni hatırla?', 'forgotPassword' => 'Şifrenizi mı unuttunuz?', 'useMagicLink' => 'Giriş Bağlantısı Kullanın', + 'usePassword' => 'Parola Kullanın', 'magicLinkSubject' => 'Giriş Bağlantınız', 'magicTokenNotFound' => 'Bağlantı doğrulanamıyor.', 'magicLinkExpired' => 'Üzgünüm, bağlantının süresi doldu.', diff --git a/src/Language/uk/Auth.php b/src/Language/uk/Auth.php index 56828330c..3f0285206 100644 --- a/src/Language/uk/Auth.php +++ b/src/Language/uk/Auth.php @@ -46,6 +46,7 @@ 'rememberMe' => 'Пам’ятай мене?', 'forgotPassword' => 'Забули пароль?', 'useMagicLink' => 'Використовуйте посилання для входу', + 'usePassword' => 'Використовуйте пароль', 'magicLinkSubject' => 'Ваше посилання для входу', 'magicTokenNotFound' => 'Неможливо перевірити посилання.', 'magicLinkExpired' => 'Вибачте, термін дії посилання закінчився.', diff --git a/src/Views/magic_link_form.php b/src/Views/magic_link_form.php index 35bfde4f1..474b2bda9 100644 --- a/src/Views/magic_link_form.php +++ b/src/Views/magic_link_form.php @@ -38,6 +38,8 @@ + +

diff --git a/tests/Controllers/MagicLinkTest.php b/tests/Controllers/MagicLinkTest.php index bec2370b1..b46b4b721 100644 --- a/tests/Controllers/MagicLinkTest.php +++ b/tests/Controllers/MagicLinkTest.php @@ -114,4 +114,10 @@ public function testMagicLinkVerifyPendingRegistrationActivation(): void ); $this->assertFalse(auth()->loggedIn()); } + + public function testUsePassword() + { + $result = $this->get('/login/magic-link'); + $this->assertStringContainsString(lang('Auth.usePassword'), $result->getBody()); + } }