diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-14 22:11:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 22:11:56 +0100 |
| commit | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (patch) | |
| tree | 74a5e58f2c724746d2e929b9df0e5682f17a2637 /app/views/auth | |
| parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
| parent | 09ac5e7528ba3bfe90c20002f47c863d9afc6fcd (diff) | |
Merge pull request #960 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/auth')
| -rw-r--r-- | app/views/auth/registrations/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/auth/shared/_links.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index 72ce8e531..1caf2b401 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -29,6 +29,6 @@ %p.hint= t('auth.agreement_html', rules_path: about_more_path, terms_path: terms_path) .actions - = f.button :button, t('auth.register'), type: :submit + = f.button :button, sign_up_message, type: :submit .form-footer= render 'auth/shared/links' diff --git a/app/views/auth/shared/_links.html.haml b/app/views/auth/shared/_links.html.haml index 516c625a6..3c68ccd22 100644 --- a/app/views/auth/shared/_links.html.haml +++ b/app/views/auth/shared/_links.html.haml @@ -3,7 +3,7 @@ %li= link_to t('auth.login'), new_session_path(resource_name) - if devise_mapping.registerable? && controller_name != 'registrations' - %li= link_to t('auth.register'), open_registrations? ? new_registration_path(resource_name) : 'https://joinmastodon.org/#getting-started' + %li= link_to t('auth.register'), available_sign_up_path - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %li= link_to t('auth.forgot_password'), new_password_path(resource_name) |