diff options
51 files changed, 4 insertions, 50 deletions
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 27db70836..dfe229526 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -103,7 +103,9 @@ class AccountController < ApplicationController user = User.find_by_mail(email) # user not found unless user - flash.now[:error] = l(:notice_account_unknown_email) + # Don't show an error indicating a non-existent email address + # to prevent email harvesting + flash[:notice] = l(:notice_account_lost_email_sent) return end unless user.active? diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 3ace6bbee..6f50f8f7b 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -156,7 +156,6 @@ ar: notice_account_password_updated: لقد تم تجديد كلمة المرور بنجاح. notice_account_wrong_password: كلمة المرور غير صحيحة notice_account_register_done: لقد تم انشاء حسابك بنجاح، الرجاء تأكيد الطلب من البريد الالكتروني - notice_account_unknown_email: مستخدم غير معروف. notice_can_t_change_password: هذا الحساب يستخدم جهاز خارجي غير مصرح به لا يمكن تغير كلمة المرور notice_account_lost_email_sent: لقد تم ارسال رسالة على بريدك بالتعليمات اللازمة لتغير كلمة المرور notice_account_activated: لقد تم تفعيل حسابك، يمكنك الدخول الان diff --git a/config/locales/az.yml b/config/locales/az.yml index ad429c5f6..99f1f1863 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -735,7 +735,6 @@ az: notice_account_password_updated: Parol müvəffəqiyyətlə yeniləndi. notice_account_pending: "Sizin uçot qeydiniz yaradıldı və inzibatçının təsdiqini gözləyir." notice_account_register_done: Uçot qeydi müvəffəqiyyətlə yaradıldı. Sizin uçot qeydinizin aktivləşdirilməsi üçün elektron poçtunuza göndərilən linkə keçin. - notice_account_unknown_email: Naməlum istifadəçi. notice_account_updated: Uçot qeydi müvəffəqiyyətlə yeniləndi. notice_account_wrong_password: Parol düzgün deyildir notice_can_t_change_password: Bu uçot qeydi üçün xarici autentifikasiya mənbəyi istifadə olunur. Parolu dəyişmək mümkün deyildir. diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 666705181..ddc5689d9 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -159,7 +159,6 @@ bg: notice_account_wrong_password: Грешна парола notice_account_register_done: Профилът е създаден успешно. E-mail, съдържащ инструкции за активиране на профила е изпратен на %{email}. - notice_account_unknown_email: Непознат e-mail. notice_account_not_activated_yet: Вие не сте активирали вашия профил все още. Ако искате да получите нов e-mail за активиране, моля <a href="%{url}">натиснете тази връзка</a>. notice_account_locked: Вашият профил е блокиран. diff --git a/config/locales/bs.yml b/config/locales/bs.yml index f0687866c..db19c4c47 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -169,7 +169,6 @@ bs: notice_account_password_updated: Lozinka je uspješno promjenjena. notice_account_pending: "Vaš nalog je kreiran i čeka odobrenje administratora." notice_account_register_done: Nalog je uspješno kreiran. Da bi ste aktivirali vaš nalog kliknite na link koji vam je poslat. - notice_account_unknown_email: Nepoznati korisnik. notice_account_updated: Nalog je uspješno promjenen. notice_account_wrong_password: Pogrešna lozinka notice_can_t_change_password: Ovaj nalog koristi eksterni izvor prijavljivanja. Ne mogu da promjenim šifru. diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 8e6908f9e..d58c0b22a 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -161,7 +161,6 @@ ca: notice_account_password_updated: "La contrasenya s'ha modificat correctament." notice_account_wrong_password: "Contrasenya incorrecta" notice_account_register_done: "El compte s'ha creat correctament. Per a activar el compte, feu clic en l'enllaç que us han enviat per correu electrònic." - notice_account_unknown_email: "Usuari desconegut." notice_can_t_change_password: "Aquest compte utilitza una font d'autenticació externa. No és possible canviar la contrasenya." notice_account_lost_email_sent: "S'ha enviat un correu electrònic amb instruccions per a seleccionar una contrasenya nova." notice_account_activated: "El compte s'ha activat correctament. Ara ja podeu entrar." diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 0595c2d05..91d62c7b2 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -161,7 +161,6 @@ cs: notice_account_password_updated: Heslo bylo úspěšně změněno. notice_account_wrong_password: Chybné heslo notice_account_register_done: Účet byl úspěšně vytvořen. Pro aktivaci účtu klikněte na odkaz v emailu, který vám byl zaslán. - notice_account_unknown_email: Neznámý uživatel. notice_can_t_change_password: Tento účet používá externí autentifikaci. Zde heslo změnit nemůžete. notice_account_lost_email_sent: Byl vám zaslán email s intrukcemi jak si nastavíte nové heslo. notice_account_activated: Váš účet byl aktivován. Nyní se můžete přihlásit. diff --git a/config/locales/da.yml b/config/locales/da.yml index eef8b2b71..52a787d6d 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -174,7 +174,6 @@ da: notice_account_password_updated: Kodeordet er opdateret. notice_account_wrong_password: Forkert kodeord notice_account_register_done: Kontoen er oprettet. For at aktivere kontoen skal du klikke på linket i den tilsendte email. - notice_account_unknown_email: Ukendt bruger. notice_can_t_change_password: Denne konto benytter en ekstern sikkerhedsgodkendelse. Det er ikke muligt at skifte kodeord. notice_account_lost_email_sent: En email med instruktioner til at vælge et nyt kodeord er afsendt til dig. notice_account_activated: Din konto er aktiveret. Du kan nu logge ind. diff --git a/config/locales/de.yml b/config/locales/de.yml index 9ac76f852..b1094a18f 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -875,7 +875,6 @@ de: notice_account_password_updated: Passwort wurde erfolgreich aktualisiert. notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Genehmigung des Administrators." notice_account_register_done: Konto wurde erfolgreich angelegt. Eine E-Mail mit Hinweisen zur Kontoaktivierung wurde an %{email} gesendet. - notice_account_unknown_email: Unbekannter Benutzer. notice_account_updated: Konto wurde erfolgreich aktualisiert. notice_account_wrong_password: Falsches Passwort. notice_api_access_key_reseted: Ihr API-Zugriffsschlüssel wurde zurückgesetzt. diff --git a/config/locales/el.yml b/config/locales/el.yml index 98287b356..559df9b28 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -158,7 +158,6 @@ el: notice_account_password_updated: Ο κωδικός πρόσβασης ενημερώθηκε επιτυχώς. notice_account_wrong_password: Λάθος κωδικός πρόσβασης notice_account_register_done: Ο λογαριασμός δημιουργήθηκε επιτυχώς. Για να ενεργοποιήσετε το λογαριασμό σας, πατήστε το σύνδεσμο που σας έχει αποσταλεί με email. - notice_account_unknown_email: Άγνωστος χρήστης. notice_can_t_change_password: Αυτός ο λογαριασμός χρησιμοποιεί εξωτερική πηγή πιστοποίησης. Δεν είναι δυνατόν να αλλάξετε τον κωδικό πρόσβασης. notice_account_lost_email_sent: Σας έχει αποσταλεί email με οδηγίες για την επιλογή νέου κωδικού πρόσβασης. notice_account_activated: Ο λογαριασμός σας έχει ενεργοποιηθεί. Τώρα μπορείτε να συνδεθείτε. diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 51cb7372d..cb55d2fe8 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -161,7 +161,6 @@ en-GB: notice_account_password_updated: Password was successfully updated. notice_account_wrong_password: Wrong password notice_account_register_done: Account was successfully created. An email containing the instructions to activate your account was sent to %{email}. - notice_account_unknown_email: Unknown user. notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password. notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you. notice_account_activated: Your account has been activated. You can now log in. diff --git a/config/locales/en.yml b/config/locales/en.yml index 64d09c8cf..8713f31df 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -157,7 +157,6 @@ en: notice_account_password_updated: Password was successfully updated. notice_account_wrong_password: Wrong password notice_account_register_done: Account was successfully created. An email containing the instructions to activate your account was sent to %{email}. - notice_account_unknown_email: Unknown user. notice_account_not_activated_yet: You haven't activated your account yet. If you want to receive a new activation email, please <a href="%{url}">click this link</a>. notice_account_locked: Your account is locked. notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password. diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml index 1deb6c2b6..40b5d77ca 100644 --- a/config/locales/es-PA.yml +++ b/config/locales/es-PA.yml @@ -665,7 +665,6 @@ es-PA: notice_account_password_updated: Contraseña modificada correctamente. notice_account_pending: "Su cuenta ha sido creada y está pendiende de la aprobación por parte del administrador." notice_account_register_done: Cuenta creada correctamente. Para activarla, haga clic sobre el enlace que le ha sido enviado por correo. - notice_account_unknown_email: Usuario desconocido. notice_account_updated: Cuenta actualizada correctamente. notice_account_wrong_password: Contraseña incorrecta. notice_can_t_change_password: Esta cuenta utiliza una fuente de autenticación externa. No es posible cambiar la contraseña. diff --git a/config/locales/es.yml b/config/locales/es.yml index 293595219..935072175 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -663,7 +663,6 @@ es: notice_account_password_updated: Contraseña modificada correctamente. notice_account_pending: "Su cuenta ha sido creada y está pendiende de la aprobación por parte del administrador." notice_account_register_done: Cuenta creada correctamente. Para activarla, haga clic sobre el enlace que le ha sido enviado por correo. - notice_account_unknown_email: Usuario desconocido. notice_account_updated: Cuenta actualizada correctamente. notice_account_wrong_password: Contraseña incorrecta. notice_can_t_change_password: Esta cuenta utiliza una fuente de autenticación externa. No es posible cambiar la contraseña. diff --git a/config/locales/et.yml b/config/locales/et.yml index 3e13840eb..d0e0c58cd 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -174,7 +174,6 @@ et: notice_account_password_updated: "Parooli uuendamine õnnestus." notice_account_wrong_password: "Vale parool" notice_account_register_done: "Konto loomine õnnestus. Konto aktiveerimiseks vajuta vastaval lingil Sulle saadetud e-kirjas." - notice_account_unknown_email: "Tundmatu kasutaja." notice_can_t_change_password: "See konto kasutab välist autentimisallikat. Siin ei saa selle konto parooli vahetada." notice_account_lost_email_sent: "Sulle saadeti e-kiri parooli vahetamise juhistega." notice_account_activated: "Su konto on aktiveeritud. Saad nüüd sisse logida." diff --git a/config/locales/eu.yml b/config/locales/eu.yml index c417a79cc..1310ec259 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -159,7 +159,6 @@ eu: notice_account_password_updated: Pasahitza ongi eguneratu da. notice_account_wrong_password: Pasahitz ezegokia. notice_account_register_done: Kontua ongi sortu da. Kontua gaitzeko klikatu epostan adierazi zaizun estekan. - notice_account_unknown_email: Erabiltzaile ezezaguna. notice_can_t_change_password: Kontu honek kanpoko autentikazio bat erabiltzen du. Ezinezkoa da pasahitza aldatzea. notice_account_lost_email_sent: Pasahitz berria aukeratzeko jarraibideak dituen eposta bat bidali zaizu. notice_account_activated: Zure kontua gaituta dago. Orain saioa has dezakezu diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 26c2ac73b..e0f9b3b0e 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -160,7 +160,6 @@ fa: notice_account_password_updated: گذرواژه بهروز شد notice_account_wrong_password: گذرواژه نادرست است notice_account_register_done: حساب با موفقیت ساخته شد. رایانامهای حاوی دستورالعمل فعالسازی حساب شما به %{email} فرستاده شد. - notice_account_unknown_email: کاربر شناخته نشد. notice_account_not_activated_yet: شما هنوز حساب خود را فعال نکردهاید. اگر میخواهید یک رایانامه فعالسازی دیگر دریافت کنید، لطفاً <a href="%{url}">این جا کلید نمایید</a>. notice_account_locked: حساب شما قفل شده است. notice_can_t_change_password: این حساب یک روش احراز هویت بیرونی را به کار گرفته است. گذرواژه را نمیتوان تغییر داد. diff --git a/config/locales/fi.yml b/config/locales/fi.yml index d52f3b207..4df48f954 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -182,7 +182,6 @@ fi: notice_account_password_updated: Salasanan päivitys onnistui. notice_account_wrong_password: Väärä salasana notice_account_register_done: Tilin luonti onnistui. Aktivoidaksesi tilin seuraa linkkiä joka välitettiin sähköpostiisi. - notice_account_unknown_email: Tuntematon käyttäjä. notice_can_t_change_password: Tämä tili käyttää ulkoista tunnistautumisjärjestelmää. Salasanaa ei voi muuttaa. notice_account_lost_email_sent: Sinulle on lähetetty sähköposti jossa on ohje kuinka vaihdat salasanasi. notice_account_activated: Tilisi on nyt aktivoitu, voit kirjautua sisälle. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 5cba26700..e1e626081 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -177,7 +177,6 @@ fr: notice_account_password_updated: Mot de passe mis à jour avec succès. notice_account_wrong_password: Mot de passe incorrect notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé à l'adresse %{email}. - notice_account_unknown_email: Aucun compte ne correspond à cette adresse. notice_account_not_activated_yet: Vous n'avez pas encore activé votre compte. Si vous voulez recevoir un nouveau message d'activation, veuillez <a href="%{url}">cliquer sur ce lien</a>. notice_account_locked: Votre compte est verrouillé. notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe. diff --git a/config/locales/gl.yml b/config/locales/gl.yml index faf765c9d..183160a3b 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -638,7 +638,6 @@ gl: notice_account_password_updated: Contrasinal modificado correctamente. notice_account_pending: "A súa conta creouse e está pendente da aprobación por parte do administrador." notice_account_register_done: "A conta creouse correctamente. Recibirá unha ligazón na súa conta de correo electrónico, sígaa para activar a nova conta." - notice_account_unknown_email: Usuario descoñecido. notice_account_updated: Conta actualizada correctamente. notice_account_wrong_password: Contrasinal incorrecto. notice_can_t_change_password: Esta conta utiliza unha fonte de autenticación externa. Non é posible cambiar o contrasinal. diff --git a/config/locales/he.yml b/config/locales/he.yml index d77af432e..643083eb2 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -162,7 +162,6 @@ he: notice_account_password_updated: הסיסמה עודכנה בהצלחה! notice_account_wrong_password: סיסמה שגויה notice_account_register_done: החשבון נוצר בהצלחה. להפעלת החשבון לחץ על הקישור שנשלח לדוא"ל שלך. - notice_account_unknown_email: משתמש לא מוכר. notice_can_t_change_password: החשבון הזה משתמש במקור הזדהות חיצוני. שינוי סיסמה הינו בילתי אפשר notice_account_lost_email_sent: דוא"ל עם הוראות לבחירת סיסמה חדשה נשלח אליך. notice_account_activated: חשבונך הופעל. אתה יכול להתחבר כעת. diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 264fa7faa..87e7eeea7 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -152,7 +152,6 @@ hr: notice_account_password_updated: Zaporka je uspješno promijenjena. notice_account_wrong_password: Pogrešna zaporka notice_account_register_done: Racun je uspješno napravljen. Da biste aktivirali svoj račun, kliknite na link koji vam je poslan na e-mail. - notice_account_unknown_email: Nepoznati korisnik. notice_can_t_change_password: Ovaj račun koristi eksterni izvor prijavljivanja. Nemoguće je promijeniti zaporku. notice_account_lost_email_sent: E-mail s uputama kako bi odabrali novu zaporku je poslan na na vašu e-mail adresu. notice_account_activated: Vaš racun je aktiviran. Možete se prijaviti. diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 4683d7dbb..b39fde3b7 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -178,7 +178,6 @@ notice_account_password_updated: A jelszó módosítása megtörtént. notice_account_wrong_password: Hibás jelszó notice_account_register_done: A fiók sikeresen létrehozva. Aktiválásához kattints az e-mailben kapott linkre - notice_account_unknown_email: Ismeretlen felhasználó. notice_can_t_change_password: A fiók külső azonosítási forrást használ. A jelszó megváltoztatása nem lehetséges. notice_account_lost_email_sent: Egy e-mail üzenetben postáztunk Önnek egy leírást az új jelszó beállításáról. notice_account_activated: Fiókját aktiváltuk. Most már be tud jelentkezni a rendszerbe. diff --git a/config/locales/id.yml b/config/locales/id.yml index ef18f79a5..4959b719d 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -157,7 +157,6 @@ id: notice_account_password_updated: Kata sandi sudah berhasil diperbarui. notice_account_wrong_password: Kata sandi salah. notice_account_register_done: Akun sudah berhasil dibuat. Untuk mengaktifkan akun anda, silakan klik tautan (link) yang dikirim kepada anda melalui e-mail. - notice_account_unknown_email: Pengguna tidak dikenal. notice_can_t_change_password: Akun ini menggunakan sumber otentikasi eksternal yang tidak dikenal. Kata sandi tidak bisa diubah. notice_account_lost_email_sent: Email berisi instruksi untuk memilih kata sandi baru sudah dikirimkan kepada anda. notice_account_activated: Akun anda sudah diaktifasi. Sekarang anda bisa login. diff --git a/config/locales/it.yml b/config/locales/it.yml index a274ff8ca..023b1d4e1 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -161,7 +161,6 @@ it: notice_account_invalid_credentials: Nome utente o password non validi. notice_account_password_updated: La password è stata aggiornata. notice_account_wrong_password: Password errata - notice_account_unknown_email: Utente sconosciuto. notice_can_t_change_password: Questo utente utilizza un metodo di autenticazione esterno. Impossibile cambiare la password. notice_account_lost_email_sent: Ti è stata spedita una email con le istruzioni per cambiare la password. notice_account_activated: Il tuo account è stato attivato. Ora puoi effettuare l'accesso. diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 9f0802f1a..7ca4c888c 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -178,7 +178,6 @@ ja: notice_account_password_updated: パスワードが更新されました。 notice_account_wrong_password: パスワードが違います notice_account_register_done: アカウントを作成しました。アカウントを有効にするための手順を記載したメールを %{email} 宛に送信しました。 - notice_account_unknown_email: ユーザーが存在しません。 notice_can_t_change_password: このアカウントでは外部認証を使っています。パスワードは変更できません。 notice_account_lost_email_sent: パスワードを再設定する手順を記載したメールを送信しました。 notice_account_activated: アカウントが有効になりました。ログインできます。 diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 83e853ac2..fc553fb8f 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -204,7 +204,6 @@ ko: notice_account_password_updated: 비밀번호가 잘 변경되었습니다. notice_account_wrong_password: 잘못된 비밀번호 notice_account_register_done: 계정이 잘 만들어졌습니다. 계정을 활성화하시려면 받은 메일의 링크를 클릭해주세요. - notice_account_unknown_email: 알려지지 않은 사용자. notice_can_t_change_password: 이 계정은 외부 인증을 이용합니다. 비밀번호를 변경할 수 없습니다. notice_account_lost_email_sent: 새로운 비밀번호를 위한 메일이 발송되었습니다. notice_account_activated: 계정이 활성화되었습니다. 이제 로그인 하실수 있습니다. diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 9bdbaa58b..efe6c0fda 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -162,7 +162,6 @@ lt: notice_account_password_updated: Slaptažodis buvo sėkmingai atnaujintas. notice_account_wrong_password: Neteisingas slaptažodis notice_account_register_done: Paskyra buvo sėkmingai sukurta. Norint aktyvinti savo paskyrą, paspauskite nuorodą, kuri jums buvo siųsta į %{email}. - notice_account_unknown_email: Nežinomas vartotojas. notice_account_not_activated_yet: Dar nesatę aktyvavę savo paskyros. Jei norite gauti naują aktyvavimo laišką, paspauskite <a href="%{url}">šią nuorodą</a> notice_account_locked: Jūsų paskyra užblokuota. notice_can_t_change_password: Šis pranešimas naudoja išorinį autentiškumo nustatymo šaltinį. Neįmanoma pakeisti slaptažodžio. diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 15dc712dc..864b05fea 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -151,7 +151,6 @@ lv: notice_account_password_updated: Parole tika veiksmīgi atjaunota. notice_account_wrong_password: Nepareiza parole notice_account_register_done: Konts veiksmīgi izveidots. Lai aktivizētu kontu, spiediet uz saites, kas Jums tika nosūtīta. - notice_account_unknown_email: Nezināms lietotājs notice_can_t_change_password: Šis konts izmanto ārēju pilnvarošanas avotu. Nav iespējams nomainīt paroli. notice_account_lost_email_sent: Jums tika nosūtīts e-pasts ar instrukcijām, kā izveidot jaunu paroli. notice_account_activated: Jūsu konts ir aktivizēts. Varat pieslēgties sistēmai. diff --git a/config/locales/mk.yml b/config/locales/mk.yml index f0de09957..a54059f78 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -158,7 +158,6 @@ mk: notice_account_password_updated: Лозинката е успешно ажурирана. notice_account_wrong_password: Погрешна лозинка notice_account_register_done: Профилот е успешно креиран. За активација, клкнете на врската што ви е пратена по е-пошта. - notice_account_unknown_email: Непознат корисник. notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password. notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you. notice_account_activated: Your account has been activated. You can now log in. diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 5a3de50c8..29c1b39a5 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -157,7 +157,6 @@ mn: notice_account_password_updated: Нууц үгийг амжилттай өөрчиллөө. notice_account_wrong_password: Буруу нууц үг notice_account_register_done: Шинэ хэрэглэгч амжилттай үүсгэлээ. Идэвхжүүлэхийн тулд, бидний тань луу илгээсэн мэйл дотор байгаа холбоос дээр дараарай. - notice_account_unknown_email: Үл мэдэгдэх хэрэглэгч. notice_can_t_change_password: Энэ эрх гадаад нэвтрэлтэд ашигладаг учраас нууц үгийг өөрчлөх боломжгүй. notice_account_lost_email_sent: Бид таньд мэйлээр нууц үгээ өөрчлөх зааврыг илгээсэн байгаа. notice_account_activated: Таны данс идэвхжлээ. Одоо нэвтэрч орж болно. diff --git a/config/locales/nl.yml b/config/locales/nl.yml index db4027327..7870f4c4f 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -606,7 +606,6 @@ nl: notice_account_lost_email_sent: Er is een e-mail naar u verzonden met instructies over de keuze van een nieuw wachtwoord. notice_account_password_updated: Wachtwoord is met succes gewijzigd notice_account_pending: Uw account is aangemaakt, maar wacht nog op goedkeuring van een beheerder. - notice_account_unknown_email: Onbekende gebruiker. notice_account_updated: Account is succesvol gewijzigd notice_account_wrong_password: Ongeldig wachtwoord notice_can_t_change_password: Deze account gebruikt een externe authenticatiebron. Het is niet mogelijk om het wachtwoord te veranderen. diff --git a/config/locales/no.yml b/config/locales/no.yml index 77d40281d..a61651d57 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -147,7 +147,6 @@ notice_account_password_updated: Passordet er oppdatert. notice_account_wrong_password: Feil passord notice_account_register_done: Kontoen er opprettet. Klikk lenken som er sendt deg i e-post for å aktivere kontoen. - notice_account_unknown_email: Ukjent bruker. notice_can_t_change_password: Denne kontoen bruker ekstern godkjenning. Passordet kan ikke endres. notice_account_lost_email_sent: En e-post med instruksjoner for å velge et nytt passord er sendt til deg. notice_account_activated: Din konto er aktivert. Du kan nå logge inn. diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 1875bf1e5..10979f358 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -169,7 +169,6 @@ pl: notice_account_password_updated: "Hasło zostało pomyślnie zmienione." notice_account_wrong_password: "Nieprawidłowe hasło" notice_account_register_done: "Konto zostało pomyślnie utworzone. E-mail zawierający instrukcje aktywacji konta został wysłany na adres %{email}." - notice_account_unknown_email: "Nieznany użytkownik." notice_account_not_activated_yet: 'Jeszcze nie aktywowałeś swojego konta. Jeśli chcesz otrzymać nowy e-mail aktywacyjny, <a href="%{url}">kliknij tutaj</a>.' notice_account_locked: "Twoje konto jest zablokowane." notice_can_t_change_password: "To konto ma zewnętrzne źródło uwierzytelniania. Nie możesz zmienić hasła." diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 67d485dac..934208874 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -177,7 +177,6 @@ pt-BR: notice_account_password_updated: Senha alterada com sucesso. notice_account_wrong_password: Senha inválida. notice_account_register_done: Conta criada com sucesso. Para ativar sua conta, clique no link que lhe foi enviado por e-mail. - notice_account_unknown_email: Usuário desconhecido. notice_can_t_change_password: Esta conta utiliza autenticação externa. Não é possível alterar a senha. notice_account_lost_email_sent: Um e-mail com instruções para escolher uma nova senha foi enviado para você. notice_account_activated: Sua conta foi ativada. Você pode acessá-la agora. diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 986e0fd9c..5c9526da4 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -165,7 +165,6 @@ pt: notice_account_invalid_credentials: Utilizador ou palavra-chave inválidos. notice_account_password_updated: A palavra-chave foi alterada com sucesso. notice_account_wrong_password: Palavra-chave errada. - notice_account_unknown_email: Utilizador desconhecido. notice_can_t_change_password: Esta conta utiliza uma fonte de autenticação externa. Não é possível alterar a palavra-chave. notice_account_lost_email_sent: Foi-lhe enviado um e-mail com as instruções para escolher uma nova palavra-chave. notice_account_activated: A sua conta foi ativada. É agora possível autenticar-se. diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 9d032371c..3b55f08b3 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -152,7 +152,6 @@ ro: notice_account_password_updated: Parolă actualizată. notice_account_wrong_password: Parolă greșită notice_account_register_done: Contul a fost creat. Pentru activare, urmați legătura trimisă prin email. - notice_account_unknown_email: Utilizator necunoscut. notice_can_t_change_password: Acest cont folosește o sursă externă de autentificare. Nu se poate schimba parola. notice_account_lost_email_sent: S-a trimis un email cu instrucțiuni de schimbare a parolei. notice_account_activated: Contul a fost activat. Vă puteți autentifica acum. diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 8784f2532..ae9c41046 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -745,7 +745,6 @@ ru: notice_account_password_updated: Пароль успешно обновлён. notice_account_pending: "Ваша учётная запись создана и ожидает подтверждения администратора." notice_account_register_done: Учётная запись успешно создана. Для активации Вашей учётной записи пройдите по ссылке, которая выслана Вам по электронной почте. - notice_account_unknown_email: Неизвестный пользователь. notice_account_updated: Учётная запись успешно обновлена. notice_account_wrong_password: Неверный пароль notice_can_t_change_password: Для данной учётной записи используется источник внешней аутентификации. Невозможно изменить пароль. diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 5162b1c0b..78c56365c 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -156,7 +156,6 @@ sk: notice_account_password_updated: Heslo bolo úspešne zmenené. notice_account_wrong_password: Nesprávne heslo notice_account_register_done: Účet bol úspešne vytvorený. Účet aktivujete kliknutím na odkaz v emaile, ktorý vám bol zaslaný na %{email}. - notice_account_unknown_email: Neznámy používateľ. notice_can_t_change_password: Tento účet používa externú autentifikáciu. Nemôžete zmeniť heslo. notice_account_lost_email_sent: Bol vám zaslaný email s inštrukciami, ako si nastaviť nové heslo. notice_account_activated: Váš účet bol aktivovaný. Teraz se môžete prihlásiť. diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 8f8af74ee..fcc54c28e 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -156,7 +156,6 @@ sl: notice_account_password_updated: Geslo je bilo uspešno posodobljeno. notice_account_wrong_password: Napačno geslo notice_account_register_done: Račun je bil uspešno ustvarjen. Za aktivacijo potrdite povezavo, ki vam je bila poslana v e-nabiralnik. - notice_account_unknown_email: Neznan uporabnik. notice_can_t_change_password: Ta račun za overovljanje uporablja zunanji. Gesla ni mogoče spremeniti. notice_account_lost_email_sent: Poslano vam je bilo e-pismo z navodili za izbiro novega gesla. notice_account_activated: Vaš račun je bil aktiviran. Sedaj se lahko prijavite. diff --git a/config/locales/sq.yml b/config/locales/sq.yml index e0e32064a..ec06e9c69 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -157,7 +157,6 @@ sq: notice_account_password_updated: Fjalëkalimi u përditësua me sukses. notice_account_wrong_password: Fjalëkalim i gabuar notice_account_register_done: Llogaria u krijua me sukses. Te %{email} u dërgua një email që përmban udhëzimet si të aktivizohet llogaria juaj. - notice_account_unknown_email: Përdorues i panjohur. notice_account_not_activated_yet: S’e keni aktivizuar ende llogarinë tuaj. Nëse doni të merrni një email të ri aktivizimi, ju lutemi, <a href="%{url}">klikoni mbi këtë lidhje</a>. notice_account_locked: Llogaria juaj është e kyçur. notice_can_t_change_password: Kjo llogari përdor një burim të jashtëm mirëfilltësimesh. E pamundur të ndryshohet fjalëkalimi. diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index b13ff7c19..61bb677f3 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -160,7 +160,6 @@ sr-YU: notice_account_password_updated: Lozinka je uspešno ažurirana. notice_account_wrong_password: Pogrešna lozinka notice_account_register_done: Korisnički nalog je uspešno kreiran. Kliknite na link koji ste dobili u e-poruci za aktivaciju. - notice_account_unknown_email: Nepoznat korisnik. notice_can_t_change_password: Ovaj korisnički nalog za potvrdu identiteta koristi spoljni izvor. Nemoguće je promeniti lozinku. notice_account_lost_email_sent: Poslata vam je e-poruka sa uputstvom za izbor nove lozinke notice_account_activated: Vaš korisnički nalog je aktiviran. Sada se možete prijaviti. diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 2983bd4bd..0b6b8b319 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -158,7 +158,6 @@ sr: notice_account_password_updated: Лозинка је успешно ажурирана. notice_account_wrong_password: Погрешна лозинка notice_account_register_done: Кориснички налог је успешно креиран. Кликните на линк који сте добили у е-поруци за активацију. - notice_account_unknown_email: Непознат корисник. notice_can_t_change_password: Овај кориснички налог за потврду идентитета користи спољни извор. Немогуће је променити лозинку. notice_account_lost_email_sent: Послата вам је е-порука са упутством за избор нове лозинке notice_account_activated: Ваш кориснички налог је активиран. Сада се можете пријавити. diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 88577df06..16473e7a3 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -199,7 +199,6 @@ sv: notice_account_password_updated: Lösenordet har uppdaterats notice_account_wrong_password: Fel lösenord notice_account_register_done: Kontot har skapats. För att aktivera kontot, klicka på länken i mailet som skickades till dig. - notice_account_unknown_email: Okänd användare. notice_can_t_change_password: Detta konto använder en extern autentiseringskälla. Det går inte att byta lösenord. notice_account_lost_email_sent: Ett mail med instruktioner om hur man väljer ett nytt lösenord har skickats till dig. notice_account_activated: Ditt konto har blivit aktiverat. Du kan nu logga in. diff --git a/config/locales/th.yml b/config/locales/th.yml index 4983a4b67..9844efe63 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -155,7 +155,6 @@ th: notice_account_password_updated: รหัสได้ถูกปรับปรุงแล้ว. notice_account_wrong_password: รหัสผ่านไม่ถูกต้อง notice_account_register_done: บัญชีถูกสร้างแล้ว. กรุณาเช็คเมล์ แล้วคลิ๊กที่ลิงค์ในอีเมล์เพื่อเปิดใช้บัญชี - notice_account_unknown_email: ไม่มีผู้ใช้ที่ใช้อีเมล์นี้. notice_can_t_change_password: บัญชีนี้ใช้การยืนยันตัวตนจากแหล่งภายนอก. ไม่สามารถปลี่ยนรหัสผ่านได้. notice_account_lost_email_sent: เราได้ส่งอีเมล์พร้อมวิธีการสร้างรหัีสผ่านใหม่ให้คุณแล้ว กรุณาเช็คเมล์. notice_account_activated: บัญชีของคุณได้เปิดใช้แล้ว. ตอนนี้คุณสามารถเข้าสู่ระบบได้แล้ว. diff --git a/config/locales/tr.yml b/config/locales/tr.yml index deb32d50b..ecff540ab 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -171,7 +171,6 @@ tr: notice_account_password_updated: Parola başarıyla güncellendi. notice_account_wrong_password: Yanlış parola notice_account_register_done: Hesap başarıyla oluşturuldu. Hesabınızı etkinleştirmek için, size gönderilen e-postadaki bağlantıya tıklayın. - notice_account_unknown_email: Tanınmayan kullanıcı. notice_can_t_change_password: Bu hesap harici bir denetim kaynağı kullanıyor. Parolayı değiştirmek mümkün değil. notice_account_lost_email_sent: Yeni parola seçme talimatlarını içeren e-postanız gönderildi. notice_account_activated: Hesabınız etkinleştirildi. Şimdi giriş yapabilirsiniz. diff --git a/config/locales/uk.yml b/config/locales/uk.yml index cbee81186..625154ed5 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -171,7 +171,6 @@ uk: notice_account_password_updated: Пароль успішно оновлений. notice_account_wrong_password: Невірний пароль. notice_account_register_done: Обліковий запис успішно створений. Для активації Вашого облікового запису зайдіть по посиланню, яке відіслане вам електронною поштою. - notice_account_unknown_email: Невідомий користувач. notice_can_t_change_password: Для даного облікового запису використовується джерело зовнішньої аутентифікації. Неможливо змінити пароль. notice_account_lost_email_sent: Вам відправлений лист з інструкціями по вибору нового пароля. notice_account_activated: Ваш обліковий запис активований. Ви можете увійти. diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 94e236f2d..2aa5eedec 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -210,7 +210,6 @@ vi: notice_account_password_updated: Cập nhật mật mã thành công. notice_account_wrong_password: Sai mật mã notice_account_register_done: Tài khoản được tạo thành công. Để kích hoạt vui lòng làm theo hướng dẫn trong email gửi đến bạn. - notice_account_unknown_email: Không rõ tài khoản. notice_can_t_change_password: Tài khoản được chứng thực từ nguồn bên ngoài. Không thể đổi mật mã cho loại chứng thực này. notice_account_lost_email_sent: Thông tin để đổi mật mã mới đã gửi đến bạn qua email. notice_account_activated: Tài khoản vừa được kích hoạt. Bây giờ bạn có thể đăng nhập. diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index b95ffc278..d87066cb7 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -241,7 +241,6 @@ notice_account_password_updated: 帳戶新密碼已儲存 notice_account_wrong_password: 密碼不正確 notice_account_register_done: 帳號已建立成功。欲啟用您的帳號，請點擊系統確認信函中的啟用連結。 - notice_account_unknown_email: 未知的使用者 notice_account_not_activated_yet: 您尚未完成啟用您的帳號。若您要索取新的帳號啟用 Email ，請 <a href="%{url}">點擊此連結</a> 。 notice_account_locked: 您的帳號已被鎖定。 notice_can_t_change_password: 這個帳號使用外部驗證方式，無法變更其密碼。 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index e0b98a2e3..468f09043 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -161,7 +161,6 @@ zh: notice_account_password_updated: 密码更新成功 notice_account_wrong_password: 密码错误 notice_account_register_done: 帐号创建成功，请使用注册确认邮件中的链接来激活您的帐号。 - notice_account_unknown_email: 未知用户 notice_can_t_change_password: 该帐号使用了外部认证，因此无法更改密码。 notice_account_lost_email_sent: 系统已将引导您设置新密码的邮件发送给您。 notice_account_activated: 您的帐号已被激活。您现在可以登录了。 diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index f539f4619..034094e7b 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -476,6 +476,7 @@ class AccountControllerTest < Redmine::ControllerTest } ) assert_response :success + assert_equal I18n.t(:notice_account_lost_email_sent), flash[:notice] end end |