diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-15 18:19:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 18:19:20 +0100 |
| commit | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (patch) | |
| tree | 070a16d495d962a1f4efb9e196fae18803cf3835 /app/views/about | |
| parent | 1978f7265e1e83bda25413da26f53c53110af764 (diff) | |
| parent | b0722fbc14cf1cee412c3524c51705c9902bde7f (diff) | |
Merge pull request #1476 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/about')
| -rw-r--r-- | app/views/about/_registration.html.haml | 2 | ||||
| -rw-r--r-- | app/views/about/more.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/about/_registration.html.haml b/app/views/about/_registration.html.haml index 6160ca4d4..e4d614d71 100644 --- a/app/views/about/_registration.html.haml +++ b/app/views/about/_registration.html.haml @@ -16,7 +16,7 @@ - if approved_registrations? .fields-group = f.simple_fields_for :invite_request do |invite_request_fields| - = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: false + = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: Setting.require_invite_text .fields-group = f.input :agreement, as: :boolean, wrapper: :with_label, label: t('auth.checkbox_agreement_html', rules_path: about_more_path, terms_path: terms_path), required: true, disabled: closed_registrations? diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml index 0a12ab8d6..78f54ec5a 100644 --- a/app/views/about/more.html.haml +++ b/app/views/about/more.html.haml @@ -16,11 +16,11 @@ .row__information-board .information-board__section %span= t 'about.user_count_before' - %strong= number_with_delimiter @instance_presenter.user_count + %strong= number_to_human @instance_presenter.user_count, strip_insignificant_zeros: true %span= t 'about.user_count_after', count: @instance_presenter.user_count .information-board__section %span= t 'about.status_count_before' - %strong= number_with_delimiter @instance_presenter.status_count + %strong= number_to_human @instance_presenter.status_count, strip_insignificant_zeros: true %span= t 'about.status_count_after', count: @instance_presenter.status_count .row__mascot .landing-page__mascot |