Fix IDN domains not being rendered correctly in a few left-over places (#17848)
This commit is contained in:
parent
4e9855e09a
commit
392b367835
27 changed files with 79 additions and 59 deletions
|
@ -1,11 +1,11 @@
|
|||
- content_for :page_title do
|
||||
= t('admin.account_actions.title', acct: @account.acct)
|
||||
= t('admin.account_actions.title', acct: @account.pretty_acct)
|
||||
|
||||
= simple_form_for @account_action, url: admin_account_action_path(@account.id) do |f|
|
||||
= f.input :report_id, as: :hidden
|
||||
|
||||
.fields-group
|
||||
= f.input :type, as: :radio_buttons, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { safe_join([I18n.t("simple_form.labels.admin_account_action.types.#{type}"), content_tag(:span, I18n.t("simple_form.hints.admin_account_action.types.#{type}"), class: 'hint')])}, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.acct)
|
||||
= f.input :type, as: :radio_buttons, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { safe_join([I18n.t("simple_form.labels.admin_account_action.types.#{type}"), content_tag(:span, I18n.t("simple_form.hints.admin_account_action.types.#{type}"), class: 'hint')])}, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.pretty_acct)
|
||||
|
||||
- if @account.local?
|
||||
%hr.spacer/
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
= fa_icon 'warning'
|
||||
.log-entry__content
|
||||
.log-entry__title
|
||||
= t(account_warning.action, scope: 'admin.strikes.actions', name: content_tag(:span, account_warning.account.username, class: 'username'), target: content_tag(:span, account_warning.target_account.acct, class: 'target')).html_safe
|
||||
= t(account_warning.action, scope: 'admin.strikes.actions', name: content_tag(:span, account_warning.account.username, class: 'username'), target: content_tag(:span, account_warning.target_account.pretty_acct, class: 'target')).html_safe
|
||||
.log-entry__timestamp
|
||||
%time.formatted{ datetime: account_warning.created_at.iso8601 }
|
||||
= l(account_warning.created_at)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- content_for :page_title do
|
||||
= @account.acct
|
||||
= @account.pretty_acct
|
||||
|
||||
- if @account.instance_actor?
|
||||
.flash-message.notice
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- content_for :page_title do
|
||||
= t('admin.accounts.change_email.title', username: @account.acct)
|
||||
= t('admin.accounts.change_email.title', username: @account.username)
|
||||
|
||||
= simple_form_for @user, url: admin_account_change_email_path(@account.id) do |f|
|
||||
.fields-group
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
= image_tag appeal.account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar'
|
||||
.log-entry__content
|
||||
.log-entry__title
|
||||
= t(appeal.strike.action, scope: 'admin.strikes.actions', name: content_tag(:span, appeal.strike.account.username, class: 'username'), target: content_tag(:span, appeal.account.acct, class: 'target')).html_safe
|
||||
= t(appeal.strike.action, scope: 'admin.strikes.actions', name: content_tag(:span, appeal.strike.account.username, class: 'username'), target: content_tag(:span, appeal.account.username, class: 'target')).html_safe
|
||||
.log-entry__timestamp
|
||||
%time.formatted{ datetime: appeal.strike.created_at.iso8601 }
|
||||
= l(appeal.strike.created_at)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- content_for :page_title do
|
||||
= t('admin.relationships.title', acct: @account.acct)
|
||||
= t('admin.relationships.title', acct: @account.pretty_acct)
|
||||
|
||||
.filters
|
||||
.filter-subset
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
- content_for :page_title do
|
||||
= t('admin.statuses.title')
|
||||
\-
|
||||
= "@#{@account.acct}"
|
||||
= "@#{@account.pretty_acct}"
|
||||
|
||||
.filters
|
||||
.filter-subset
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue