diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 54d19a138..92cc0b29d 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -5,6 +5,7 @@ <%= text_input_row form, :username, autocomplete: "username" %> <%= password_input_row form, :password, autocomplete: "new-password" %> <%= password_input_row form, :password_confirmation, autocomplete: "new-password" %> + <%= content_tag :div, t(".approval_help"), class: "alert alert-info" if SiteSettings.approve_signups %> <%= form.submit translate(".sign_up"), class: "btn btn-primary" %> <% end %> diff --git a/config/locales/devise/en.yml b/config/locales/devise/en.yml index 8977b0ced..cdbc5a7bd 100644 --- a/config/locales/devise/en.yml +++ b/config/locales/devise/en.yml @@ -13,6 +13,7 @@ en: invalid: Invalid %{authentication_keys} or password. last_attempt: You have one more attempt before your account is temporarily locked. locked: Your account is locked for an hour; try again later. + not_approved: Your account has not yet been approved by a moderator. not_found_in_database: Invalid %{authentication_keys} or password. timeout: Your session expired. Please sign in again to continue. unauthenticated: You need to sign in or sign up before continuing. @@ -103,6 +104,7 @@ en: mask: Blur in lists show: Show as normal new: + approval_help: After creating your account, it will be manually reviewed by our moderators. We'll let you know when approval is complete and you can sign in. sign_up: Sign up pagination_settings: collections: @@ -168,6 +170,8 @@ en: update_needs_confirmation: You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address. updated: Your account has been updated successfully. updated_but_not_signed_in: Your account has been updated successfully, but since your password was changed, you need to sign in again. + user: + signed_up_but_not_approved: You have signed up successfully. A moderator will review your account soon, after which you will be able to sign in. sessions: already_signed_out: Signed out successfully. new: