mirror of https://github.com/mastodon/mastodon
I18n health warnings (#1949)
* Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement
* Use implicit controller/action path for i18n in admin/domain_blocks
* Add DomainBlock#accounts has_many
* Avoid i18n health warning for `en` locale by using symbol scope with :count
* Remove unused i18n key: plaintext_secret_html
* Remove unused i18n key two_factor_auth.warning
* Remove final will_paginate i18n keys
* Remove unused key two_factor_auth.recovery_codes
* Remove unused key: admin.reports.comment.none
* Remove unused reports. i18n namespace (moved to admin.reports)
* Ignore keys from locales which override activemodel and activerecord errors
* Revert "Remove unused key: admin.reports.comment.none"
This reverts commit 350ef2685f.
* Update i18n key reference to match moved location
* Add missing `en` keys to i18n
* Tell i18n-tasks to ignore missing attributes that dont need overwriting
* Add i18n-tasks unused to travis
pull/1883/head^2
Matt Jankowski
8 years ago
committed by
Eugen
parent
7e2e0d6dcc
commit
f87b51fda8
@ -1,24 +1,24 @@
|
||||
- content_for :page_title do
|
||||
= t('admin.domain_block.title')
|
||||
= t('admin.domain_blocks.title')
|
||||
|
||||
%table.table
|
||||
%thead
|
||||
%tr
|
||||
%th= t('admin.domain_block.domain')
|
||||
%th= t('admin.domain_block.severity')
|
||||
%th= t('admin.domain_block.reject_media')
|
||||
%th= t('admin.domain_blocks.domain')
|
||||
%th= t('admin.domain_blocks.severity')
|
||||
%th= t('admin.domain_blocks.reject_media')
|
||||
%th
|
||||
%tbody
|
||||
- @blocks.each do |block|
|
||||
%tr
|
||||
%td
|
||||
%samp= block.domain
|
||||
%td= t("admin.domain_block.severities.#{block.severity}")
|
||||
%td= t("admin.domain_blocks.severities.#{block.severity}")
|
||||
%td
|
||||
- if block.reject_media? || block.suspend?
|
||||
%i.fa.fa-check
|
||||
%td
|
||||
= table_link_to 'undo', t('admin.domain_block.undo'), admin_domain_block_path(block)
|
||||
= table_link_to 'undo', t('admin.domain_blocks.undo'), admin_domain_block_path(block)
|
||||
|
||||
= paginate @blocks
|
||||
= link_to t('admin.domain_block.add_new'), new_admin_domain_block_path, class: 'button'
|
||||
= link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button'
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
- content_for :page_title do
|
||||
= t('admin.domain_block.new.title')
|
||||
= t('.title')
|
||||
|
||||
= simple_form_for @domain_block, url: admin_domain_blocks_path do |f|
|
||||
= render 'shared/error_messages', object: @domain_block
|
||||
|
||||
%p.hint= t('admin.domain_block.new.hint')
|
||||
%p.hint= t('.hint')
|
||||
|
||||
= f.input :domain, placeholder: t('admin.domain_block.domain')
|
||||
= f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("admin.domain_block.new.severity.#{type}") }
|
||||
= f.input :domain, placeholder: t('admin.domain_blocks.domain')
|
||||
= f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| t(".severity.#{type}") }
|
||||
|
||||
%p.hint= t('admin.domain_block.new.severity.desc_html')
|
||||
%p.hint= t('.severity.desc_html')
|
||||
|
||||
= f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_block.reject_media'), hint: I18n.t('admin.domain_block.reject_media_hint')
|
||||
= f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint')
|
||||
|
||||
.actions
|
||||
= f.button :button, t('admin.domain_block.new.create'), type: :submit
|
||||
= f.button :button, t('.create'), type: :submit
|
||||
|
||||
@ -1,9 +1,15 @@
|
||||
- content_for :page_title do
|
||||
= t('admin.domain_block.show.title', domain: @domain_block.domain)
|
||||
= t('admin.domain_blocks.show.title', domain: @domain_block.domain)
|
||||
|
||||
= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :delete do |f|
|
||||
|
||||
= f.input :retroactive, as: :boolean, wrapper: :with_label, label: I18n.t("admin.domain_block.show.retroactive.#{@domain_block.severity}"), hint: I18n.t('admin.domain_block.show.affected_accounts', count: Account.where(domain: @domain_block.domain).count)
|
||||
= f.input :retroactive,
|
||||
as: :boolean,
|
||||
wrapper: :with_label,
|
||||
label: t(".retroactive.#{@domain_block.severity}"),
|
||||
hint: t(:affected_accounts,
|
||||
scope: [:admin, :domain_blocks, :show],
|
||||
count: @domain_block.accounts_count)
|
||||
|
||||
.actions
|
||||
= f.button :button, t('admin.domain_block.show.undo'), type: :submit
|
||||
= f.button :button, t('.undo'), type: :submit
|
||||
|
||||
Loading…
Reference in New Issue