From 1faae3c7657251e4d09bc3fb19f90bfe1a5fe35f Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 3 Oct 2017 15:28:15 -0400 Subject: [PATCH] rename forgot_password_strict to hide_email_address_taken --- app/controllers/session_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- config/locales/server.ar.yml | 2 +- config/locales/server.de.yml | 2 +- config/locales/server.el.yml | 2 +- config/locales/server.en.yml | 2 +- config/locales/server.es.yml | 2 +- config/locales/server.fa_IR.yml | 2 +- config/locales/server.fi.yml | 2 +- config/locales/server.fr.yml | 2 +- config/locales/server.he.yml | 2 +- config/locales/server.it.yml | 2 +- config/locales/server.ko.yml | 2 +- config/locales/server.pl_PL.yml | 2 +- config/locales/server.pt.yml | 2 +- config/locales/server.pt_BR.yml | 2 +- config/locales/server.ro.yml | 2 +- config/locales/server.sv.yml | 2 +- config/locales/server.tr_TR.yml | 2 +- config/locales/server.zh_CN.yml | 2 +- config/locales/server.zh_TW.yml | 2 +- config/site_settings.yml | 2 +- ...171003180951_rename_forgot_password_strict_setting.rb | 9 +++++++++ spec/controllers/users_controller_spec.rb | 8 ++++---- 24 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 db/migrate/20171003180951_rename_forgot_password_strict_setting.rb diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index 1060c6e0348..c67e6baf340 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -247,7 +247,7 @@ class SessionController < ApplicationController end json = { result: "ok" } - unless SiteSetting.forgot_password_strict + unless SiteSetting.hide_email_address_taken json[:user_found] = user_presence end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 69ab62df520..ca3dba24266 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -372,7 +372,7 @@ class UsersController < ApplicationController message: activation.message, user_id: user.id } - elsif SiteSetting.forgot_password_strict && user.errors[:primary_email]&.include?(I18n.t('errors.messages.taken')) + elsif SiteSetting.hide_email_address_taken && user.errors[:primary_email]&.include?(I18n.t('errors.messages.taken')) session["user_created_message"] = activation.success_message if existing_user = User.find_by_email(user.primary_email&.email) diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index eaaf22fead4..0dcc76db841 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -1037,7 +1037,7 @@ ar: allow_index_in_robots_txt: "حدّد في robots.txt إمكانيّة فهرسة محرّكات البحث في الوبّ هذا الموقع." email_domains_blacklist: "قائمة pipe-delimited المجالات البريد الإلكتروني الذي لا يسمح للمستخدمين تسجيل حسابات مع. مثال: mailinator.com | trashmail.net" email_domains_whitelist: "قائمة pipe-delimited من مجالات البريد الإلكتروني التي يجب على المستخدمين تسجيل حسابات مع. تحذير: لن يسمح للمستخدمين مع مجالات البريد الإلكتروني الأخرى غير المذكورة هنا!" - forgot_password_strict: "لا تخبر المستخدمين بوجود الحساب عند استخدامهم حوار نسيان كلمة السّرّ." + hide_email_address_taken: "لا تخبر المستخدمين بوجود الحساب عند استخدامهم حوار نسيان كلمة السّرّ." log_out_strict: "عند الخروج، اخرج من كلّ جلسات المستخدم في كلّ الأجهزة" version_checks: "Ping ديسكورس مركزا لتحديثات الإصدار وإظهار الرسائل النسخة الجديدة على لوحة القيادة / مسؤول" new_version_emails: "إرسال بريد إلكتروني إلى عنوان contact_email عندما نسخة جديدة من ديسكورس هو متاح." diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 868d8a48884..aba151f27a2 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -992,7 +992,7 @@ de: allow_index_in_robots_txt: "Suchmaschinen mittels der robots.txt Datei erlauben, die Site zu indizieren." email_domains_blacklist: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten nicht verwendet werden dürfen. Beispiel: mailinator.com|trashmail.net" email_domains_whitelist: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten verwendet werden können. ACHTUNG: Benutzer mit E-Mail-Adressen anderer Domains werden nicht zugelassen!" - forgot_password_strict: "Benutzer nicht informieren, ob ein Konto existiert, wenn sie den Passwort vergessen-Dialog verwenden." + hide_email_address_taken: "Benutzer nicht informieren, ob ein Konto existiert, wenn sie den Passwort vergessen-Dialog verwenden." log_out_strict: "Beim Abmelden ALLE Sitzungen des Benutzers auf allen Geräten beenden" version_checks: "Kontaktiere den Discourse Hub zur Überprüfung auf neue Versionen und zeige Benachrichtigungen über neue Versionen auf der Administratorkonsole an." new_version_emails: "Sende eine E-Mail an die contact_email Adresse wenn eine neue Version von Discourse verfügbar ist." diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml index bd947e7d5de..2b6a86f7ce3 100644 --- a/config/locales/server.el.yml +++ b/config/locales/server.el.yml @@ -1007,7 +1007,7 @@ el: allow_index_in_robots_txt: "Καθόρισε στο robots.txt ότι για αυτή την ιστοσελίδα επιτρέπεται να δημιουργείται κατάλογος περιεχομένων από τις μηχανές αναζήτησης." email_domains_blacklist: "Μία λίστα με διευθύνσεις email τις οποίες οι χρήστες δεν μπορούν να χρησιμοποιήσουν για να δημιουργήσουν λογαριασμό. Πχ: mailinator.com|trashmail.net" email_domains_whitelist: "Μία λίστα με διευθύνσεις email τις οποίες οι χρήστες ΘΑ ΠΡΕΠΕΙ να χρησιμοποιήσουν για να δημιουργήσουν λογαριασμό. ΠΡΟΣΟΧΗ: οι χρήστες με διευθύνσεις email οι οποίες δεν βρίσκονται σε αυτή τη λίστα δεν θα μπορούν να δημιουργήσουν λογαριασμό." - forgot_password_strict: "Να μην ενημερώνονται οι χρήστες για την ύπαρξη ενός λογαριασμού όταν χρησιμοποιούν την λειτουργία ανάκτησης κωδικού πρόσβασης." + hide_email_address_taken: "Να μην ενημερώνονται οι χρήστες για την ύπαρξη ενός λογαριασμού όταν χρησιμοποιούν την λειτουργία ανάκτησης κωδικού πρόσβασης." log_out_strict: "Όταν αποσυνδεθείτε, ΟΛΕΣ οι δραστηριότητες σας σε ΟΛΕΣ τις συσκευές θα αποσυνδεθούν" version_checks: "Έλεγξε το Hub του Discourse για αναβαθμίσεις και δείξε μηνύματα για νέες ενημερώσεις στην σελίδα διαχείρισης. " new_version_emails: "Αποστολή email στην contact_email διεύθυνση όταν μια νέα έκδοση του Discourse είναι διαθέσιμη." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index d28b259caa7..9c49b2588ad 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1097,7 +1097,7 @@ en: allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines." email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net" email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!" - forgot_password_strict: "Don't inform users of an account's existence when they use the forgot password dialog." + hide_email_address_taken: "Don't inform users that an account exists with a given email address during signup and from the forgot password form." log_out_strict: "When logging out, log out ALL sessions for the user on all devices" version_checks: "Ping the Discourse Hub for version updates and show new version messages on the /admin dashboard" new_version_emails: "Send an email to the contact_email address when a new version of Discourse is available." diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index 3292aa4679f..a1a7d20f2b4 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -971,7 +971,7 @@ es: allow_index_in_robots_txt: "Especificar en robots.txt que este sitio puede ser indexado por los motores de búsqueda web." email_domains_blacklist: "Una lista de dominios de correo electrónico con los que los usuarios no se podrán registrar. Ejemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Una lista de dominios de email con los que los usuarios DEBERÁN registrar sus cuentas. AVISO: ¡los usuarios con un email con diferente dominio a los listados no estarán permitidos!" - forgot_password_strict: "No informar a los usuarios de la existencia de una cuenta cuando utilicen el diálogo de pérdida de contraseña." + hide_email_address_taken: "No informar a los usuarios de la existencia de una cuenta cuando utilicen el diálogo de pérdida de contraseña." log_out_strict: "Al cerrar sesión, cierra TODAS las sesiones del usuario en todos los dispositivos" version_checks: "Ping el 'Discourse Hub' para actualizaciones de versión y mostrar mensajes del número de versión en el dashboard /admin" new_version_emails: "Enviar un email a la dirección contact_email cuando esté disponible una nueva versión de Discourse." diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index 037617e8193..cff8e54b352 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -929,7 +929,7 @@ fa_IR: allow_index_in_robots_txt: "در robots.txt که به این سایت اجازه دهید که در موتور‌های جستجو ایندکس شود." email_domains_blacklist: "لیست pipe-delimit دامنه های ایمیل که کاربران اجازه ندارند با آن حساب کاربری ثبت‌نام کنند. برای مثال: mailinator.com|trashmail.net" email_domains_whitelist: "لیست pipe-delimit دامنه های ایمیل که کاربران اجازه باید با آن حساب کاربری ثبت نام کنند. اخطار: کاربرانی با دامنه‌های ایمیلی به غیر از آن‌هایی که در لیست هستند اجازه ندارند. " - forgot_password_strict: "آگاه نکردن کاربران از وجود حساب کاربری در صفحه فراموشی روز عبور" + hide_email_address_taken: "آگاه نکردن کاربران از وجود حساب کاربری در صفحه فراموشی روز عبور" log_out_strict: "وقتی از سیستم خارج می شود، کاربر را از تمام session‌ها بر روی تمام دستگاه‌ها خارج کن " version_checks: "Discourse Hub را پینگ کن برای نسخه بروزرسانی و پیام نسخه جدید را صفحه آمار ادمین نشان بده." new_version_emails: "ارسال ایمیل به contact_email address وقتی نسخه جدید Discourse موجود است. " diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 38389f578f7..7b810f186ef 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -991,7 +991,7 @@ fi: allow_index_in_robots_txt: "Määrittele robots.txt-tiedostossa, että hakukoneet saavat luetteloida sivuston." email_domains_blacklist: "Pystyviivalla eroteltu lista sähköposti-verkkotunnuksista, joista käyttäjät eivät voi luoda tiliä. Esimerkiksi mailinator.com|trashmail.net" email_domains_whitelist: "Pystyviivalla eroteltu lista sähköposti-verkkotunnuksista, joista käyttäjien pitää luoda tilinsä. VAROITUS: Käyttäjiä, joiden sähköpostiosoite on muusta verkkotunnuksesta ei sallita!" - forgot_password_strict: "Älä paljasta tilin olemassaoloa unohtuneen salasanan kyselyssä." + hide_email_address_taken: "Älä paljasta tilin olemassaoloa unohtuneen salasanan kyselyssä." log_out_strict: "Kun kirjaudutaan ulos, kirjaa käyttäjä ulos kaikilta laitteilta" version_checks: "Pingaa Discourse Hubia päivityksistä ja näytä viesti /admin hallintapaneelissa kun uusi versio on saatavilla" new_version_emails: "Lähetä sähköposti contact_email osoitteeseen kun uusi versio Discoursesta on saatavilla." diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index a6d9f8a8faa..842705b2201 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -984,7 +984,7 @@ fr: allow_index_in_robots_txt: "Préciser dans robots.txt que le site est autorisé à être indexé par les robots des moteurs de recherche." email_domains_blacklist: "Liste des domaines de courriel qui ne sont pas autorisés lors de la création de compte, délimitée par des pipes. Exemple : mailinator.com|trashmail.net" email_domains_whitelist: "Liste des domaines de courriel avec lesquelles les utilisateurs DOIVENT s'enregistrer, délimités par un pipe. ATTENTION : les utilisateurs ayant une adresse de courriel sur un autre domaine ne pourront pas s'enregistrer." - forgot_password_strict: "Ne pas mentionner l'existence d'un compte utilisateur quand un utilisateur utilise le formulaire d'oubli de mot de passe." + hide_email_address_taken: "Ne pas mentionner l'existence d'un compte utilisateur quand un utilisateur utilise le formulaire d'oubli de mot de passe." log_out_strict: "Lors de la déconnexion, déconnecter TOUTES les sessions pour l'utilisateur sur tous les appareils" version_checks: "Ping les serveurs de Discourse afin d'obtenir les mises à jours et affiche les nouveaux messages d'information dans le tableau de bord /admin" new_version_emails: "Envoyer un courriel à contact_email quand une nouvelle version de Discourse est disponible." diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 9f0909d5719..c3ca363b937 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -974,7 +974,7 @@ he: allow_index_in_robots_txt: "פרטו ב-robots.txt שלאתר זה מותר להיות מאונדקס על ידי מנועי חיפוש." email_domains_blacklist: "רשימה מופרדת בצינור (pipe) של דומיינים של אימייל אשר מהם משתמשים לא מורשים לרשום חשבונות. למשל: mailinator.com|trashmail.net" email_domains_whitelist: "רשימה מופרדת בצינור (pipe) אשר ר-ק ממנה משתמשים יכולים לרשום חשבונות. א-ז-ה-ר-ה: משתמשים עם אימיילים מדומיינים אחרים לא יורשו!" - forgot_password_strict: "אל תיידעו משתמשים בנוגע לקיום חשבון כשהם משתמשים באפשרות של ״שכחתי סיסמה״." + hide_email_address_taken: "אל תיידעו משתמשים בנוגע לקיום חשבון כשהם משתמשים באפשרות של ״שכחתי סיסמה״." log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמש/ת בכל המכשירים" version_checks: "שלחו פינג להאב של Discourse לעדכוני גרסה וכדי להציג מסרים אודות גרסאות בלוח התצוגה ב /admin" new_version_emails: "שלחו דוא\"ל לכתובת של contact_email כשגרסה חדשה של Discourse זמינה." diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index a9ca197a7fb..2973c69013d 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -1000,7 +1000,7 @@ it: allow_index_in_robots_txt: "Specifica nel file robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca." email_domains_blacklist: "Una lista di domini email separati dal carattere pipe \"|\" con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com/trashmail.net" email_domains_whitelist: "Una lista di domini email delimitati da carattere pipe (|) che gli utenti DEVONO usare per poter registrare i propri account. ATTENZIONE: gli utenti con domini email differenti da questi non saranno accettati!" - forgot_password_strict: "Non informare gli utenti dell'esistenza o meno dell'account quando richiamano la funzione per la password dimenticata." + hide_email_address_taken: "Non informare gli utenti dell'esistenza o meno dell'account quando richiamano la funzione per la password dimenticata." log_out_strict: "Quando ci si disconnette, esci da TUTTE le sessioni dell'utente su tutti i dispositivi" version_checks: "Verifica su Discourse Hub l'esistenza di aggiornamenti e mostra i messaggi per le nuove versioni nel cruscotto /admin" new_version_emails: "Invia un'email all'indirizzo contact_email quando è disponibile una nuova versione di Discourse." diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index 942e656ce2f..196825c24d8 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -925,7 +925,7 @@ ko: allow_index_in_robots_txt: "이 사이트가 검색엔진에 의해 인덱스되는 것을 허용합니다.(robots.txt 수정)" email_domains_blacklist: "가입 금지된 이메일 도메인 목록, 파이프 기호로 구분. 예: mailinator.com|trashmail.net" email_domains_whitelist: "가입하려면 반드시 사용해야하는 이메일 도메인 목록, 파이프 기호로 구분. 경고: 이 목록외의 도메인으로는 가입이 안됩니다!" - forgot_password_strict: "비밀번호 찾기 창에서 사용자 계정의 존재 여부를 알리지 않음." + hide_email_address_taken: "비밀번호 찾기 창에서 사용자 계정의 존재 여부를 알리지 않음." log_out_strict: "로그아웃 할때, 모든 장치에서 다같이 로그아웃" version_checks: "Dicousre Hub에 ping을 날려 버전 업데이트와 새 버전 알림을 /admin 대시보드에 보이게 합니다." new_version_emails: "사용가능한 새로운 업데이트가 있으면 등록된 contact_email 주소로 메일을 발송하여 알려줍니다." diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 1f036294f7c..2ed4faeb492 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -1059,7 +1059,7 @@ pl_PL: allow_index_in_robots_txt: "Określ w robots.txt, że ta strona może być indeksowana przez silniki wyszukiwania." email_domains_blacklist: "Lista rozdzielonych pionową kreską domen e-mail, z których użytkownicy nie mogą się rejestrować. Przykład: mailinator.com|trashmail.net" email_domains_whitelist: "Lista rozdzielonych pionową kreską domen e-mail, z których użytkownicy MUSZĄ się rejestrować. UWAGA: Użytkownicy z domenami e-mail innymi niż wypisane nie będą dopuszczeni!" - forgot_password_strict: "Nie informuj użytkowników o istnieniu konta kiedy używają dialogu zapomnianego hasła." + hide_email_address_taken: "Nie informuj użytkowników o istnieniu konta kiedy używają dialogu zapomnianego hasła." log_out_strict: "Po wylogowaniu wyloguj WSZYSTKIE sesje użytkownika na wszystkich urządzeniach." version_checks: "Odpytuj Discourse Hub o aktualizacje i wyświetlaj wiadomości o nowej wersji w panelu /admin" new_version_emails: "Wyślij email na adres contact_email, kiedy nowa wersja Discourse będzie dostępna." diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index b6fcdfe8d6c..ace016fe07a 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -897,7 +897,7 @@ pt: allow_index_in_robots_txt: "Especificar em robots.txt que este sítio permite ser indexado pelos motores de pesquisa." email_domains_blacklist: "Lista de domínios de email que os utilizadores não podem usar para registo de contas. Exemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Lista de domínios de email que os utilizadores DEVEM usar para registar contas. AVISO: Utilizadores com domínios de email diferentes dos listados não serão permitidos!" - forgot_password_strict: "Não informar utilizadores da existência de uma conta quando estes usam o diálogo de palavra-passe esquecida. " + hide_email_address_taken: "Não informar utilizadores da existência de uma conta quando estes usam o diálogo de palavra-passe esquecida. " log_out_strict: "Ao terminar sessão, saia de TODAS as sessões do utilizador em todos dispositivos" version_checks: "Fazer o ping do Discourse Hub para atualização de versões e mostrar mensagens sobre novas versões no painel de administração" new_version_emails: "Enviar um email para o endereço 'contact_email' quando uma nova versão do Discourse estiver disponível." diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index a31661eacca..252743bddce 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -885,7 +885,7 @@ pt_BR: allow_index_in_robots_txt: "Especificar no robots.txt que este site é permitido de ser indexado por sistemas de busca na web." email_domains_blacklist: "Lista delimitada por barras (|) de domínios de email que não são permitidos registros de contas. Exemplo: mailinator.com|trashmail.net" email_domains_whitelist: "Lista separada por barra (|) de domínios de email que usuários DEVEM usar para registrar contas. CUIDADO: Usuário com domínio de email diferentes da lista não serão permitidos!" - forgot_password_strict: "Não informar os usuários da existência de uma conta quando eles usam o diálogo de esquecimento de senha." + hide_email_address_taken: "Não informar os usuários da existência de uma conta quando eles usam o diálogo de esquecimento de senha." log_out_strict: "Quando deslogando, deslogar TODAS as sessões do usuário em todos os dispositivos" version_checks: "Pingar Discourse Hub para atualizações de versão e exibir mensagens de versão no Painel em /admin" new_version_emails: "Enviar um email para o endereço contact_email quando uma nova versão do Discourse estiver disponível." diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index f611b19cf6e..aa71025a2fb 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -911,7 +911,7 @@ ro: allow_index_in_robots_txt: "Specifică în robots.txt că acest site poate fi indexat de motoarele de căutare web." email_domains_blacklist: "O listă de domenii de email separate cu simbolul | (pipe) ale căror utilizatori nu au permisiunea să înregistreze conturi. Exemplu: mailinator.com|trashmail.net" email_domains_whitelist: "O listă de domenii de email (separate cu simbolul | (pipe)) cu care utilizatorii TREBUIE să se înregistreze. ATENȚIE: utilizatorii cu alte domenii de email decât cele listate nu vor avea permisiunea să se înregistreze." - forgot_password_strict: "Nu informa utilizatorii despre existența unui cont atunci când folosesc dialogul pentru parolă uitată." + hide_email_address_taken: "Nu informa utilizatorii despre existența unui cont atunci când folosesc dialogul pentru parolă uitată." log_out_strict: "La ieșire, închide TOATE sesiunile pentru utilizator, pe toate dispozitivele." version_checks: "Verifică Hub-ul Discourse pentru actualizări și arată notificările de versiuni noi pe spațiul de lucru /admin ." new_version_emails: "Trimite un email la adresa contact_email când o nouă versiune de Discourse este disponibilă." diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index 1f94f64aea6..8cc2c66904e 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -848,7 +848,7 @@ sv: allow_index_in_robots_txt: "Specificera i robots.txt att den här webbplatsen tillåter att bli indexerad av sökmotorer. " email_domains_blacklist: "En pipe-avgränsad lista av alla e-postdomän som användare inte tillåts registrera konton med. Exempel: mailinator.com, trashmail.net" email_domains_whitelist: "En pipe-avgränsad lista av alla e-postdomän som användare MÅSTE registrera konton med. VARNING: Användare med e-postdomän som inte finns på listan kommer inte att tillåtas!" - forgot_password_strict: "Informera inte användare om ett kontos existens när de försöker använda dialogen vid bortglömt lösenord. " + hide_email_address_taken: "Informera inte användare om ett kontos existens när de försöker använda dialogen vid bortglömt lösenord. " log_out_strict: "Vid utloggning, logga ut ALLA sessioner för den användaren på alla apparater" version_checks: "Pinga Discourse Hubben för versionsuppdatering och visa nya versionsmeddelanden på /admin översiktspanelen" new_version_emails: "Skicka ett mejl till contact_email när en ny version av Discourse finns tillgängligt." diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 6fb71b90ff3..fbd877771a4 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -737,7 +737,7 @@ tr_TR: allow_index_in_robots_txt: "robots.txt dosyasında bu sitenin arama motorları tarafından dizinlenmesine izin verildiğini belirt." email_domains_blacklist: "Kullanıcıların kayıt olurken kullanamayacağı e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. Örneğin: mailinator.com|trashmail.net" email_domains_whitelist: "Kullanıcıların kayıt olurken kullanmak ZORUNDA olduğu e-posta alan adlarının, dikey çizgilerle ayrıştırılmış listesi. UYARI: Bu listede yer almayan e-posta alan adları kabul edilmeyecektir!" - forgot_password_strict: "Parola sıfırlama kullanıldığında kullanıcıyı hesabın varlığı ile ilgili olarak bilgilendirme." + hide_email_address_taken: "Parola sıfırlama kullanıldığında kullanıcıyı hesabın varlığı ile ilgili olarak bilgilendirme." log_out_strict: "Çıkış yapılırken, kullanıcının tüm cihazlardaki TÜM seanslarını sonlandır" version_checks: "Discourse Hub'a sürüm güncellemeleri için haber yolla ve yeni versiyon iletilerine /admin gösterge panelinde yer ver" new_version_emails: "Discourse'un yeni sürümü çıktığında contact_email adresine e-posta gönder." diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 1211bd3a0d5..c0784b48d39 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -953,7 +953,7 @@ zh_CN: allow_index_in_robots_txt: "在 robots.txt 中详细指出这个站点允许被网页搜索引擎检索。" email_domains_blacklist: "用管道符“|”分隔的邮箱域名黑名单列表，其中的域名将不能用来注册账户，例如：mailinator.com|trashmail.net" email_domains_whitelist: "用管道符“|”分隔的电子邮箱域名的列表，用户必须使用这些邮箱域名注册。警告：用户使用不包含在这个列表里的邮箱域名，将无法成功注册。" - forgot_password_strict: "用户找回密码时不提示帐户是否存在。" + hide_email_address_taken: "用户找回密码时不提示帐户是否存在。" log_out_strict: "退出时，退出用户所有设备的会话" version_checks: "访问 Discourse Hub 来检查版本更新，并在管理面板 /admin 显示新版本信息" new_version_emails: "当新版本发布时，发送一封邮件至 contact_email 设置的地址。" diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 791e179028f..353eaf8fdb9 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -890,7 +890,7 @@ zh_TW: allow_index_in_robots_txt: "在 robots.txt 中記錄這個網站允許被搜尋引擎索引的部分" email_domains_blacklist: "用管道符“|”分隔的郵箱域名黑名單列表，其中的域名將不能用來註冊賬戶，例如：mailinator.com|trashmail.net" email_domains_whitelist: "用管道符“|”分隔的電子郵箱域名的列表，用戶必須使用這些郵箱域名註冊。警告：用戶使用不包含在這個列表裡的郵箱域名，將無法成功註冊。" - forgot_password_strict: "用戶找回密碼時不提示帳戶是否存在。" + hide_email_address_taken: "用戶找回密碼時不提示帳戶是否存在。" log_out_strict: "登出時，登出用戶所有設備上的所有時段" version_checks: "訪問 Discourse Hub 來檢查版本更新，並在管理面板 /admin 顯示新版本訊息" new_version_emails: "當新版本發佈時，將會發送一封新的 EMail 至 contact_email 設定的位址" diff --git a/config/site_settings.yml b/config/site_settings.yml index 0331d5a5208..3e42c07db8c 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -321,7 +321,7 @@ login: email_domains_whitelist: default: '' type: list - forgot_password_strict: false + hide_email_address_taken: false log_out_strict: true pending_users_reminder_delay: min: -1 diff --git a/db/migrate/20171003180951_rename_forgot_password_strict_setting.rb b/db/migrate/20171003180951_rename_forgot_password_strict_setting.rb new file mode 100644 index 00000000000..0a9945bb966 --- /dev/null +++ b/db/migrate/20171003180951_rename_forgot_password_strict_setting.rb @@ -0,0 +1,9 @@ +class RenameForgotPasswordStrictSetting < ActiveRecord::Migration[5.1] + def up + execute "UPDATE site_settings SET name = 'hide_email_address_taken' WHERE name = 'forgot_password_strict'" + end + + def down + execute "UPDATE site_settings SET name = 'forgot_password_strict' WHERE name = 'hide_email_address_taken'" + end +end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index fcd265fef3f..258d788f9ba 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -625,16 +625,16 @@ describe UsersController do context 'users already exists with given email' do let!(:existing) { Fabricate(:user, email: post_user_params[:email]) } - it 'returns an error if forgot_password_strict is disabled' do - SiteSetting.forgot_password_strict = false + it 'returns an error if hide_email_address_taken is disabled' do + SiteSetting.hide_email_address_taken = false post_user json = JSON.parse(response.body) expect(json['success']).to eq(false) expect(json['message']).to be_present end - it 'returns success if forgot_password_strict is enabled' do - SiteSetting.forgot_password_strict = true + it 'returns success if hide_email_address_taken is enabled' do + SiteSetting.hide_email_address_taken = true expect { post_user }.to_not change { User.count }