From 6c03e258fa2393a30a628b2e2ecb7d47277bea54 Mon Sep 17 00:00:00 2001 From: Iraline Date: Mon, 18 Apr 2022 13:56:18 -0300 Subject: [PATCH 1/7] Added conditional to check if token has already been used --- app/controllers/users/confirmations_controller.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb index f615844c6..343f95f80 100644 --- a/app/controllers/users/confirmations_controller.rb +++ b/app/controllers/users/confirmations_controller.rb @@ -35,8 +35,15 @@ class Users::ConfirmationsController < Devise::ConfirmationsController respond_with_navigational(resource) { render :show } elsif resource.errors.empty? set_official_position if resource.has_official_email? - resource.confirm # Last change: confirm happens here for people with passwords instead of af the top of the show action - set_flash_message(:notice, :confirmed) if is_flashing_format? + + if resource.confirmed_at + message = :already_confirmed + else + resource.confirm # Last change: confirm happens here for people with passwords instead of af the top of the show action + message = :confirmed + end + + set_flash_message(:notice, message) if is_flashing_format? respond_with_navigational(resource) { redirect_to after_confirmation_path_for(resource_name, resource) } else respond_with_navigational(resource.errors, status: :unprocessable_entity) { render :new } From 996a2888e73655cd74c7ec9a0d52e60cc5105938 Mon Sep 17 00:00:00 2001 From: Iraline Date: Mon, 18 Apr 2022 16:34:33 -0300 Subject: [PATCH 2/7] Changing message location of user already confirmed --- config/locales/ar/devise.yml | 2 +- config/locales/ast/devise.yml | 2 +- config/locales/bg-BG/devise.yml | 2 +- config/locales/bs-BA/devise.yml | 2 +- config/locales/ca/devise.yml | 2 +- config/locales/cs-CZ/devise.yml | 2 +- config/locales/da-DK/devise.yml | 2 +- config/locales/de-DE/devise.yml | 2 +- config/locales/el-GR/devise.yml | 2 +- config/locales/en/devise.yml | 2 +- config/locales/es-PE/devise.yml | 2 +- config/locales/es/devise.yml | 2 +- config/locales/eu-ES/devise.yml | 2 +- config/locales/fa-IR/devise.yml | 2 +- config/locales/fr/devise.yml | 2 +- config/locales/gl/devise.yml | 2 +- config/locales/he/devise.yml | 2 +- config/locales/hr-HR/devise.yml | 2 +- config/locales/id-ID/devise.yml | 2 +- config/locales/it/devise.yml | 2 +- config/locales/ka-GE/devise.yml | 2 +- config/locales/mk-MK/devise.yml | 2 +- config/locales/nl/devise.yml | 2 +- config/locales/oc-FR/devise.yml | 2 +- config/locales/pl-PL/devise.yml | 2 +- config/locales/pt-BR/devise.yml | 2 +- config/locales/ro-RO/devise.yml | 2 +- config/locales/ru/devise.yml | 2 +- config/locales/sl-SI/devise.yml | 2 +- config/locales/so-SO/devise.yml | 2 +- config/locales/sq-AL/devise.yml | 2 +- config/locales/sr/devise.yml | 2 +- config/locales/sv-SE/devise.yml | 2 +- config/locales/tr-TR/devise.yml | 2 +- config/locales/uk-UA/devise.yml | 2 +- config/locales/val/devise.yml | 2 +- config/locales/zh-CN/devise.yml | 2 +- config/locales/zh-TW/devise.yml | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/config/locales/ar/devise.yml b/config/locales/ar/devise.yml index 56acc1c8b..b12270492 100644 --- a/config/locales/ar/devise.yml +++ b/config/locales/ar/devise.yml @@ -8,6 +8,7 @@ ar: new_password: "كلمة مرور جديدة" updated: "كلمة السر تغيرت بنجاح" confirmations: + already_confirmed: "تأكد بالفعل، من فضلك حاول تسجيل الدخول" confirmed: "أكد حسابك بنجاح. أنت الآن مسجل الدخول." send_instructions: "سوف تتلقى رسالة بريد إلكتروني مع تعليمات حول كيفية تأكيد حسابك في بضع دقائق." send_paranoid_instructions: "إذا كان لديك بريد إلكتروني موجود على قاعدة بياناتنا، سوف تتلقى رسالة بريد إلكتروني مع تعليمات حول كيفية تأكيد حسابك في بضع دقائق." @@ -55,7 +56,6 @@ ar: unlocked: "تم إعادة فتح حسابك بنجاح. الرجاء تسجيل الدخول للمتابعة." errors: messages: - already_confirmed: "تأكد بالفعل، من فضلك حاول تسجيل الدخول" confirmation_period_expired: "يجب التحقق من صحتك داحل %{period}؛ يرجى تقديم طلب تكرار." expired: "انتهت الصلاحية، يرجى طلب واحد جديد" not_found: "لا يوجد" diff --git a/config/locales/ast/devise.yml b/config/locales/ast/devise.yml index ef1ec1208..f5b0cb2c8 100644 --- a/config/locales/ast/devise.yml +++ b/config/locales/ast/devise.yml @@ -8,6 +8,7 @@ ast: new_password: "Nueva clave" updated: "Clave actualizá con ésitu" confirmations: + already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmed: "La to cuenta foi confirmada. Por favor amuesa que yes tu, cola to rede social o'l to usuariu y clave." send_instructions: "Vas Recibir un corréu electrónicu nunos minutos con instrucciones sobro cómo restablecer la to clave." send_paranoid_instructions: "Si'l to corréu electrónicu esiste na nuesa base de datos vas recibir un corréu electrónicu n'unos minutos con instrucciones sobro cómo restablecer la to clave." @@ -54,7 +55,6 @@ ast: unlocked: "Tu cuenta ha sido desbloqueada. Por favor inicia sesión para continuar." errors: messages: - already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmation_period_expired: "necesitas ser confirmado en %{period}, por favor vuelve a solicitarla." expired: "ha expirado, por favor vuelve a solicitarla." not_found: "no se ha encontrado." diff --git a/config/locales/bg-BG/devise.yml b/config/locales/bg-BG/devise.yml index 2ac51bfb2..2375ebdd0 100644 --- a/config/locales/bg-BG/devise.yml +++ b/config/locales/bg-BG/devise.yml @@ -8,6 +8,7 @@ bg: new_password: "Нова парола" updated: "Паролата е актуализирана успешно" confirmations: + already_confirmed: "Вече сте потвърдени; моля опитайте да влезете." confirmed: "Вашият профил е потвърден." send_instructions: "След няколко минути ще получите имейл, съдържащ инструкции как да промените паролата си." send_paranoid_instructions: "Ако вашият имейл адрес е в нашата база данни, след няколко минути ще получите имейл, съдържащ инструкции как да промените паролата си." @@ -55,7 +56,6 @@ bg: unlocked: "Вашият профил е отключен. Моля, влезте, за да продължите." errors: messages: - already_confirmed: "Вече сте потвърдени; моля опитайте да влезете." confirmation_period_expired: "Трябва да бъдете потвърдени в %{period}; моля, направете повторна заявка." expired: "изтекъл е; моля, направете повторна заявка." not_found: "не е намерено." diff --git a/config/locales/bs-BA/devise.yml b/config/locales/bs-BA/devise.yml index c27ba6ef0..ef7e79867 100644 --- a/config/locales/bs-BA/devise.yml +++ b/config/locales/bs-BA/devise.yml @@ -8,6 +8,7 @@ bs: new_password: "Nova lozinka" updated: "Lozinka uspješno ažurirana" confirmations: + already_confirmed: "Već je izvršena potvrda. Pokušajte se prijaviti." confirmed: "Vaš nalog je potvrđen." send_instructions: "Za nekoliko minuta ćete dobiti email sa instrukcijama kako da promijenite svoju lozinku." send_paranoid_instructions: "Ako je vaša email adresa u našoj bazi podataka, za nekoliko minuta ćete dobiti email sa instrukcijama kako da promijenite svoju lozinku." @@ -55,7 +56,6 @@ bs: unlocked: "Vaš nalog je otključan. Prijavite se da nastavite." errors: messages: - already_confirmed: "Već je izvršena potvrda. Pokušajte se prijaviti." confirmation_period_expired: "Morate dobiti potvrdu u roku od %{period}. Ponovite zahtjev." expired: "isteklo; ponovite zahtjev." not_found: "nije pronađeno." diff --git a/config/locales/ca/devise.yml b/config/locales/ca/devise.yml index b7b60f3ee..6b13e8024 100644 --- a/config/locales/ca/devise.yml +++ b/config/locales/ca/devise.yml @@ -8,6 +8,7 @@ ca: new_password: "Nova contrasenya" updated: "Contrasenya actualitzada amb èxit" confirmations: + already_confirmed: "Ja heu estat verificats; intenteu iniciar la sessió." confirmed: "El teu compte ha sigut confirmat. Per favor autentica't amb el teu usuari i contrasenya" send_instructions: "Rebràs un correu electrònic en uns minuts amb instruccions sobre com restablir la teua contrasenya." send_paranoid_instructions: "Si el teu correu electrònic existeix en la nostra base de dades rebràs un correu electrònic en uns minuts amb instruccions sobre com restablir la teua contrasenya." @@ -55,7 +56,6 @@ ca: unlocked: "El teu compte ha sigut desbloquejat. Per favor inicia sessió per a continuar." errors: messages: - already_confirmed: "Ja heu estat verificats; intenteu iniciar la sessió." confirmation_period_expired: "Heu de ser verificat dins %{period}; feu una sol·licitud de repetició." expired: "ha expirat; feu una sol·licitud de repetició." not_found: "no trobat." diff --git a/config/locales/cs-CZ/devise.yml b/config/locales/cs-CZ/devise.yml index 8b4c3cc80..9b498fa38 100644 --- a/config/locales/cs-CZ/devise.yml +++ b/config/locales/cs-CZ/devise.yml @@ -8,6 +8,7 @@ cs: new_password: "Nové heslo" updated: "Heslo bylo úspěšně aktualizováno" confirmations: + already_confirmed: "Byl jste již ověřen; prosím, pokuste se přihlásit." confirmed: "Váš účet byl potvrzen." send_instructions: "Během pár minut obdržíte e-mail s pokyny k obnovení hesla." send_paranoid_instructions: "Je-li vaše e-mailová adresa v naší databázi, během pár minut obdržíte e-mail s pokyny k obnovení hesla." @@ -55,7 +56,6 @@ cs: unlocked: "Váš účet byl odemčen. Chcete-li pokračovat, přihlaste se." errors: messages: - already_confirmed: "Byl jste již ověřen; prosím, pokuste se přihlásit." confirmation_period_expired: "Musíte být ověřeni během %{period}; prosím, opakujte žádost." expired: "vypršela platnost; prosím, opakujte žádost." not_found: "nebylo nalezeno." diff --git a/config/locales/da-DK/devise.yml b/config/locales/da-DK/devise.yml index 3d5d42fba..48533200d 100644 --- a/config/locales/da-DK/devise.yml +++ b/config/locales/da-DK/devise.yml @@ -8,6 +8,7 @@ da: new_password: "Ny adgangskode" updated: "Din adgangskode blev opdateret" confirmations: + already_confirmed: "Du er allerede blevet verificeret; gå til log ind." confirmed: "Din brugerkonto er blevet bekræftet." send_instructions: "Om få minutter vil du modtage en e-mail, der instruerer dig i, hvordan du nulstiller din adgangskode." send_paranoid_instructions: "Hvis din e-mail findes i vores database, vil du om få minutter modtage en e-mail, der instruerer dig i, hvordan du nulstiller din adgangskode." @@ -55,7 +56,6 @@ da: unlocked: "Din konto er blevet genåbnet. Log ind for at fortsætte." errors: messages: - already_confirmed: "Du er allerede blevet verificeret; gå til log ind." confirmation_period_expired: "Du skal verificeres inden for denne %{period}; vær venlig at gentage anmodningen." expired: "er udløbet; vær venlig at gentage anmodningen." not_found: "ikke fundet." diff --git a/config/locales/de-DE/devise.yml b/config/locales/de-DE/devise.yml index ab8eab7a1..334734548 100644 --- a/config/locales/de-DE/devise.yml +++ b/config/locales/de-DE/devise.yml @@ -8,6 +8,7 @@ de: new_password: "Neues Passwort" updated: "Passwort erfolgreich aktualisiert" confirmations: + already_confirmed: "Sie wurden bereits verifziert. Bitte melden Sie sich nun an." confirmed: "Ihr Konto wurde bestätigt." send_instructions: "In wenigen Minuten erhalten Sie eine E-Mail mit einer Anleitung zum Zurücksetzen Ihres Passworts." send_paranoid_instructions: "Wenn sich Ihre E-Mail-Adresse in unserer Datenbank befindet, erhalten Sie in wenigen Minuten eine E-Mail mit einer Anleitung zum Zurücksetzen Ihres Passworts." @@ -55,7 +56,6 @@ de: unlocked: "Ihr Konto wurde entsperrt. Bitte melden Sie sich an, um fortzufahren." errors: messages: - already_confirmed: "Sie wurden bereits verifziert. Bitte melden Sie sich nun an." confirmation_period_expired: "Ihr Konto muss innerhalb von %{period} verifiziert werden; bitte stellen Sie eine neue Anfrage." expired: "ist abgelaufen; bitte stellen Sie eine neue Anfrage." not_found: "nicht gefunden." diff --git a/config/locales/el-GR/devise.yml b/config/locales/el-GR/devise.yml index cb0a69bc6..bcac9b0dc 100644 --- a/config/locales/el-GR/devise.yml +++ b/config/locales/el-GR/devise.yml @@ -8,6 +8,7 @@ el: new_password: "Νέος κωδικός πρόσβασης" updated: "Ο κωδικός πρόσβασης ενημερώθηκε επιτυχώς" confirmations: + already_confirmed: "Ο λογαριασμός σας έχει επαληθευτεί, παρακαλούμε συνδεθείτε τώρα." confirmed: "Ο λογαριασμός σας έχει επιβεβαιωθεί." send_instructions: "Σε λίγα λεπτά θα λάβετε E-mail με οδηγίες για την επαναφορά του κωδικού πρόσβασής σας." send_paranoid_instructions: "Εάν η ηλεκτρονική σας διεύθυνση είναι καταχωρήμένη στη βάση δεδομένων μας, σε λίγα λεπτά θα λάβετε E-mail με οδηγίες για την επαναφορά του κωδικού πρόσβασης σας." @@ -55,7 +56,6 @@ el: unlocked: "Ο λογαριασμός σας έχει ξεκλειδωθεί. Συνδεθείτε για να συνεχίσετε." errors: messages: - already_confirmed: "Ο λογαριασμός σας έχει επαληθευτεί, παρακαλούμε συνδεθείτε τώρα." confirmation_period_expired: "Ο λογαριασμός σας πρέπει να επαληθευτεί εντός %{period}, καταχωρήσετε νέο αίτημα." expired: "Έχει λήξει. Παρακαλούμε όπως καταχωρήσετε νέο αίτημα." not_found: "δεν βρέθηκε." diff --git a/config/locales/en/devise.yml b/config/locales/en/devise.yml index 3b09ed785..43b7391fc 100644 --- a/config/locales/en/devise.yml +++ b/config/locales/en/devise.yml @@ -8,6 +8,7 @@ en: new_password: "New password" updated: "Password successfully updated" confirmations: + already_confirmed: "You have already been verified; please attempt to sign in." confirmed: "Your account has been confirmed." send_instructions: "In a few minutes you will receive an email containing instructions on how to reset your password." send_paranoid_instructions: "If your email address is in our database, in a few minutes you will receive an email containing instructions on how to reset your password." @@ -55,7 +56,6 @@ en: unlocked: "Your account has been unlocked. Please sign in to continue." errors: messages: - already_confirmed: "You have already been verified; please attempt to sign in." confirmation_period_expired: "You need to be verified within %{period}; please make a repeat request." expired: "has expired; please make a repeat request." not_found: "not found." diff --git a/config/locales/es-PE/devise.yml b/config/locales/es-PE/devise.yml index 0e43f5017..eecba50fd 100644 --- a/config/locales/es-PE/devise.yml +++ b/config/locales/es-PE/devise.yml @@ -8,6 +8,7 @@ es-PE: new_password: "Contraseña nueva" updated: "Contraseña actualizada con éxito" confirmations: + already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmed: "Tu cuenta ha sido confirmada. Por favor autentifícate con tu red social o tu usuario y contraseña" send_instructions: "Recibirás un correo electrónico en unos minutos con instrucciones sobre cómo restablecer tu contraseña." send_paranoid_instructions: "Si tu correo electrónico existe en nuestra base de datos recibirás un correo electrónico en unos minutos con instrucciones sobre cómo restablecer tu contraseña." @@ -54,7 +55,6 @@ es-PE: unlocked: "Tu cuenta ha sido desbloqueada. Por favor inicia sesión para continuar." errors: messages: - already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmation_period_expired: "necesitas ser confirmado en %{period}, por favor vuelve a solicitarla." expired: "ha expirado, por favor vuelve a solicitarla." not_found: "no se ha encontrado." diff --git a/config/locales/es/devise.yml b/config/locales/es/devise.yml index ed0f6980a..b8deae695 100644 --- a/config/locales/es/devise.yml +++ b/config/locales/es/devise.yml @@ -8,6 +8,7 @@ es: new_password: "Nueva contraseña" updated: "Contraseña actualizada con éxito" confirmations: + already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmed: "Tu cuenta ha sido confirmada. Por favor autentifícate con tu red social o tu usuario y contraseña" send_instructions: "Recibirás un correo electrónico en unos minutos con instrucciones sobre cómo restablecer tu contraseña." send_paranoid_instructions: "Si tu correo electrónico existe en nuestra base de datos recibirás un correo electrónico en unos minutos con instrucciones sobre cómo restablecer tu contraseña." @@ -55,7 +56,6 @@ es: unlocked: "Tu cuenta ha sido desbloqueada. Por favor inicia sesión para continuar." errors: messages: - already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmation_period_expired: "necesitas ser confirmado en %{period}, por favor vuelve a solicitarla." expired: "ha expirado, por favor vuelve a solicitarla." not_found: "no se ha encontrado." diff --git a/config/locales/eu-ES/devise.yml b/config/locales/eu-ES/devise.yml index c53175bed..e3e0197ad 100644 --- a/config/locales/eu-ES/devise.yml +++ b/config/locales/eu-ES/devise.yml @@ -8,6 +8,7 @@ eu: new_password: "Pasahitz berria" updated: "Pasahitza ondo aldatu da" confirmations: + already_confirmed: "Baieztatua izan zara. Mesedez, saioa hasten saiatu." confirmed: "Zure kontua baieztatu da. Mesedez, zure sare sozial edo reabiltzaile eta pasahitzarekin autentikatu zaitez" send_instructions: "Pasahitza berriz ezartzeko argibideak email bidez jasoko dituzu." send_paranoid_instructions: "Zure posta elektroniko helbidea gure datu basean badago, pasahitza berriz ezartzeko argibideak email bidez jasoko dituzu." @@ -55,7 +56,6 @@ eu: unlocked: "Zure kontua desbloketau egin da. Jarraitu ahal izateko saioa hasi." errors: messages: - already_confirmed: "Baieztatua izan zara. Mesedez, saioa hasten saiatu." confirmation_period_expired: "%{period} -(e)n baieztatu behar zara. Mesedez, berriz eskatu ezazu." expired: "iraungi da. Mesedez, berriz eskatu ezazu." not_found: "ez da bilatu." diff --git a/config/locales/fa-IR/devise.yml b/config/locales/fa-IR/devise.yml index fc9ca7985..48eb710a0 100644 --- a/config/locales/fa-IR/devise.yml +++ b/config/locales/fa-IR/devise.yml @@ -8,6 +8,7 @@ fa: new_password: "رمز عبور جدید" updated: "کلمه عبور با موفقیت به روز رسانی شد." confirmations: + already_confirmed: "شما قبلا تایید شده اید لطفا تلاش کنید تا وارد سیستم شوید" confirmed: "حساب شما تایید شده است." send_instructions: "دقایقی بعد شما ایمیلی حاوی دستورالعمل در مورد چگونگی تنظیم مجدد رمز عبور خود را دریافت خواهید کرد." send_paranoid_instructions: "اگر آدرس ایمیل شما در پایگاه داده ما موجود باشد، در چند دقیقه شما ایمیلی حاوی دستورالعمل در مورد چگونگی رست کردن رمز عبور خود دریافت خواهید کرد." @@ -54,7 +55,6 @@ fa: unlocked: "حساب کاربری شما قفل شده است لطفا برای ادامه وارد شوید." errors: messages: - already_confirmed: "شما قبلا تایید شده اید لطفا تلاش کنید تا وارد سیستم شوید" confirmation_period_expired: "شما باید در%{period} تأیید شوید لطفاخواست را تکرار کنید" expired: "منقضی شده است؛ لطفا درخواست را تکرار کنید" not_found: "یافت نشد" diff --git a/config/locales/fr/devise.yml b/config/locales/fr/devise.yml index f4c9d8a4f..8732edcda 100644 --- a/config/locales/fr/devise.yml +++ b/config/locales/fr/devise.yml @@ -8,6 +8,7 @@ fr: new_password: "Nouveau mot de passe" updated: "Mot de passe mis-à-jour avec succès" confirmations: + already_confirmed: "Votre compte a déjà été vérifié; veuillez essayer de vous connecter." confirmed: "Votre compte a été confirmé." send_instructions: "Dans quelques minutes, vous recevrez un courriel contenant les instructions pour réinitialiser votre mot de passe." send_paranoid_instructions: "Si votre adresse est dans notre base de données, vous recevrez dans quelques minutes un courriel contenant les instructions pour réinitialiser votre mot de passe." @@ -55,7 +56,6 @@ fr: unlocked: "Votre compte a été débloqué. Veuillez vous connecter pour continuer." errors: messages: - already_confirmed: "Votre compte a déjà été vérifié; veuillez essayer de vous connecter." confirmation_period_expired: "Votre compte doit être vérifié en %{period}; veuillez refaire une demande." expired: "a expiré; veuillez refaire une demande." not_found: "non trouvé." diff --git a/config/locales/gl/devise.yml b/config/locales/gl/devise.yml index c5b57cc15..71af95d05 100644 --- a/config/locales/gl/devise.yml +++ b/config/locales/gl/devise.yml @@ -8,6 +8,7 @@ gl: new_password: "Contrasinal novo" updated: "O contrasinal actualizouse con éxito" confirmations: + already_confirmed: "xa fuches confirmado, por favor intenta iniciar sesión." confirmed: "A túa conta foi confirmada. Por favor, autentifícate coa túa rede social ou o teu usuario e contrasinal" send_instructions: "Recibirás un correo electrónico nuns minutos con instrucións sobre como restablecer o teu contrasinal." send_paranoid_instructions: "Se o teu correo electrónico existe na nosa base de datos recibirás un correo nuns minutos con instrucións sobre como restablecer o teu contrasinal." @@ -55,7 +56,6 @@ gl: unlocked: "A túa conta foi desbloqueada. Por favor, inicia sesión para continuar." errors: messages: - already_confirmed: "xa fuches confirmado, por favor intenta iniciar sesión." confirmation_period_expired: "necesitas ser confirmado en %{period}, por favor vólvea solicitar." expired: "expirou, por favor vólvea solicitar." not_found: "non se encontrou." diff --git a/config/locales/he/devise.yml b/config/locales/he/devise.yml index e6833e811..885b372c9 100644 --- a/config/locales/he/devise.yml +++ b/config/locales/he/devise.yml @@ -8,6 +8,7 @@ he: new_password: "סיסמה חדשה" updated: "הסיסמה עודכנה בהצלחה" confirmations: + already_confirmed: "החשבון כבר אומת; נסה להיכנס." confirmed: "חשבונך אושר בהצלחה. כעת הנך מחובר/ת." send_instructions: "בדקות הקרובות יגיע אליך אימייל עם הנחיות כיצד לאשר את הרשמתך." send_paranoid_instructions: "אם כתובת הדואר האלקטרוני שלך נמצאת במאגר שלנו, בעוד כמה דקות תקבל הודעת דוא\"ל המכילה הוראות כיצד לאפס את סיסמתך." @@ -55,7 +56,6 @@ he: unlocked: "הנעילה הוסרה בהצלחה. התחבר בכדי להמשיך." errors: messages: - already_confirmed: "החשבון כבר אומת; נסה להיכנס." confirmation_period_expired: "חשבונך צריך להיות מופעל בתוך מסגרת הזמן %{period}; אנא חזור על הבקשה." expired: "הזמן פג, אנא חזור על הבקשה." not_found: "לא נמצא." diff --git a/config/locales/hr-HR/devise.yml b/config/locales/hr-HR/devise.yml index 9e9aea21e..5781b35d5 100644 --- a/config/locales/hr-HR/devise.yml +++ b/config/locales/hr-HR/devise.yml @@ -8,6 +8,7 @@ hr: new_password: "Nova zaporka" updated: "Zaporka je uspješno ažurirana" confirmations: + already_confirmed: "Vaš je račun već potvrđen; molimo vas da se pokušate prijaviti." confirmed: "Vaš račun je potvrđen." send_instructions: "U nekoliko minuta primit ćete e-mail koji sadrži upute za ponovno postavljanje zaporke." send_paranoid_instructions: "Ako je vaša e-mail adresa u našoj bazi podataka u nekoliko minuta ćete zaprimiti e-mail koji sadrži upute za ponovno postavljanje lozinke." @@ -55,7 +56,6 @@ hr: unlocked: "Vaš je račun otključan. Ponovno se prijavite da biste nastavili." errors: messages: - already_confirmed: "Vaš je račun već potvrđen; molimo vas da se pokušate prijaviti." confirmation_period_expired: "Potrebno je potvrditi Vaš račun s %{period}; molimo vas da ponovite zahtjev za prijavu." expired: "je istekao; molimo vas da ponovno pošaljete zahtjev." not_found: "nije pronađeno." diff --git a/config/locales/id-ID/devise.yml b/config/locales/id-ID/devise.yml index 3fca093c9..5f6dba819 100644 --- a/config/locales/id-ID/devise.yml +++ b/config/locales/id-ID/devise.yml @@ -8,6 +8,7 @@ id: new_password: "Kata sandi baru" updated: "Kata sandi berhasil diperbarui" confirmations: + already_confirmed: "Anda sudah diverifikasi; Silakan untuk mencoba masuk." confirmed: "Akun anda telah dikonfirmasi." send_instructions: "Dalam beberapa menit anda akan menerima email berisi petunjuk tentang cara mereset kata sandi anda." send_paranoid_instructions: "Jika alamat email anda ada di database kami, dalam beberapa menit anda akan menerima email berisi petunjuk tentang cara mereset kata sandi anda." @@ -55,7 +56,6 @@ id: unlocked: "Akun anda telah dibuka. Silakan masuk untuk melanjutkan." errors: messages: - already_confirmed: "Anda sudah diverifikasi; Silakan untuk mencoba masuk." confirmation_period_expired: "Anda perlu untuk diverifikasi dalam %{period}; silahkan buat sebuah permintaan berulang." expired: "sudah kadaluarsa, silakan membuat ulangi permintaan." not_found: "tidak ditemukan." diff --git a/config/locales/it/devise.yml b/config/locales/it/devise.yml index cab950d5f..5bf07c6a5 100644 --- a/config/locales/it/devise.yml +++ b/config/locales/it/devise.yml @@ -8,6 +8,7 @@ it: new_password: "Nuova password" updated: "Password aggiornata correttamente" confirmations: + already_confirmed: "Hai già eseguito questa verifica; per favore, prova ad eseguire il log in." confirmed: "Il tuo account è stato confermato." send_instructions: "Tra pochi minuti riceverai un'e-mail contenente le istruzioni su come reimpostare la password." send_paranoid_instructions: "Se il tuo indirizzo email è nel nostro archivio, in pochi minuti riceverai un'e-mail contenente le istruzioni su come reimpostare la password." @@ -55,7 +56,6 @@ it: unlocked: "Il tuo account è stato sbloccato. Per favore, accedi per continuare." errors: messages: - already_confirmed: "Hai già eseguito questa verifica; per favore, prova ad eseguire il log in." confirmation_period_expired: "È necessario provvedere alla verifica entro %{period}; per favore, esegui nuovamente la richiesta." expired: "è scaduto; per cortesia, ripeti la richiesta." not_found: "non reperibile." diff --git a/config/locales/ka-GE/devise.yml b/config/locales/ka-GE/devise.yml index 1f20b93b6..8b07cf4bc 100644 --- a/config/locales/ka-GE/devise.yml +++ b/config/locales/ka-GE/devise.yml @@ -8,6 +8,7 @@ ka: new_password: "ახალი პაროლი" updated: "პაროლი წარმატებით განახლდა" confirmations: + already_confirmed: "თქვენ უკვე გაიარეთ გადამოწმება; გთხოვთ, სცადოთ სისტემაში შესვლა." confirmed: "თქვენი ანგარიში დადასტურდა." send_instructions: "რამოდენიმე წუთში შეტყობინების სახით მიიღებთ პაროლის აღდგენის ინსტრუქციას." send_paranoid_instructions: "თუ თქვენი ელ. ფოსტის მისამართი ჩვენს მონაცემთა ბაზაშია, რამოდენიმე წუთში შეტყობინების სახით მიიღებთ პაროლის აღდგენის ინსტრუქციას." @@ -55,7 +56,6 @@ ka: unlocked: "ანგარიში განბლოკილია. გაიარეთ ავტორიზაცია." errors: messages: - already_confirmed: "თქვენ უკვე გაიარეთ გადამოწმება; გთხოვთ, სცადოთ სისტემაში შესვლა." confirmation_period_expired: "თქვენი მონაცემების გადასამოწმებლად საჭიროა %{period}; გთხოვთ, ხელახლა გამოაგზავნოთ მოთხოვნა." expired: "ვადა გაუვიდა; გთხოვთ, ხელახლა გამოაგზავნოთ თხოვნა." not_found: "არ მოიძებნა." diff --git a/config/locales/mk-MK/devise.yml b/config/locales/mk-MK/devise.yml index 3bea85509..14487cc67 100644 --- a/config/locales/mk-MK/devise.yml +++ b/config/locales/mk-MK/devise.yml @@ -8,6 +8,7 @@ mk: new_password: "Нова лозинка" updated: "Успешно ажурирана лозинка" confirmations: + already_confirmed: "Веќе сте верификувани; ве молиме обидете се да се логирате." confirmed: "Вашиот профил е потврден." send_instructions: "За неколку минути ќе добиете електронска пошта со инструкции како да ја ресетирате вашата лозинка." send_paranoid_instructions: "Ако вашата електронска адреса е во нашата датабаза, за неколку минути ќе добиете електронска пошта со инструкции за како да ја ресетирате вашата лозинка." @@ -55,7 +56,6 @@ mk: unlocked: "Вашиот профил е отклучен. Ве молиме логирајте се за да продолжите." errors: messages: - already_confirmed: "Веќе сте верификувани; ве молиме обидете се да се логирате." confirmation_period_expired: "Мора да бидете верификувани во период од %{period}; ве молиме повторно испратете барање." expired: "истечено; ве молиме повторно испратете барање." not_found: "не е пронајдено." diff --git a/config/locales/nl/devise.yml b/config/locales/nl/devise.yml index 034ba7e8c..8e7d84ef9 100644 --- a/config/locales/nl/devise.yml +++ b/config/locales/nl/devise.yml @@ -8,6 +8,7 @@ nl: new_password: "Nieuw wachtwoord" updated: "Wachtwoord is aangepast" confirmations: + already_confirmed: "is reeds bevestigd" confirmed: "Uw account is bevestigd." send_instructions: "U ontvangt via e-mail instructies om uw account te bevestigen." send_paranoid_instructions: "Als uw e-mailadres bestaat in de database, ontvangt u via e-mail instructies hoe u uw account kunt bevestigen." @@ -55,7 +56,6 @@ nl: unlocked: "uw account is ontgrendeld. U kunt nu weer inloggen." errors: messages: - already_confirmed: "is reeds bevestigd" confirmation_period_expired: "moet worden bevestigd binnen %{period}, probeer het a.u.b. nog een keer" expired: "is verlopen, vraag een nieuwe aan\"" not_found: "niet gevonden" diff --git a/config/locales/oc-FR/devise.yml b/config/locales/oc-FR/devise.yml index da1759ec9..e89686bb3 100644 --- a/config/locales/oc-FR/devise.yml +++ b/config/locales/oc-FR/devise.yml @@ -8,6 +8,7 @@ oc: new_password: "Nòva contrasenya" updated: "Contrasenya actualizada amb succès" confirmations: + already_confirmed: "Sètz ja estats verificats; ensajatz iniciar la session." confirmed: "Lo tieu compte es estat confirmat. Per favor autentica't amb lo tieu usatgièr e contrasenya" send_instructions: "Recebràs un corrièr electronic en unas minutas amb instruccions sus coma restablir la tiá contrasenya." send_paranoid_instructions: "Se lo tieu corrièr electronic existís en la nòstra basa de donadas recebràs un corrièr electronic en unas minutas amb instruccions sus coma restablir la tiá contrasenya." @@ -55,7 +56,6 @@ oc: unlocked: "Lo tieu compte es estat desblocat. Per favor inícia session per contunhar." errors: messages: - already_confirmed: "Sètz ja estats verificats; ensajatz iniciar la session." confirmation_period_expired: "vos cal èsser verificat dins %{period}; fasètz una sollicitud de repeticion." expired: "A expirat; fasètz una sollicitud de repeticion." not_found: "pas trobat." diff --git a/config/locales/pl-PL/devise.yml b/config/locales/pl-PL/devise.yml index 2093b6ed5..996f30de9 100644 --- a/config/locales/pl-PL/devise.yml +++ b/config/locales/pl-PL/devise.yml @@ -8,6 +8,7 @@ pl: new_password: "Nowe hasło" updated: "Hasło pomyślnie zaktualizowane" confirmations: + already_confirmed: "Zostałeś/łaś już zweryfikowany/a; spróbuj się zalogować." confirmed: "Twoje konto zostało potwierdzone." send_instructions: "W ciągu kilku minut otrzymasz e-mail zawierający instrukcje dotyczące resetowania hasła." send_paranoid_instructions: "Jeśli Twój adres e-mail znajduje się w naszej bazie danych, w ciągu kilku minut otrzymasz e-mail zawierający instrukcje dotyczące resetowania hasła." @@ -55,7 +56,6 @@ pl: unlocked: "Twoje konto zostało odblokowane. Zaloguj się, by kontynuować." errors: messages: - already_confirmed: "Zostałeś/łaś już zweryfikowany/a; spróbuj się zalogować." confirmation_period_expired: "Musisz zostać zweryfikowany/a w ciągu %{period}; proszę wysłać ponowny wniosek." expired: "utracił/a ważność; proszę wysłać ponowny wniosek." not_found: "nie znaleziono." diff --git a/config/locales/pt-BR/devise.yml b/config/locales/pt-BR/devise.yml index 2814ff81e..29ddf329c 100644 --- a/config/locales/pt-BR/devise.yml +++ b/config/locales/pt-BR/devise.yml @@ -8,6 +8,7 @@ pt-BR: new_password: "Nova senha" updated: "Senha atualizada com sucesso" confirmations: + already_confirmed: "Você já foi verificado; por favor tente conectar-se a sua conta." confirmed: "Sua conta foi confirmada." send_instructions: "Em alguns minutos, você receberá um e-mail contendo instruções sobre como redefinir sua senha." send_paranoid_instructions: "Se o seu endereço de e-mail estiver em nosso banco de dados, em poucos minutos você receberá um e-mail com instruções sobre como redefinir sua senha." @@ -55,7 +56,6 @@ pt-BR: unlocked: "Sua conta foi desbloqueada. Por favor, conecte-se a sua conta para continuar." errors: messages: - already_confirmed: "Você já foi verificado; por favor tente conectar-se a sua conta." confirmation_period_expired: "Você precisa ser verificado dentro de %{period}; por favor, faça um pedido de repetição." expired: "expirou; por favor, faça um pedido de repetição." not_found: "não encontrado." diff --git a/config/locales/ro-RO/devise.yml b/config/locales/ro-RO/devise.yml index ccb3ed5b3..42d91f4e8 100644 --- a/config/locales/ro-RO/devise.yml +++ b/config/locales/ro-RO/devise.yml @@ -8,6 +8,7 @@ ro: new_password: "Parola nouă" updated: "Parolă actualizată cu succes" confirmations: + already_confirmed: "Ați fost deja verificat; vă rugăm încercați să vă conectați." confirmed: "Contul dumneavoastră a fost confirmat." send_instructions: "În câteva minute veți primi un email care conține instrucțiuni despre cum vă puteți reseta parola." send_paranoid_instructions: "Dacă adresa dumneavoastră de email se află în baza noastră de date, în câteva minute veți primi un email care conține instrucțiuni despre cum vă puteți reseta parola." @@ -55,7 +56,6 @@ ro: unlocked: "Contul dvs. a fost deblocat. Vă rugăm să vă conectați pentru a continua." errors: messages: - already_confirmed: "Ați fost deja verificat; vă rugăm încercați să vă conectați." confirmation_period_expired: "Trebuie să fiți verificat în %{period}; vă rugăm să faceți o solicitare repetată." expired: "a expirat; vă rugăm să faceți o solicitare repetată." not_found: "nu a fost găsit." diff --git a/config/locales/ru/devise.yml b/config/locales/ru/devise.yml index 6a77ec2e1..17d006fcc 100644 --- a/config/locales/ru/devise.yml +++ b/config/locales/ru/devise.yml @@ -8,6 +8,7 @@ ru: new_password: "Новый пароль" updated: "Пароль успешно обновлён" confirmations: + already_confirmed: "уже подтверждена. Пожалуйста, попробуйте войти в систему" confirmed: "Ваша учётная запись подтверждена. Теперь вы вошли в систему." send_instructions: "В течение нескольких минут вы получите письмо с инструкциями по подтверждению вашей учётной записи." send_paranoid_instructions: "Если ваш адрес e-mail есть в нашей базе данных, то в течение нескольких минут вы получите письмо с инструкциями по подтверждению вашей учётной записи." @@ -55,7 +56,6 @@ ru: unlocked: "Ваша учётная запись разблокирована. Теперь вы вошли в систему." errors: messages: - already_confirmed: "уже подтверждена. Пожалуйста, попробуйте войти в систему" confirmation_period_expired: "Вы должны быть верифицированы в течение %{period}; пожалуйста повторите запрос снова." expired: "устарела. Пожалуйста, запросите новую" not_found: "не найдена" diff --git a/config/locales/sl-SI/devise.yml b/config/locales/sl-SI/devise.yml index 840d12b06..233b4fc11 100644 --- a/config/locales/sl-SI/devise.yml +++ b/config/locales/sl-SI/devise.yml @@ -8,6 +8,7 @@ sl: new_password: "Novo geslo" updated: "Geslo uspešno posodobljeno" confirmations: + already_confirmed: "Tvoj račun je že potrjen, vpiši se." confirmed: "Tvoj račun je potrjen." send_instructions: "V nekaj minutah dobiš e-pošto z navodili, kako ponastaviti svoje geslo." send_paranoid_instructions: "Če imamo tvoj e-naslov v bazi, v nekaj minutah dobiš e-pošto z navodili, kako ponastaviti svoje geslo." @@ -55,7 +56,6 @@ sl: unlocked: "Tvoj račun je odklenjen. Prosimo, vpiši se za nadaljevanje." errors: messages: - already_confirmed: "Tvoj račun je že potrjen, vpiši se." confirmation_period_expired: "Račun moraš potrditi v %{period}; prosimo ponovi zahtevo." expired: "je potekla; prosimo ponovi zahtevo." not_found: "ni mogoče najti." diff --git a/config/locales/so-SO/devise.yml b/config/locales/so-SO/devise.yml index e39d44a57..1e2bd6c28 100644 --- a/config/locales/so-SO/devise.yml +++ b/config/locales/so-SO/devise.yml @@ -8,6 +8,7 @@ so: new_password: "Fure cusub" updated: "Furahaga sirta ah si guul ah ayaa lo cusboneysiyey" confirmations: + already_confirmed: "Horeyba waa laguu xaqiijiyey; fadlan iskuday inaad saxiixdo." confirmed: "Your account has been confirmed." send_instructions: "Dhowr daqiiqadood waxaad heli doontaa email ah oo leh tilmaamo ku saabsan sida dib loogu bilaabo eraygaaga sirta ah." send_paranoid_instructions: "Haddii cinwaanka emailkaaga uu ku jiro xogtanada, dhowr daqiiqo waxaad heli doontaa email ah oo leh tilmaamo ku saabsan sida dib loogu bilaabo eraygaaga sirta ah." @@ -55,7 +56,6 @@ so: unlocked: "Koontadaada ayaa la furay. Fadlan gal si aad u sii wadato." errors: messages: - already_confirmed: "Horeyba waa laguu xaqiijiyey; fadlan iskuday inaad saxiixdo." confirmation_period_expired: "Waxaad ubaahan tahay in lagu xaqiijiyo gudaha boqolkiiba %{period} fadlan samee codsi ku celin." expired: "wuu dhacay; fadlan samee codsi ku celin." not_found: "lama helin." diff --git a/config/locales/sq-AL/devise.yml b/config/locales/sq-AL/devise.yml index f2a84dc47..aac6a288c 100644 --- a/config/locales/sq-AL/devise.yml +++ b/config/locales/sq-AL/devise.yml @@ -8,6 +8,7 @@ sq: new_password: "Fjalëkalim i ri" updated: "Fjalëkalimi u përditësua" confirmations: + already_confirmed: "Ju tashmë jeni verifikuar; lutemi të përpiqeni të identifikohesh." confirmed: "Llogaria jote është konfirmuar." send_instructions: "Në pak minuta do të merrni një email që përmban udhëzime se si të rivendosni fjalëkalimin tuaj." send_paranoid_instructions: "Nëse adresa juaj e e-mail është në bazën tonë të të dhënave, brenda pak minutash do të merrni një email që përmban udhëzime se si të rivendosni fjalëkalimin tuaj." @@ -55,7 +56,6 @@ sq: unlocked: "Llogaria juaj është hapur. Identifikohu për të vazhduar." errors: messages: - already_confirmed: "Ju tashmë jeni verifikuar; lutemi të përpiqeni të identifikohesh." confirmation_period_expired: "Duhet të verifikohesh brenda %{period}; ju lutemi bëni një kërkesë të përsëritur." expired: "ka skaduar; ju lutemi bëni një kërkesë të përsëritur." not_found: "nuk u gjet." diff --git a/config/locales/sr/devise.yml b/config/locales/sr/devise.yml index 3c6d3b8a3..d79ef2b33 100644 --- a/config/locales/sr/devise.yml +++ b/config/locales/sr/devise.yml @@ -8,6 +8,7 @@ sr: new_password: "Нова лозинка" updated: "Лозинка је ажурирана успешно" confirmations: + already_confirmed: "Ваш налог је потврђен; молимо вас да се поново пријавите." confirmed: "Ваш налог је одобрен." send_instructions: "За неколико минута ћете добити емаил са инструкцијама како да промените вашу лозинку." send_paranoid_instructions: "Ако је ваша емаил адреса у нашој бази података, за неколико минута ћете добити емаил са инструкцијама како да промените вашу лозинку." @@ -55,7 +56,6 @@ sr: unlocked: "Ваш налог је откључан. Молимо приступите како бисте наставили." errors: messages: - already_confirmed: "Ваш налог је потврђен; молимо вас да се поново пријавите." confirmation_period_expired: "Потребно је да потврдите ваш налог са%{period}; молимо поновите захтев за пријаву." expired: "је истекао; молимо вас да поново пошаљете захтев." not_found: "није пронађено." diff --git a/config/locales/sv-SE/devise.yml b/config/locales/sv-SE/devise.yml index a270fd87a..010dac459 100644 --- a/config/locales/sv-SE/devise.yml +++ b/config/locales/sv-SE/devise.yml @@ -8,6 +8,7 @@ sv: new_password: "Nytt lösenord" updated: "Lösenordet har uppdaterats" confirmations: + already_confirmed: "Du har redan verifierats. Försök logga in." confirmed: "Ditt konto har verifierats." send_instructions: "Du kommer strax att få ett e-postmeddelande med instruktioner för att återställa ditt lösenord." send_paranoid_instructions: "Om din e-postadress finns i vår databas kommer du strax att få ett e-postmeddelande med instruktioner för att återställa ditt lösenord." @@ -55,7 +56,6 @@ sv: unlocked: "Ditt konto har låsts upp. Logga in för att fortsätta." errors: messages: - already_confirmed: "Du har redan verifierats. Försök logga in." confirmation_period_expired: "Du behöver verifiera ditt konto inom %{period}. Vi ber dig skicka en ny förfrågan." expired: "är inte längre giltig. Vi ber dig göra en ny förfrågan." not_found: "hittades inte." diff --git a/config/locales/tr-TR/devise.yml b/config/locales/tr-TR/devise.yml index fcc10a45e..c54a32e88 100644 --- a/config/locales/tr-TR/devise.yml +++ b/config/locales/tr-TR/devise.yml @@ -8,6 +8,7 @@ tr: new_password: "Yeni şifre" updated: "Şifre başarıyla güncellendi" confirmations: + already_confirmed: "Hesabınız daha önce doğrulandı; lütfen giriş yapmayı deneyin." confirmed: "Hesabınız onaylanmıştır." send_instructions: "Birkaç dakika içinde şifrenizi tekrar oluşturmanız için gerekli olan açıklamaları içeren bir e-posta alacaksınız." send_paranoid_instructions: "E-posta adresiniz sistemimizde bulunuyorsa, birkaç dakika içinde şifrenizi tekrar oluşturmanız için bir bağlantı göndereceğiz." @@ -55,7 +56,6 @@ tr: unlocked: "Hesabınızın kilidi açıldı. Devam etmek için lütfen giriş yapın." errors: messages: - already_confirmed: "Hesabınız daha önce doğrulandı; lütfen giriş yapmayı deneyin." confirmation_period_expired: "Hesabınızın %{period} doğrulanmış olması gerekiyor; lütfen tekrar talep edin." expired: "süresi doldu; lütfen tekrar talep edin." not_found: "bulunamadı." diff --git a/config/locales/uk-UA/devise.yml b/config/locales/uk-UA/devise.yml index ee2f398bc..7aa74332c 100644 --- a/config/locales/uk-UA/devise.yml +++ b/config/locales/uk-UA/devise.yml @@ -8,6 +8,7 @@ uk-UA: new_password: "Новий пароль" updated: "Пароль оновлено" confirmations: + already_confirmed: "Ваш обліковий запис уже підтверджено; будь ласка, спробуйте увійти." confirmed: "Ваш обліковий запис підтверджено." send_instructions: "Через кілька хвилин на вашу адресу надійде електронний лист з інструкцією щодо скидання паролю." send_paranoid_instructions: "Якщо ваша електронна адреса міститься у нашій базі даних, через кілька хвилин на неї надійде електронний лист з інструкцією щодо скидання паролю." @@ -55,7 +56,6 @@ uk-UA: unlocked: "Ваш обліковий запис розблоковано. Будь ласка, увійдіть, щоб продовжити." errors: messages: - already_confirmed: "Ваш обліковий запис уже підтверджено; будь ласка, спробуйте увійти." confirmation_period_expired: "Ви повинні бути підтверджені протягом %{period}; будь ласка, зробіть повторний запит." expired: "закінчився термін дії; будь ласка, зробіть повторний запит." not_found: "не знайдено." diff --git a/config/locales/val/devise.yml b/config/locales/val/devise.yml index fc8d933d0..8a9b9ef4c 100644 --- a/config/locales/val/devise.yml +++ b/config/locales/val/devise.yml @@ -8,6 +8,7 @@ val: new_password: "Nova contrasenya" updated: "Contrasenya actualitzada amb èxit" confirmations: + already_confirmed: "Ya has segut confirmat, si us plau intenta iniciar sessió." confirmed: "El teu compte ha sigut confirmat. Per favor autentica't amb el teu usuari i contrasenya." send_instructions: "Rebràs un correu electrònic en uns minuts amb instruccions sobre com restablir la teua contrasenya." send_paranoid_instructions: "Si el teu correu electrònic existeix en la nostra base de dades rebràs un correu electrònic en uns minuts amb instruccions sobre com restablir la teua contrasenya." @@ -55,7 +56,6 @@ val: unlocked: "El teu compte ha sigut desbloquejat. Per favor inicia sessió per a continuar." errors: messages: - already_confirmed: "Ya has segut confirmat, si us plau intenta iniciar sessió." confirmation_period_expired: "Necessites ser confirmat en %{period}, si us plau torna a sol·licitarla." expired: "ha expirat, si us plau torna a sol·licitarla." not_found: "no s'ha trobat." diff --git a/config/locales/zh-CN/devise.yml b/config/locales/zh-CN/devise.yml index 41c5eafbb..612c0c149 100644 --- a/config/locales/zh-CN/devise.yml +++ b/config/locales/zh-CN/devise.yml @@ -8,6 +8,7 @@ zh-CN: new_password: "新密码" updated: "密码已成功更新" confirmations: + already_confirmed: "您已被核实；请尝试登录。" confirmed: "您的账号已确认。" send_instructions: "几分钟后，您将收到一封电子邮件，其中包含如何重设密码的说明。" send_paranoid_instructions: "如果您的电子邮件地址在我们的数据库中，几分钟后，您将收到一封电子邮件，其中包含如何重设密码的说明。" @@ -55,7 +56,6 @@ zh-CN: unlocked: "您的账号已解锁。请登录以继续。" errors: messages: - already_confirmed: "您已被核实；请尝试登录。" confirmation_period_expired: "您需要在%{period} 内被核实；请发出重复请求。" expired: "已过期；请发出重复请求。" not_found: "未找到。" diff --git a/config/locales/zh-TW/devise.yml b/config/locales/zh-TW/devise.yml index 9dd79934a..bd0b98034 100644 --- a/config/locales/zh-TW/devise.yml +++ b/config/locales/zh-TW/devise.yml @@ -8,6 +8,7 @@ zh-TW: new_password: "新密碼" updated: "密碼已成功更新" confirmations: + already_confirmed: "你已經被核實了；請嘗試登錄。" confirmed: "您的帳戶已被確認。" send_instructions: "幾分鐘後，您將收到一封電郵，內中包含如何重置密碼的說明。" send_paranoid_instructions: "如果您的電郵地址已在我們的數據庫中，您將在幾分鐘內收到一封電郵，內中包含如何重置密碼的說明。" @@ -55,7 +56,6 @@ zh-TW: unlocked: "您的帳戶已解鎖。 請登錄以繼續。" errors: messages: - already_confirmed: "你已經被核實了；請嘗試登錄。" confirmation_period_expired: "您要在%{period} 內被核實；請提出重複請求。" expired: "已過期；請提出重複請求。" not_found: "未找到。" From 985ab4faadf332602647135136cd949581c6ece6 Mon Sep 17 00:00:00 2001 From: Iraline Date: Wed, 27 Apr 2022 12:04:16 -0300 Subject: [PATCH 3/7] Tests to validate the flow of token already used --- .../users/confirmations_controller_spec.rb | 8 +++++++ spec/system/users_auth_spec.rb | 24 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/spec/controllers/users/confirmations_controller_spec.rb b/spec/controllers/users/confirmations_controller_spec.rb index 8cc54549d..d2209683a 100644 --- a/spec/controllers/users/confirmations_controller_spec.rb +++ b/spec/controllers/users/confirmations_controller_spec.rb @@ -9,5 +9,13 @@ describe Users::ConfirmationsController do it "returns a 404 code with a wrong token" do expect { get :show, params: { token: "non_existent" } }.to raise_error ActiveRecord::RecordNotFound end + + it "redirect to sign_in page with a existent token " do + user = create(:user, confirmation_token: "token1") + + get :show, params: { user: user, confirmation_token: "token1" } + + expect(response).to redirect_to(new_user_session_path) + end end end diff --git a/spec/system/users_auth_spec.rb b/spec/system/users_auth_spec.rb index 02eadcfd3..2afa44c6b 100644 --- a/spec/system/users_auth_spec.rb +++ b/spec/system/users_auth_spec.rb @@ -30,6 +30,30 @@ describe "Users" do expect(page).to have_content error_message end + + scenario "User already confirmed email with the token" do + message = "You have been sent a message containing a verification link. Please click on this link to activate your account." + visit "/" + click_link "Register" + + fill_in "Username", with: "Manuela Carmena" + fill_in "Email", with: "manuela@consul.dev" + fill_in "Password", with: "judgementday" + fill_in "Confirm password", with: "judgementday" + check "user_terms_of_service" + + click_button "Register" + + expect(page).to have_content message + + confirm_email + expect(page).to have_content "Your account has been confirmed." + + sent_token = /.*confirmation_token=(.*)".*/.match(ActionMailer::Base.deliveries.last.body.to_s)[1] + visit user_confirmation_path(confirmation_token: sent_token) + + expect(page).to have_content "You have already been verified; please attempt to sign in." + end end context "Sign in" do From 54ec44742b06fcfa56742d773725e6721c42e381 Mon Sep 17 00:00:00 2001 From: Iraline Date: Thu, 5 May 2022 14:52:18 -0300 Subject: [PATCH 4/7] pronto run --- app/controllers/users/confirmations_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb index e55308317..d7e3f7593 100644 --- a/app/controllers/users/confirmations_controller.rb +++ b/app/controllers/users/confirmations_controller.rb @@ -49,13 +49,13 @@ class Users::ConfirmationsController < Devise::ConfirmationsController elsif resource.errors.empty? set_official_position if resource.has_official_email? - if resource.confirmed_at + if resource.confirmed_at message = :already_confirmed else resource.confirm # Last change: confirm happens here for people with passwords instead of af the top of the show action message = :confirmed end - + set_flash_message(:notice, message) if is_flashing_format? respond_with_navigational(resource) { redirect_to after_confirmation_path_for(resource_name, resource) } else From 4fd6253a003895e0da6d866b05749ba80e7d6159 Mon Sep 17 00:00:00 2001 From: Iraline Date: Thu, 5 May 2022 16:54:56 -0300 Subject: [PATCH 5/7] Permit use confirmation token only when user create a new account or change the email --- app/controllers/users/confirmations_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb index d7e3f7593..667f96ee8 100644 --- a/app/controllers/users/confirmations_controller.rb +++ b/app/controllers/users/confirmations_controller.rb @@ -49,11 +49,11 @@ class Users::ConfirmationsController < Devise::ConfirmationsController elsif resource.errors.empty? set_official_position if resource.has_official_email? - if resource.confirmed_at - message = :already_confirmed - else + if !resource.confirmed_at || resource.unconfirmed_email resource.confirm # Last change: confirm happens here for people with passwords instead of af the top of the show action message = :confirmed + else + message = :already_confirmed end set_flash_message(:notice, message) if is_flashing_format? From df15838e1f3724534f63c120c3120a03b15c3e3e Mon Sep 17 00:00:00 2001 From: Iraline Date: Mon, 9 May 2022 14:49:52 -0300 Subject: [PATCH 6/7] Revert "Changing message location of user already confirmed" This reverts commit 996a2888e73655cd74c7ec9a0d52e60cc5105938. --- config/locales/ar/devise.yml | 2 +- config/locales/ast/devise.yml | 2 +- config/locales/bg-BG/devise.yml | 2 +- config/locales/bs-BA/devise.yml | 2 +- config/locales/ca/devise.yml | 2 +- config/locales/cs-CZ/devise.yml | 2 +- config/locales/da-DK/devise.yml | 2 +- config/locales/de-DE/devise.yml | 2 +- config/locales/el-GR/devise.yml | 2 +- config/locales/en/devise.yml | 2 +- config/locales/es-PE/devise.yml | 2 +- config/locales/es/devise.yml | 2 +- config/locales/eu-ES/devise.yml | 2 +- config/locales/fa-IR/devise.yml | 2 +- config/locales/fr/devise.yml | 2 +- config/locales/gl/devise.yml | 2 +- config/locales/he/devise.yml | 2 +- config/locales/hr-HR/devise.yml | 2 +- config/locales/id-ID/devise.yml | 2 +- config/locales/it/devise.yml | 2 +- config/locales/ka-GE/devise.yml | 2 +- config/locales/mk-MK/devise.yml | 2 +- config/locales/nl/devise.yml | 2 +- config/locales/oc-FR/devise.yml | 2 +- config/locales/pl-PL/devise.yml | 2 +- config/locales/pt-BR/devise.yml | 2 +- config/locales/ro-RO/devise.yml | 2 +- config/locales/ru/devise.yml | 2 +- config/locales/sl-SI/devise.yml | 2 +- config/locales/so-SO/devise.yml | 2 +- config/locales/sq-AL/devise.yml | 2 +- config/locales/sr/devise.yml | 2 +- config/locales/sv-SE/devise.yml | 2 +- config/locales/tr-TR/devise.yml | 2 +- config/locales/uk-UA/devise.yml | 2 +- config/locales/val/devise.yml | 2 +- config/locales/zh-CN/devise.yml | 2 +- config/locales/zh-TW/devise.yml | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/config/locales/ar/devise.yml b/config/locales/ar/devise.yml index b12270492..56acc1c8b 100644 --- a/config/locales/ar/devise.yml +++ b/config/locales/ar/devise.yml @@ -8,7 +8,6 @@ ar: new_password: "كلمة مرور جديدة" updated: "كلمة السر تغيرت بنجاح" confirmations: - already_confirmed: "تأكد بالفعل، من فضلك حاول تسجيل الدخول" confirmed: "أكد حسابك بنجاح. أنت الآن مسجل الدخول." send_instructions: "سوف تتلقى رسالة بريد إلكتروني مع تعليمات حول كيفية تأكيد حسابك في بضع دقائق." send_paranoid_instructions: "إذا كان لديك بريد إلكتروني موجود على قاعدة بياناتنا، سوف تتلقى رسالة بريد إلكتروني مع تعليمات حول كيفية تأكيد حسابك في بضع دقائق." @@ -56,6 +55,7 @@ ar: unlocked: "تم إعادة فتح حسابك بنجاح. الرجاء تسجيل الدخول للمتابعة." errors: messages: + already_confirmed: "تأكد بالفعل، من فضلك حاول تسجيل الدخول" confirmation_period_expired: "يجب التحقق من صحتك داحل %{period}؛ يرجى تقديم طلب تكرار." expired: "انتهت الصلاحية، يرجى طلب واحد جديد" not_found: "لا يوجد" diff --git a/config/locales/ast/devise.yml b/config/locales/ast/devise.yml index f5b0cb2c8..ef1ec1208 100644 --- a/config/locales/ast/devise.yml +++ b/config/locales/ast/devise.yml @@ -8,7 +8,6 @@ ast: new_password: "Nueva clave" updated: "Clave actualizá con ésitu" confirmations: - already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmed: "La to cuenta foi confirmada. Por favor amuesa que yes tu, cola to rede social o'l to usuariu y clave." send_instructions: "Vas Recibir un corréu electrónicu nunos minutos con instrucciones sobro cómo restablecer la to clave." send_paranoid_instructions: "Si'l to corréu electrónicu esiste na nuesa base de datos vas recibir un corréu electrónicu n'unos minutos con instrucciones sobro cómo restablecer la to clave." @@ -55,6 +54,7 @@ ast: unlocked: "Tu cuenta ha sido desbloqueada. Por favor inicia sesión para continuar." errors: messages: + already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmation_period_expired: "necesitas ser confirmado en %{period}, por favor vuelve a solicitarla." expired: "ha expirado, por favor vuelve a solicitarla." not_found: "no se ha encontrado." diff --git a/config/locales/bg-BG/devise.yml b/config/locales/bg-BG/devise.yml index 2375ebdd0..2ac51bfb2 100644 --- a/config/locales/bg-BG/devise.yml +++ b/config/locales/bg-BG/devise.yml @@ -8,7 +8,6 @@ bg: new_password: "Нова парола" updated: "Паролата е актуализирана успешно" confirmations: - already_confirmed: "Вече сте потвърдени; моля опитайте да влезете." confirmed: "Вашият профил е потвърден." send_instructions: "След няколко минути ще получите имейл, съдържащ инструкции как да промените паролата си." send_paranoid_instructions: "Ако вашият имейл адрес е в нашата база данни, след няколко минути ще получите имейл, съдържащ инструкции как да промените паролата си." @@ -56,6 +55,7 @@ bg: unlocked: "Вашият профил е отключен. Моля, влезте, за да продължите." errors: messages: + already_confirmed: "Вече сте потвърдени; моля опитайте да влезете." confirmation_period_expired: "Трябва да бъдете потвърдени в %{period}; моля, направете повторна заявка." expired: "изтекъл е; моля, направете повторна заявка." not_found: "не е намерено." diff --git a/config/locales/bs-BA/devise.yml b/config/locales/bs-BA/devise.yml index ef7e79867..c27ba6ef0 100644 --- a/config/locales/bs-BA/devise.yml +++ b/config/locales/bs-BA/devise.yml @@ -8,7 +8,6 @@ bs: new_password: "Nova lozinka" updated: "Lozinka uspješno ažurirana" confirmations: - already_confirmed: "Već je izvršena potvrda. Pokušajte se prijaviti." confirmed: "Vaš nalog je potvrđen." send_instructions: "Za nekoliko minuta ćete dobiti email sa instrukcijama kako da promijenite svoju lozinku." send_paranoid_instructions: "Ako je vaša email adresa u našoj bazi podataka, za nekoliko minuta ćete dobiti email sa instrukcijama kako da promijenite svoju lozinku." @@ -56,6 +55,7 @@ bs: unlocked: "Vaš nalog je otključan. Prijavite se da nastavite." errors: messages: + already_confirmed: "Već je izvršena potvrda. Pokušajte se prijaviti." confirmation_period_expired: "Morate dobiti potvrdu u roku od %{period}. Ponovite zahtjev." expired: "isteklo; ponovite zahtjev." not_found: "nije pronađeno." diff --git a/config/locales/ca/devise.yml b/config/locales/ca/devise.yml index 6b13e8024..b7b60f3ee 100644 --- a/config/locales/ca/devise.yml +++ b/config/locales/ca/devise.yml @@ -8,7 +8,6 @@ ca: new_password: "Nova contrasenya" updated: "Contrasenya actualitzada amb èxit" confirmations: - already_confirmed: "Ja heu estat verificats; intenteu iniciar la sessió." confirmed: "El teu compte ha sigut confirmat. Per favor autentica't amb el teu usuari i contrasenya" send_instructions: "Rebràs un correu electrònic en uns minuts amb instruccions sobre com restablir la teua contrasenya." send_paranoid_instructions: "Si el teu correu electrònic existeix en la nostra base de dades rebràs un correu electrònic en uns minuts amb instruccions sobre com restablir la teua contrasenya." @@ -56,6 +55,7 @@ ca: unlocked: "El teu compte ha sigut desbloquejat. Per favor inicia sessió per a continuar." errors: messages: + already_confirmed: "Ja heu estat verificats; intenteu iniciar la sessió." confirmation_period_expired: "Heu de ser verificat dins %{period}; feu una sol·licitud de repetició." expired: "ha expirat; feu una sol·licitud de repetició." not_found: "no trobat." diff --git a/config/locales/cs-CZ/devise.yml b/config/locales/cs-CZ/devise.yml index 9b498fa38..8b4c3cc80 100644 --- a/config/locales/cs-CZ/devise.yml +++ b/config/locales/cs-CZ/devise.yml @@ -8,7 +8,6 @@ cs: new_password: "Nové heslo" updated: "Heslo bylo úspěšně aktualizováno" confirmations: - already_confirmed: "Byl jste již ověřen; prosím, pokuste se přihlásit." confirmed: "Váš účet byl potvrzen." send_instructions: "Během pár minut obdržíte e-mail s pokyny k obnovení hesla." send_paranoid_instructions: "Je-li vaše e-mailová adresa v naší databázi, během pár minut obdržíte e-mail s pokyny k obnovení hesla." @@ -56,6 +55,7 @@ cs: unlocked: "Váš účet byl odemčen. Chcete-li pokračovat, přihlaste se." errors: messages: + already_confirmed: "Byl jste již ověřen; prosím, pokuste se přihlásit." confirmation_period_expired: "Musíte být ověřeni během %{period}; prosím, opakujte žádost." expired: "vypršela platnost; prosím, opakujte žádost." not_found: "nebylo nalezeno." diff --git a/config/locales/da-DK/devise.yml b/config/locales/da-DK/devise.yml index 48533200d..3d5d42fba 100644 --- a/config/locales/da-DK/devise.yml +++ b/config/locales/da-DK/devise.yml @@ -8,7 +8,6 @@ da: new_password: "Ny adgangskode" updated: "Din adgangskode blev opdateret" confirmations: - already_confirmed: "Du er allerede blevet verificeret; gå til log ind." confirmed: "Din brugerkonto er blevet bekræftet." send_instructions: "Om få minutter vil du modtage en e-mail, der instruerer dig i, hvordan du nulstiller din adgangskode." send_paranoid_instructions: "Hvis din e-mail findes i vores database, vil du om få minutter modtage en e-mail, der instruerer dig i, hvordan du nulstiller din adgangskode." @@ -56,6 +55,7 @@ da: unlocked: "Din konto er blevet genåbnet. Log ind for at fortsætte." errors: messages: + already_confirmed: "Du er allerede blevet verificeret; gå til log ind." confirmation_period_expired: "Du skal verificeres inden for denne %{period}; vær venlig at gentage anmodningen." expired: "er udløbet; vær venlig at gentage anmodningen." not_found: "ikke fundet." diff --git a/config/locales/de-DE/devise.yml b/config/locales/de-DE/devise.yml index 334734548..ab8eab7a1 100644 --- a/config/locales/de-DE/devise.yml +++ b/config/locales/de-DE/devise.yml @@ -8,7 +8,6 @@ de: new_password: "Neues Passwort" updated: "Passwort erfolgreich aktualisiert" confirmations: - already_confirmed: "Sie wurden bereits verifziert. Bitte melden Sie sich nun an." confirmed: "Ihr Konto wurde bestätigt." send_instructions: "In wenigen Minuten erhalten Sie eine E-Mail mit einer Anleitung zum Zurücksetzen Ihres Passworts." send_paranoid_instructions: "Wenn sich Ihre E-Mail-Adresse in unserer Datenbank befindet, erhalten Sie in wenigen Minuten eine E-Mail mit einer Anleitung zum Zurücksetzen Ihres Passworts." @@ -56,6 +55,7 @@ de: unlocked: "Ihr Konto wurde entsperrt. Bitte melden Sie sich an, um fortzufahren." errors: messages: + already_confirmed: "Sie wurden bereits verifziert. Bitte melden Sie sich nun an." confirmation_period_expired: "Ihr Konto muss innerhalb von %{period} verifiziert werden; bitte stellen Sie eine neue Anfrage." expired: "ist abgelaufen; bitte stellen Sie eine neue Anfrage." not_found: "nicht gefunden." diff --git a/config/locales/el-GR/devise.yml b/config/locales/el-GR/devise.yml index bcac9b0dc..cb0a69bc6 100644 --- a/config/locales/el-GR/devise.yml +++ b/config/locales/el-GR/devise.yml @@ -8,7 +8,6 @@ el: new_password: "Νέος κωδικός πρόσβασης" updated: "Ο κωδικός πρόσβασης ενημερώθηκε επιτυχώς" confirmations: - already_confirmed: "Ο λογαριασμός σας έχει επαληθευτεί, παρακαλούμε συνδεθείτε τώρα." confirmed: "Ο λογαριασμός σας έχει επιβεβαιωθεί." send_instructions: "Σε λίγα λεπτά θα λάβετε E-mail με οδηγίες για την επαναφορά του κωδικού πρόσβασής σας." send_paranoid_instructions: "Εάν η ηλεκτρονική σας διεύθυνση είναι καταχωρήμένη στη βάση δεδομένων μας, σε λίγα λεπτά θα λάβετε E-mail με οδηγίες για την επαναφορά του κωδικού πρόσβασης σας." @@ -56,6 +55,7 @@ el: unlocked: "Ο λογαριασμός σας έχει ξεκλειδωθεί. Συνδεθείτε για να συνεχίσετε." errors: messages: + already_confirmed: "Ο λογαριασμός σας έχει επαληθευτεί, παρακαλούμε συνδεθείτε τώρα." confirmation_period_expired: "Ο λογαριασμός σας πρέπει να επαληθευτεί εντός %{period}, καταχωρήσετε νέο αίτημα." expired: "Έχει λήξει. Παρακαλούμε όπως καταχωρήσετε νέο αίτημα." not_found: "δεν βρέθηκε." diff --git a/config/locales/en/devise.yml b/config/locales/en/devise.yml index ea00c1163..b338d7c14 100644 --- a/config/locales/en/devise.yml +++ b/config/locales/en/devise.yml @@ -8,7 +8,6 @@ en: new_password: "New password" updated: "Password successfully updated" confirmations: - already_confirmed: "You have already been verified; please attempt to sign in." confirmed: "Your account has been confirmed." send_instructions: "In a few minutes you will receive an email containing instructions on how to confirm your email address." send_paranoid_instructions: "If your email address exists in our database, in a few minutes you will receive an email with instructions on how to confirm your email address." @@ -56,6 +55,7 @@ en: unlocked: "Your account has been unlocked. Please sign in to continue." errors: messages: + already_confirmed: "You have already been verified; please attempt to sign in." confirmation_period_expired: "You need to be verified within %{period}; please make a repeat request." expired: "has expired; please make a repeat request." not_found: "not found." diff --git a/config/locales/es-PE/devise.yml b/config/locales/es-PE/devise.yml index eecba50fd..0e43f5017 100644 --- a/config/locales/es-PE/devise.yml +++ b/config/locales/es-PE/devise.yml @@ -8,7 +8,6 @@ es-PE: new_password: "Contraseña nueva" updated: "Contraseña actualizada con éxito" confirmations: - already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmed: "Tu cuenta ha sido confirmada. Por favor autentifícate con tu red social o tu usuario y contraseña" send_instructions: "Recibirás un correo electrónico en unos minutos con instrucciones sobre cómo restablecer tu contraseña." send_paranoid_instructions: "Si tu correo electrónico existe en nuestra base de datos recibirás un correo electrónico en unos minutos con instrucciones sobre cómo restablecer tu contraseña." @@ -55,6 +54,7 @@ es-PE: unlocked: "Tu cuenta ha sido desbloqueada. Por favor inicia sesión para continuar." errors: messages: + already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmation_period_expired: "necesitas ser confirmado en %{period}, por favor vuelve a solicitarla." expired: "ha expirado, por favor vuelve a solicitarla." not_found: "no se ha encontrado." diff --git a/config/locales/es/devise.yml b/config/locales/es/devise.yml index 41f154528..9bd10eff4 100644 --- a/config/locales/es/devise.yml +++ b/config/locales/es/devise.yml @@ -8,7 +8,6 @@ es: new_password: "Nueva contraseña" updated: "Contraseña actualizada con éxito" confirmations: - already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmed: "Tu cuenta ha sido confirmada. Por favor autentifícate con tu red social o tu usuario y contraseña" send_instructions: "Recibirás un correo electrónico en unos minutos con instrucciones sobre cómo confirmar tu cuenta." send_paranoid_instructions: "Si tu correo electrónico existe en nuestra base de datos recibirás un correo electrónico en unos minutos con instrucciones sobre cómo confirmar tu cuenta." @@ -56,6 +55,7 @@ es: unlocked: "Tu cuenta ha sido desbloqueada. Por favor inicia sesión para continuar." errors: messages: + already_confirmed: "ya has sido confirmado, por favor intenta iniciar sesión." confirmation_period_expired: "necesitas ser confirmado en %{period}, por favor vuelve a solicitarla." expired: "ha expirado, por favor vuelve a solicitarla." not_found: "no se ha encontrado." diff --git a/config/locales/eu-ES/devise.yml b/config/locales/eu-ES/devise.yml index e3e0197ad..c53175bed 100644 --- a/config/locales/eu-ES/devise.yml +++ b/config/locales/eu-ES/devise.yml @@ -8,7 +8,6 @@ eu: new_password: "Pasahitz berria" updated: "Pasahitza ondo aldatu da" confirmations: - already_confirmed: "Baieztatua izan zara. Mesedez, saioa hasten saiatu." confirmed: "Zure kontua baieztatu da. Mesedez, zure sare sozial edo reabiltzaile eta pasahitzarekin autentikatu zaitez" send_instructions: "Pasahitza berriz ezartzeko argibideak email bidez jasoko dituzu." send_paranoid_instructions: "Zure posta elektroniko helbidea gure datu basean badago, pasahitza berriz ezartzeko argibideak email bidez jasoko dituzu." @@ -56,6 +55,7 @@ eu: unlocked: "Zure kontua desbloketau egin da. Jarraitu ahal izateko saioa hasi." errors: messages: + already_confirmed: "Baieztatua izan zara. Mesedez, saioa hasten saiatu." confirmation_period_expired: "%{period} -(e)n baieztatu behar zara. Mesedez, berriz eskatu ezazu." expired: "iraungi da. Mesedez, berriz eskatu ezazu." not_found: "ez da bilatu." diff --git a/config/locales/fa-IR/devise.yml b/config/locales/fa-IR/devise.yml index 48eb710a0..fc9ca7985 100644 --- a/config/locales/fa-IR/devise.yml +++ b/config/locales/fa-IR/devise.yml @@ -8,7 +8,6 @@ fa: new_password: "رمز عبور جدید" updated: "کلمه عبور با موفقیت به روز رسانی شد." confirmations: - already_confirmed: "شما قبلا تایید شده اید لطفا تلاش کنید تا وارد سیستم شوید" confirmed: "حساب شما تایید شده است." send_instructions: "دقایقی بعد شما ایمیلی حاوی دستورالعمل در مورد چگونگی تنظیم مجدد رمز عبور خود را دریافت خواهید کرد." send_paranoid_instructions: "اگر آدرس ایمیل شما در پایگاه داده ما موجود باشد، در چند دقیقه شما ایمیلی حاوی دستورالعمل در مورد چگونگی رست کردن رمز عبور خود دریافت خواهید کرد." @@ -55,6 +54,7 @@ fa: unlocked: "حساب کاربری شما قفل شده است لطفا برای ادامه وارد شوید." errors: messages: + already_confirmed: "شما قبلا تایید شده اید لطفا تلاش کنید تا وارد سیستم شوید" confirmation_period_expired: "شما باید در%{period} تأیید شوید لطفاخواست را تکرار کنید" expired: "منقضی شده است؛ لطفا درخواست را تکرار کنید" not_found: "یافت نشد" diff --git a/config/locales/fr/devise.yml b/config/locales/fr/devise.yml index 8732edcda..f4c9d8a4f 100644 --- a/config/locales/fr/devise.yml +++ b/config/locales/fr/devise.yml @@ -8,7 +8,6 @@ fr: new_password: "Nouveau mot de passe" updated: "Mot de passe mis-à-jour avec succès" confirmations: - already_confirmed: "Votre compte a déjà été vérifié; veuillez essayer de vous connecter." confirmed: "Votre compte a été confirmé." send_instructions: "Dans quelques minutes, vous recevrez un courriel contenant les instructions pour réinitialiser votre mot de passe." send_paranoid_instructions: "Si votre adresse est dans notre base de données, vous recevrez dans quelques minutes un courriel contenant les instructions pour réinitialiser votre mot de passe." @@ -56,6 +55,7 @@ fr: unlocked: "Votre compte a été débloqué. Veuillez vous connecter pour continuer." errors: messages: + already_confirmed: "Votre compte a déjà été vérifié; veuillez essayer de vous connecter." confirmation_period_expired: "Votre compte doit être vérifié en %{period}; veuillez refaire une demande." expired: "a expiré; veuillez refaire une demande." not_found: "non trouvé." diff --git a/config/locales/gl/devise.yml b/config/locales/gl/devise.yml index 71af95d05..c5b57cc15 100644 --- a/config/locales/gl/devise.yml +++ b/config/locales/gl/devise.yml @@ -8,7 +8,6 @@ gl: new_password: "Contrasinal novo" updated: "O contrasinal actualizouse con éxito" confirmations: - already_confirmed: "xa fuches confirmado, por favor intenta iniciar sesión." confirmed: "A túa conta foi confirmada. Por favor, autentifícate coa túa rede social ou o teu usuario e contrasinal" send_instructions: "Recibirás un correo electrónico nuns minutos con instrucións sobre como restablecer o teu contrasinal." send_paranoid_instructions: "Se o teu correo electrónico existe na nosa base de datos recibirás un correo nuns minutos con instrucións sobre como restablecer o teu contrasinal." @@ -56,6 +55,7 @@ gl: unlocked: "A túa conta foi desbloqueada. Por favor, inicia sesión para continuar." errors: messages: + already_confirmed: "xa fuches confirmado, por favor intenta iniciar sesión." confirmation_period_expired: "necesitas ser confirmado en %{period}, por favor vólvea solicitar." expired: "expirou, por favor vólvea solicitar." not_found: "non se encontrou." diff --git a/config/locales/he/devise.yml b/config/locales/he/devise.yml index 885b372c9..e6833e811 100644 --- a/config/locales/he/devise.yml +++ b/config/locales/he/devise.yml @@ -8,7 +8,6 @@ he: new_password: "סיסמה חדשה" updated: "הסיסמה עודכנה בהצלחה" confirmations: - already_confirmed: "החשבון כבר אומת; נסה להיכנס." confirmed: "חשבונך אושר בהצלחה. כעת הנך מחובר/ת." send_instructions: "בדקות הקרובות יגיע אליך אימייל עם הנחיות כיצד לאשר את הרשמתך." send_paranoid_instructions: "אם כתובת הדואר האלקטרוני שלך נמצאת במאגר שלנו, בעוד כמה דקות תקבל הודעת דוא\"ל המכילה הוראות כיצד לאפס את סיסמתך." @@ -56,6 +55,7 @@ he: unlocked: "הנעילה הוסרה בהצלחה. התחבר בכדי להמשיך." errors: messages: + already_confirmed: "החשבון כבר אומת; נסה להיכנס." confirmation_period_expired: "חשבונך צריך להיות מופעל בתוך מסגרת הזמן %{period}; אנא חזור על הבקשה." expired: "הזמן פג, אנא חזור על הבקשה." not_found: "לא נמצא." diff --git a/config/locales/hr-HR/devise.yml b/config/locales/hr-HR/devise.yml index 5781b35d5..9e9aea21e 100644 --- a/config/locales/hr-HR/devise.yml +++ b/config/locales/hr-HR/devise.yml @@ -8,7 +8,6 @@ hr: new_password: "Nova zaporka" updated: "Zaporka je uspješno ažurirana" confirmations: - already_confirmed: "Vaš je račun već potvrđen; molimo vas da se pokušate prijaviti." confirmed: "Vaš račun je potvrđen." send_instructions: "U nekoliko minuta primit ćete e-mail koji sadrži upute za ponovno postavljanje zaporke." send_paranoid_instructions: "Ako je vaša e-mail adresa u našoj bazi podataka u nekoliko minuta ćete zaprimiti e-mail koji sadrži upute za ponovno postavljanje lozinke." @@ -56,6 +55,7 @@ hr: unlocked: "Vaš je račun otključan. Ponovno se prijavite da biste nastavili." errors: messages: + already_confirmed: "Vaš je račun već potvrđen; molimo vas da se pokušate prijaviti." confirmation_period_expired: "Potrebno je potvrditi Vaš račun s %{period}; molimo vas da ponovite zahtjev za prijavu." expired: "je istekao; molimo vas da ponovno pošaljete zahtjev." not_found: "nije pronađeno." diff --git a/config/locales/id-ID/devise.yml b/config/locales/id-ID/devise.yml index 5f6dba819..3fca093c9 100644 --- a/config/locales/id-ID/devise.yml +++ b/config/locales/id-ID/devise.yml @@ -8,7 +8,6 @@ id: new_password: "Kata sandi baru" updated: "Kata sandi berhasil diperbarui" confirmations: - already_confirmed: "Anda sudah diverifikasi; Silakan untuk mencoba masuk." confirmed: "Akun anda telah dikonfirmasi." send_instructions: "Dalam beberapa menit anda akan menerima email berisi petunjuk tentang cara mereset kata sandi anda." send_paranoid_instructions: "Jika alamat email anda ada di database kami, dalam beberapa menit anda akan menerima email berisi petunjuk tentang cara mereset kata sandi anda." @@ -56,6 +55,7 @@ id: unlocked: "Akun anda telah dibuka. Silakan masuk untuk melanjutkan." errors: messages: + already_confirmed: "Anda sudah diverifikasi; Silakan untuk mencoba masuk." confirmation_period_expired: "Anda perlu untuk diverifikasi dalam %{period}; silahkan buat sebuah permintaan berulang." expired: "sudah kadaluarsa, silakan membuat ulangi permintaan." not_found: "tidak ditemukan." diff --git a/config/locales/it/devise.yml b/config/locales/it/devise.yml index 5bf07c6a5..cab950d5f 100644 --- a/config/locales/it/devise.yml +++ b/config/locales/it/devise.yml @@ -8,7 +8,6 @@ it: new_password: "Nuova password" updated: "Password aggiornata correttamente" confirmations: - already_confirmed: "Hai già eseguito questa verifica; per favore, prova ad eseguire il log in." confirmed: "Il tuo account è stato confermato." send_instructions: "Tra pochi minuti riceverai un'e-mail contenente le istruzioni su come reimpostare la password." send_paranoid_instructions: "Se il tuo indirizzo email è nel nostro archivio, in pochi minuti riceverai un'e-mail contenente le istruzioni su come reimpostare la password." @@ -56,6 +55,7 @@ it: unlocked: "Il tuo account è stato sbloccato. Per favore, accedi per continuare." errors: messages: + already_confirmed: "Hai già eseguito questa verifica; per favore, prova ad eseguire il log in." confirmation_period_expired: "È necessario provvedere alla verifica entro %{period}; per favore, esegui nuovamente la richiesta." expired: "è scaduto; per cortesia, ripeti la richiesta." not_found: "non reperibile." diff --git a/config/locales/ka-GE/devise.yml b/config/locales/ka-GE/devise.yml index 8b07cf4bc..1f20b93b6 100644 --- a/config/locales/ka-GE/devise.yml +++ b/config/locales/ka-GE/devise.yml @@ -8,7 +8,6 @@ ka: new_password: "ახალი პაროლი" updated: "პაროლი წარმატებით განახლდა" confirmations: - already_confirmed: "თქვენ უკვე გაიარეთ გადამოწმება; გთხოვთ, სცადოთ სისტემაში შესვლა." confirmed: "თქვენი ანგარიში დადასტურდა." send_instructions: "რამოდენიმე წუთში შეტყობინების სახით მიიღებთ პაროლის აღდგენის ინსტრუქციას." send_paranoid_instructions: "თუ თქვენი ელ. ფოსტის მისამართი ჩვენს მონაცემთა ბაზაშია, რამოდენიმე წუთში შეტყობინების სახით მიიღებთ პაროლის აღდგენის ინსტრუქციას." @@ -56,6 +55,7 @@ ka: unlocked: "ანგარიში განბლოკილია. გაიარეთ ავტორიზაცია." errors: messages: + already_confirmed: "თქვენ უკვე გაიარეთ გადამოწმება; გთხოვთ, სცადოთ სისტემაში შესვლა." confirmation_period_expired: "თქვენი მონაცემების გადასამოწმებლად საჭიროა %{period}; გთხოვთ, ხელახლა გამოაგზავნოთ მოთხოვნა." expired: "ვადა გაუვიდა; გთხოვთ, ხელახლა გამოაგზავნოთ თხოვნა." not_found: "არ მოიძებნა." diff --git a/config/locales/mk-MK/devise.yml b/config/locales/mk-MK/devise.yml index 14487cc67..3bea85509 100644 --- a/config/locales/mk-MK/devise.yml +++ b/config/locales/mk-MK/devise.yml @@ -8,7 +8,6 @@ mk: new_password: "Нова лозинка" updated: "Успешно ажурирана лозинка" confirmations: - already_confirmed: "Веќе сте верификувани; ве молиме обидете се да се логирате." confirmed: "Вашиот профил е потврден." send_instructions: "За неколку минути ќе добиете електронска пошта со инструкции како да ја ресетирате вашата лозинка." send_paranoid_instructions: "Ако вашата електронска адреса е во нашата датабаза, за неколку минути ќе добиете електронска пошта со инструкции за како да ја ресетирате вашата лозинка." @@ -56,6 +55,7 @@ mk: unlocked: "Вашиот профил е отклучен. Ве молиме логирајте се за да продолжите." errors: messages: + already_confirmed: "Веќе сте верификувани; ве молиме обидете се да се логирате." confirmation_period_expired: "Мора да бидете верификувани во период од %{period}; ве молиме повторно испратете барање." expired: "истечено; ве молиме повторно испратете барање." not_found: "не е пронајдено." diff --git a/config/locales/nl/devise.yml b/config/locales/nl/devise.yml index 8e7d84ef9..034ba7e8c 100644 --- a/config/locales/nl/devise.yml +++ b/config/locales/nl/devise.yml @@ -8,7 +8,6 @@ nl: new_password: "Nieuw wachtwoord" updated: "Wachtwoord is aangepast" confirmations: - already_confirmed: "is reeds bevestigd" confirmed: "Uw account is bevestigd." send_instructions: "U ontvangt via e-mail instructies om uw account te bevestigen." send_paranoid_instructions: "Als uw e-mailadres bestaat in de database, ontvangt u via e-mail instructies hoe u uw account kunt bevestigen." @@ -56,6 +55,7 @@ nl: unlocked: "uw account is ontgrendeld. U kunt nu weer inloggen." errors: messages: + already_confirmed: "is reeds bevestigd" confirmation_period_expired: "moet worden bevestigd binnen %{period}, probeer het a.u.b. nog een keer" expired: "is verlopen, vraag een nieuwe aan\"" not_found: "niet gevonden" diff --git a/config/locales/oc-FR/devise.yml b/config/locales/oc-FR/devise.yml index e89686bb3..da1759ec9 100644 --- a/config/locales/oc-FR/devise.yml +++ b/config/locales/oc-FR/devise.yml @@ -8,7 +8,6 @@ oc: new_password: "Nòva contrasenya" updated: "Contrasenya actualizada amb succès" confirmations: - already_confirmed: "Sètz ja estats verificats; ensajatz iniciar la session." confirmed: "Lo tieu compte es estat confirmat. Per favor autentica't amb lo tieu usatgièr e contrasenya" send_instructions: "Recebràs un corrièr electronic en unas minutas amb instruccions sus coma restablir la tiá contrasenya." send_paranoid_instructions: "Se lo tieu corrièr electronic existís en la nòstra basa de donadas recebràs un corrièr electronic en unas minutas amb instruccions sus coma restablir la tiá contrasenya." @@ -56,6 +55,7 @@ oc: unlocked: "Lo tieu compte es estat desblocat. Per favor inícia session per contunhar." errors: messages: + already_confirmed: "Sètz ja estats verificats; ensajatz iniciar la session." confirmation_period_expired: "vos cal èsser verificat dins %{period}; fasètz una sollicitud de repeticion." expired: "A expirat; fasètz una sollicitud de repeticion." not_found: "pas trobat." diff --git a/config/locales/pl-PL/devise.yml b/config/locales/pl-PL/devise.yml index 996f30de9..2093b6ed5 100644 --- a/config/locales/pl-PL/devise.yml +++ b/config/locales/pl-PL/devise.yml @@ -8,7 +8,6 @@ pl: new_password: "Nowe hasło" updated: "Hasło pomyślnie zaktualizowane" confirmations: - already_confirmed: "Zostałeś/łaś już zweryfikowany/a; spróbuj się zalogować." confirmed: "Twoje konto zostało potwierdzone." send_instructions: "W ciągu kilku minut otrzymasz e-mail zawierający instrukcje dotyczące resetowania hasła." send_paranoid_instructions: "Jeśli Twój adres e-mail znajduje się w naszej bazie danych, w ciągu kilku minut otrzymasz e-mail zawierający instrukcje dotyczące resetowania hasła." @@ -56,6 +55,7 @@ pl: unlocked: "Twoje konto zostało odblokowane. Zaloguj się, by kontynuować." errors: messages: + already_confirmed: "Zostałeś/łaś już zweryfikowany/a; spróbuj się zalogować." confirmation_period_expired: "Musisz zostać zweryfikowany/a w ciągu %{period}; proszę wysłać ponowny wniosek." expired: "utracił/a ważność; proszę wysłać ponowny wniosek." not_found: "nie znaleziono." diff --git a/config/locales/pt-BR/devise.yml b/config/locales/pt-BR/devise.yml index 29ddf329c..2814ff81e 100644 --- a/config/locales/pt-BR/devise.yml +++ b/config/locales/pt-BR/devise.yml @@ -8,7 +8,6 @@ pt-BR: new_password: "Nova senha" updated: "Senha atualizada com sucesso" confirmations: - already_confirmed: "Você já foi verificado; por favor tente conectar-se a sua conta." confirmed: "Sua conta foi confirmada." send_instructions: "Em alguns minutos, você receberá um e-mail contendo instruções sobre como redefinir sua senha." send_paranoid_instructions: "Se o seu endereço de e-mail estiver em nosso banco de dados, em poucos minutos você receberá um e-mail com instruções sobre como redefinir sua senha." @@ -56,6 +55,7 @@ pt-BR: unlocked: "Sua conta foi desbloqueada. Por favor, conecte-se a sua conta para continuar." errors: messages: + already_confirmed: "Você já foi verificado; por favor tente conectar-se a sua conta." confirmation_period_expired: "Você precisa ser verificado dentro de %{period}; por favor, faça um pedido de repetição." expired: "expirou; por favor, faça um pedido de repetição." not_found: "não encontrado." diff --git a/config/locales/ro-RO/devise.yml b/config/locales/ro-RO/devise.yml index 42d91f4e8..ccb3ed5b3 100644 --- a/config/locales/ro-RO/devise.yml +++ b/config/locales/ro-RO/devise.yml @@ -8,7 +8,6 @@ ro: new_password: "Parola nouă" updated: "Parolă actualizată cu succes" confirmations: - already_confirmed: "Ați fost deja verificat; vă rugăm încercați să vă conectați." confirmed: "Contul dumneavoastră a fost confirmat." send_instructions: "În câteva minute veți primi un email care conține instrucțiuni despre cum vă puteți reseta parola." send_paranoid_instructions: "Dacă adresa dumneavoastră de email se află în baza noastră de date, în câteva minute veți primi un email care conține instrucțiuni despre cum vă puteți reseta parola." @@ -56,6 +55,7 @@ ro: unlocked: "Contul dvs. a fost deblocat. Vă rugăm să vă conectați pentru a continua." errors: messages: + already_confirmed: "Ați fost deja verificat; vă rugăm încercați să vă conectați." confirmation_period_expired: "Trebuie să fiți verificat în %{period}; vă rugăm să faceți o solicitare repetată." expired: "a expirat; vă rugăm să faceți o solicitare repetată." not_found: "nu a fost găsit." diff --git a/config/locales/ru/devise.yml b/config/locales/ru/devise.yml index 17d006fcc..6a77ec2e1 100644 --- a/config/locales/ru/devise.yml +++ b/config/locales/ru/devise.yml @@ -8,7 +8,6 @@ ru: new_password: "Новый пароль" updated: "Пароль успешно обновлён" confirmations: - already_confirmed: "уже подтверждена. Пожалуйста, попробуйте войти в систему" confirmed: "Ваша учётная запись подтверждена. Теперь вы вошли в систему." send_instructions: "В течение нескольких минут вы получите письмо с инструкциями по подтверждению вашей учётной записи." send_paranoid_instructions: "Если ваш адрес e-mail есть в нашей базе данных, то в течение нескольких минут вы получите письмо с инструкциями по подтверждению вашей учётной записи." @@ -56,6 +55,7 @@ ru: unlocked: "Ваша учётная запись разблокирована. Теперь вы вошли в систему." errors: messages: + already_confirmed: "уже подтверждена. Пожалуйста, попробуйте войти в систему" confirmation_period_expired: "Вы должны быть верифицированы в течение %{period}; пожалуйста повторите запрос снова." expired: "устарела. Пожалуйста, запросите новую" not_found: "не найдена" diff --git a/config/locales/sl-SI/devise.yml b/config/locales/sl-SI/devise.yml index 233b4fc11..840d12b06 100644 --- a/config/locales/sl-SI/devise.yml +++ b/config/locales/sl-SI/devise.yml @@ -8,7 +8,6 @@ sl: new_password: "Novo geslo" updated: "Geslo uspešno posodobljeno" confirmations: - already_confirmed: "Tvoj račun je že potrjen, vpiši se." confirmed: "Tvoj račun je potrjen." send_instructions: "V nekaj minutah dobiš e-pošto z navodili, kako ponastaviti svoje geslo." send_paranoid_instructions: "Če imamo tvoj e-naslov v bazi, v nekaj minutah dobiš e-pošto z navodili, kako ponastaviti svoje geslo." @@ -56,6 +55,7 @@ sl: unlocked: "Tvoj račun je odklenjen. Prosimo, vpiši se za nadaljevanje." errors: messages: + already_confirmed: "Tvoj račun je že potrjen, vpiši se." confirmation_period_expired: "Račun moraš potrditi v %{period}; prosimo ponovi zahtevo." expired: "je potekla; prosimo ponovi zahtevo." not_found: "ni mogoče najti." diff --git a/config/locales/so-SO/devise.yml b/config/locales/so-SO/devise.yml index 1e2bd6c28..e39d44a57 100644 --- a/config/locales/so-SO/devise.yml +++ b/config/locales/so-SO/devise.yml @@ -8,7 +8,6 @@ so: new_password: "Fure cusub" updated: "Furahaga sirta ah si guul ah ayaa lo cusboneysiyey" confirmations: - already_confirmed: "Horeyba waa laguu xaqiijiyey; fadlan iskuday inaad saxiixdo." confirmed: "Your account has been confirmed." send_instructions: "Dhowr daqiiqadood waxaad heli doontaa email ah oo leh tilmaamo ku saabsan sida dib loogu bilaabo eraygaaga sirta ah." send_paranoid_instructions: "Haddii cinwaanka emailkaaga uu ku jiro xogtanada, dhowr daqiiqo waxaad heli doontaa email ah oo leh tilmaamo ku saabsan sida dib loogu bilaabo eraygaaga sirta ah." @@ -56,6 +55,7 @@ so: unlocked: "Koontadaada ayaa la furay. Fadlan gal si aad u sii wadato." errors: messages: + already_confirmed: "Horeyba waa laguu xaqiijiyey; fadlan iskuday inaad saxiixdo." confirmation_period_expired: "Waxaad ubaahan tahay in lagu xaqiijiyo gudaha boqolkiiba %{period} fadlan samee codsi ku celin." expired: "wuu dhacay; fadlan samee codsi ku celin." not_found: "lama helin." diff --git a/config/locales/sq-AL/devise.yml b/config/locales/sq-AL/devise.yml index aac6a288c..f2a84dc47 100644 --- a/config/locales/sq-AL/devise.yml +++ b/config/locales/sq-AL/devise.yml @@ -8,7 +8,6 @@ sq: new_password: "Fjalëkalim i ri" updated: "Fjalëkalimi u përditësua" confirmations: - already_confirmed: "Ju tashmë jeni verifikuar; lutemi të përpiqeni të identifikohesh." confirmed: "Llogaria jote është konfirmuar." send_instructions: "Në pak minuta do të merrni një email që përmban udhëzime se si të rivendosni fjalëkalimin tuaj." send_paranoid_instructions: "Nëse adresa juaj e e-mail është në bazën tonë të të dhënave, brenda pak minutash do të merrni një email që përmban udhëzime se si të rivendosni fjalëkalimin tuaj." @@ -56,6 +55,7 @@ sq: unlocked: "Llogaria juaj është hapur. Identifikohu për të vazhduar." errors: messages: + already_confirmed: "Ju tashmë jeni verifikuar; lutemi të përpiqeni të identifikohesh." confirmation_period_expired: "Duhet të verifikohesh brenda %{period}; ju lutemi bëni një kërkesë të përsëritur." expired: "ka skaduar; ju lutemi bëni një kërkesë të përsëritur." not_found: "nuk u gjet." diff --git a/config/locales/sr/devise.yml b/config/locales/sr/devise.yml index d79ef2b33..3c6d3b8a3 100644 --- a/config/locales/sr/devise.yml +++ b/config/locales/sr/devise.yml @@ -8,7 +8,6 @@ sr: new_password: "Нова лозинка" updated: "Лозинка је ажурирана успешно" confirmations: - already_confirmed: "Ваш налог је потврђен; молимо вас да се поново пријавите." confirmed: "Ваш налог је одобрен." send_instructions: "За неколико минута ћете добити емаил са инструкцијама како да промените вашу лозинку." send_paranoid_instructions: "Ако је ваша емаил адреса у нашој бази података, за неколико минута ћете добити емаил са инструкцијама како да промените вашу лозинку." @@ -56,6 +55,7 @@ sr: unlocked: "Ваш налог је откључан. Молимо приступите како бисте наставили." errors: messages: + already_confirmed: "Ваш налог је потврђен; молимо вас да се поново пријавите." confirmation_period_expired: "Потребно је да потврдите ваш налог са%{period}; молимо поновите захтев за пријаву." expired: "је истекао; молимо вас да поново пошаљете захтев." not_found: "није пронађено." diff --git a/config/locales/sv-SE/devise.yml b/config/locales/sv-SE/devise.yml index 010dac459..a270fd87a 100644 --- a/config/locales/sv-SE/devise.yml +++ b/config/locales/sv-SE/devise.yml @@ -8,7 +8,6 @@ sv: new_password: "Nytt lösenord" updated: "Lösenordet har uppdaterats" confirmations: - already_confirmed: "Du har redan verifierats. Försök logga in." confirmed: "Ditt konto har verifierats." send_instructions: "Du kommer strax att få ett e-postmeddelande med instruktioner för att återställa ditt lösenord." send_paranoid_instructions: "Om din e-postadress finns i vår databas kommer du strax att få ett e-postmeddelande med instruktioner för att återställa ditt lösenord." @@ -56,6 +55,7 @@ sv: unlocked: "Ditt konto har låsts upp. Logga in för att fortsätta." errors: messages: + already_confirmed: "Du har redan verifierats. Försök logga in." confirmation_period_expired: "Du behöver verifiera ditt konto inom %{period}. Vi ber dig skicka en ny förfrågan." expired: "är inte längre giltig. Vi ber dig göra en ny förfrågan." not_found: "hittades inte." diff --git a/config/locales/tr-TR/devise.yml b/config/locales/tr-TR/devise.yml index c54a32e88..fcc10a45e 100644 --- a/config/locales/tr-TR/devise.yml +++ b/config/locales/tr-TR/devise.yml @@ -8,7 +8,6 @@ tr: new_password: "Yeni şifre" updated: "Şifre başarıyla güncellendi" confirmations: - already_confirmed: "Hesabınız daha önce doğrulandı; lütfen giriş yapmayı deneyin." confirmed: "Hesabınız onaylanmıştır." send_instructions: "Birkaç dakika içinde şifrenizi tekrar oluşturmanız için gerekli olan açıklamaları içeren bir e-posta alacaksınız." send_paranoid_instructions: "E-posta adresiniz sistemimizde bulunuyorsa, birkaç dakika içinde şifrenizi tekrar oluşturmanız için bir bağlantı göndereceğiz." @@ -56,6 +55,7 @@ tr: unlocked: "Hesabınızın kilidi açıldı. Devam etmek için lütfen giriş yapın." errors: messages: + already_confirmed: "Hesabınız daha önce doğrulandı; lütfen giriş yapmayı deneyin." confirmation_period_expired: "Hesabınızın %{period} doğrulanmış olması gerekiyor; lütfen tekrar talep edin." expired: "süresi doldu; lütfen tekrar talep edin." not_found: "bulunamadı." diff --git a/config/locales/uk-UA/devise.yml b/config/locales/uk-UA/devise.yml index 7aa74332c..ee2f398bc 100644 --- a/config/locales/uk-UA/devise.yml +++ b/config/locales/uk-UA/devise.yml @@ -8,7 +8,6 @@ uk-UA: new_password: "Новий пароль" updated: "Пароль оновлено" confirmations: - already_confirmed: "Ваш обліковий запис уже підтверджено; будь ласка, спробуйте увійти." confirmed: "Ваш обліковий запис підтверджено." send_instructions: "Через кілька хвилин на вашу адресу надійде електронний лист з інструкцією щодо скидання паролю." send_paranoid_instructions: "Якщо ваша електронна адреса міститься у нашій базі даних, через кілька хвилин на неї надійде електронний лист з інструкцією щодо скидання паролю." @@ -56,6 +55,7 @@ uk-UA: unlocked: "Ваш обліковий запис розблоковано. Будь ласка, увійдіть, щоб продовжити." errors: messages: + already_confirmed: "Ваш обліковий запис уже підтверджено; будь ласка, спробуйте увійти." confirmation_period_expired: "Ви повинні бути підтверджені протягом %{period}; будь ласка, зробіть повторний запит." expired: "закінчився термін дії; будь ласка, зробіть повторний запит." not_found: "не знайдено." diff --git a/config/locales/val/devise.yml b/config/locales/val/devise.yml index 8a9b9ef4c..fc8d933d0 100644 --- a/config/locales/val/devise.yml +++ b/config/locales/val/devise.yml @@ -8,7 +8,6 @@ val: new_password: "Nova contrasenya" updated: "Contrasenya actualitzada amb èxit" confirmations: - already_confirmed: "Ya has segut confirmat, si us plau intenta iniciar sessió." confirmed: "El teu compte ha sigut confirmat. Per favor autentica't amb el teu usuari i contrasenya." send_instructions: "Rebràs un correu electrònic en uns minuts amb instruccions sobre com restablir la teua contrasenya." send_paranoid_instructions: "Si el teu correu electrònic existeix en la nostra base de dades rebràs un correu electrònic en uns minuts amb instruccions sobre com restablir la teua contrasenya." @@ -56,6 +55,7 @@ val: unlocked: "El teu compte ha sigut desbloquejat. Per favor inicia sessió per a continuar." errors: messages: + already_confirmed: "Ya has segut confirmat, si us plau intenta iniciar sessió." confirmation_period_expired: "Necessites ser confirmat en %{period}, si us plau torna a sol·licitarla." expired: "ha expirat, si us plau torna a sol·licitarla." not_found: "no s'ha trobat." diff --git a/config/locales/zh-CN/devise.yml b/config/locales/zh-CN/devise.yml index 612c0c149..41c5eafbb 100644 --- a/config/locales/zh-CN/devise.yml +++ b/config/locales/zh-CN/devise.yml @@ -8,7 +8,6 @@ zh-CN: new_password: "新密码" updated: "密码已成功更新" confirmations: - already_confirmed: "您已被核实；请尝试登录。" confirmed: "您的账号已确认。" send_instructions: "几分钟后，您将收到一封电子邮件，其中包含如何重设密码的说明。" send_paranoid_instructions: "如果您的电子邮件地址在我们的数据库中，几分钟后，您将收到一封电子邮件，其中包含如何重设密码的说明。" @@ -56,6 +55,7 @@ zh-CN: unlocked: "您的账号已解锁。请登录以继续。" errors: messages: + already_confirmed: "您已被核实；请尝试登录。" confirmation_period_expired: "您需要在%{period} 内被核实；请发出重复请求。" expired: "已过期；请发出重复请求。" not_found: "未找到。" diff --git a/config/locales/zh-TW/devise.yml b/config/locales/zh-TW/devise.yml index bd0b98034..9dd79934a 100644 --- a/config/locales/zh-TW/devise.yml +++ b/config/locales/zh-TW/devise.yml @@ -8,7 +8,6 @@ zh-TW: new_password: "新密碼" updated: "密碼已成功更新" confirmations: - already_confirmed: "你已經被核實了；請嘗試登錄。" confirmed: "您的帳戶已被確認。" send_instructions: "幾分鐘後，您將收到一封電郵，內中包含如何重置密碼的說明。" send_paranoid_instructions: "如果您的電郵地址已在我們的數據庫中，您將在幾分鐘內收到一封電郵，內中包含如何重置密碼的說明。" @@ -56,6 +55,7 @@ zh-TW: unlocked: "您的帳戶已解鎖。 請登錄以繼續。" errors: messages: + already_confirmed: "你已經被核實了；請嘗試登錄。" confirmation_period_expired: "您要在%{period} 內被核實；請提出重複請求。" expired: "已過期；請提出重複請求。" not_found: "未找到。" From 0195eac3fab5bda556fbc9991669815a422d3df4 Mon Sep 17 00:00:00 2001 From: Iraline Date: Mon, 9 May 2022 18:14:12 -0300 Subject: [PATCH 7/7] change the code to use what Devise does by default and update the tests --- app/controllers/users/confirmations_controller.rb | 11 ++++------- .../users/confirmations_controller_spec.rb | 10 +++++++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb index 667f96ee8..589de5e94 100644 --- a/app/controllers/users/confirmations_controller.rb +++ b/app/controllers/users/confirmations_controller.rb @@ -49,15 +49,12 @@ class Users::ConfirmationsController < Devise::ConfirmationsController elsif resource.errors.empty? set_official_position if resource.has_official_email? - if !resource.confirmed_at || resource.unconfirmed_email - resource.confirm # Last change: confirm happens here for people with passwords instead of af the top of the show action - message = :confirmed + if resource.confirm + set_flash_message(:notice, :confirmed) if is_flashing_format? + respond_with_navigational(resource) { redirect_to after_confirmation_path_for(resource_name, resource) } else - message = :already_confirmed + respond_with_navigational(resource.errors, status: :unprocessable_entity) { render :new, status: :unprocessable_entity } end - - set_flash_message(:notice, message) if is_flashing_format? - respond_with_navigational(resource) { redirect_to after_confirmation_path_for(resource_name, resource) } else respond_with_navigational(resource.errors, status: :unprocessable_entity) { render :new } end diff --git a/spec/controllers/users/confirmations_controller_spec.rb b/spec/controllers/users/confirmations_controller_spec.rb index d2209683a..d28188aa3 100644 --- a/spec/controllers/users/confirmations_controller_spec.rb +++ b/spec/controllers/users/confirmations_controller_spec.rb @@ -10,11 +10,19 @@ describe Users::ConfirmationsController do expect { get :show, params: { token: "non_existent" } }.to raise_error ActiveRecord::RecordNotFound end - it "redirect to sign_in page with a existent token " do + it "returns a 422 code with a existent and used token " do user = create(:user, confirmation_token: "token1") get :show, params: { user: user, confirmation_token: "token1" } + expect(response).to have_http_status(:unprocessable_entity) + end + + it "redirect to sign_in page with a existent and not used token " do + user = create(:user, confirmation_token: "token1", confirmed_at: "") + + get :show, params: { user: user, confirmation_token: "token1" } + expect(response).to redirect_to(new_user_session_path) end end