Merge branch 'master' into glitch-soc/merge-upstream

2019-04-24 15:25:22 +02:00
parent 416aa832e5 80bbf40ff1
commit 7783ec921b
5 changed files with 9 additions and 8 deletions
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@ -36,6 +36,6 @@
    = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path)

  .actions
-    = f.button :button, sign_up_message, type: :submit
+    = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit

 .form-footer= render 'auth/shared/links'