diff options
| author | Starfall <us@starfall.systems> | 2022-11-10 08:50:11 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-11-10 08:50:11 -0600 |
| commit | 67d1a0476d77e2ed0ca15dd2981c54c2b90b0742 (patch) | |
| tree | 152f8c13a341d76738e8e2c09b24711936e6af68 /app/views/settings/profiles | |
| parent | b581e6b6d4a5ba9ed4ae17427b7f2d5d158be4e5 (diff) | |
| parent | ee7e49d1b1323618e16026bc8db8ab7f9459cc2d (diff) | |
Merge remote-tracking branch 'glitch/main'
- Remove Helm charts - Lots of conflicts with our removal of recommended settings and custom icons
Diffstat (limited to 'app/views/settings/profiles')
| -rw-r--r-- | app/views/settings/profiles/show.html.haml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index b84d06c27..430d1f339 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -41,7 +41,7 @@ .fields-row__column.fields-group.fields-row__column-6 .input.with_block_label %label= t('simple_form.labels.defaults.fields') - %span.hint= t('simple_form.hints.defaults.fields') + %span.hint= t('simple_form.hints.defaults.fields', count: Account::DEFAULT_FIELDS_SIZE) = f.simple_fields_for :fields do |fields_f| .row @@ -70,8 +70,7 @@ %h6= t 'migrations.incoming_migrations' %p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path) -- if open_deletion? - %hr.spacer/ +%hr.spacer/ - %h6= t('auth.delete_account') - %p.muted-hint= t('auth.delete_account_html', path: settings_delete_path) +%h6= t('auth.delete_account') +%p.muted-hint= t('auth.delete_account_html', path: settings_delete_path) |