diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 1f3e7555ab7fd1..57cd9ca415d3f8 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -14,6 +14,7 @@ class Form::AdminSettings site_terms registrations_mode closed_registrations_message + registration_button_message timeline_preview bootstrap_timeline_accounts theme diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml index 168f1097570772..3674c6c2d36564 100644 --- a/app/views/admin/settings/registrations/show.html.haml +++ b/app/views/admin/settings/registrations/show.html.haml @@ -24,5 +24,8 @@ .fields-group = f.input :closed_registrations_message, as: :text, wrapper: :with_block_label, input_html: { rows: 2 } + .fields-group + = f.input :registration_button_message, as: :text, kmyblue: true, hint: false, wrapper: :with_label, input_html: { rows: 2 } + .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index 6c97fa76a0ad16..8724b948040e5e 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -40,8 +40,9 @@ .fields-group = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.privacy_policy_agreement_html', rules_path: about_more_path, privacy_policy_path: privacy_policy_path), required: true - %div - = t('auth.cloudflare_with_registering') + - if Setting.registration_button_message.present? + %div + = Setting.registration_button_message .actions = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 7416f423f3007d..f4e30c8fb931f5 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -320,6 +320,7 @@ en: peers_api_enabled: Publish list of discovered servers in the API profile_directory: Enable profile directory receive_other_servers_emoji_reaction: Receive stamp between other server users + registration_button_message: Register button message registrations_mode: Who can sign-up require_invite_text: Require a reason to join show_domain_blocks: Show domain blocks diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 0c9fbd24336c2d..1a225fcf7b0672 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -335,6 +335,7 @@ ja: peers_api_enabled: 発見したサーバーのリストをAPIで公開する profile_directory: ディレクトリを有効にする receive_other_servers_emoji_reaction: 他のサーバーのユーザーが他のサーバーの投稿につけたスタンプを受け入れる + registration_button_message: 新規登録ボタンの直上に表示するメッセージ registrations_mode: 新規登録が可能な人 require_invite_text: 申請事由の入力を必須にする show_domain_blocks: ドメインブロックを表示