vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix IDN domains not being rendered correctly in a few left-over places (#17848)

Browse source
This commit is contained in:
Eugen Rochko 2022-03-22 10:07:11 +01:00 • committed by GitHub
parent 4e9855e09a
commit 392b367835
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 79 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/account_actions/new.html.haml
View file

@ -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/