about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-04-24 19:42:33 +0200
committerGitHub <noreply@github.com>2019-04-24 19:42:33 +0200
commit9add18604c46e26bb38f72d88daaeb571288027c (patch)
treee59422814b6414d9eae8cf63c87d61b4f21ec3c7 /app
parent416aa832e5074d21a6497f66163311658b9da5fb (diff)
parent7783ec921b9997f91264520a6c674946ecb97eb8 (diff)
Merge pull request #1007 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app')
-rw-r--r--app/views/auth/registrations/new.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index bd6e3a13f..b4a7cced5 100644
--- 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'