Browse Source

Redesign admin instances area (#9645)

Eugen Rochko 3 months ago
parent
commit
1c6588accc
No account linked to committer's email address
60 changed files with 159 additions and 531 deletions
  1. 3
    8
      app/controllers/admin/domain_blocks_controller.rb
  2. 14
    13
      app/controllers/admin/instances_controller.rb
  3. 2
    1
      app/helpers/admin/filter_helper.rb
  4. 14
    0
      app/javascript/styles/mastodon/admin.scss
  5. 1
    0
      app/javascript/styles/mastodon/dashboard.scss
  6. 17
    4
      app/models/instance.rb
  7. 3
    14
      app/models/instance_filter.rb
  8. 1
    1
      app/policies/instance_policy.rb
  9. 0
    13
      app/views/admin/domain_blocks/_domain_block.html.haml
  10. 0
    17
      app/views/admin/domain_blocks/index.html.haml
  11. 1
    3
      app/views/admin/instances/_instance.html.haml
  12. 32
    16
      app/views/admin/instances/index.html.haml
  13. 44
    0
      app/views/admin/instances/show.html.haml
  14. 0
    10
      config/locales/ar.yml
  15. 0
    2
      config/locales/ast.yml
  16. 0
    10
      config/locales/ca.yml
  17. 0
    10
      config/locales/co.yml
  18. 0
    10
      config/locales/cs.yml
  19. 0
    10
      config/locales/cy.yml
  20. 0
    10
      config/locales/da.yml
  21. 0
    10
      config/locales/de.yml
  22. 0
    10
      config/locales/el.yml
  23. 21
    13
      config/locales/en.yml
  24. 0
    10
      config/locales/eo.yml
  25. 0
    10
      config/locales/es.yml
  26. 0
    10
      config/locales/eu.yml
  27. 0
    10
      config/locales/fa.yml
  28. 0
    10
      config/locales/fi.yml
  29. 0
    10
      config/locales/fr.yml
  30. 0
    10
      config/locales/gl.yml
  31. 0
    7
      config/locales/he.yml
  32. 0
    10
      config/locales/hu.yml
  33. 0
    7
      config/locales/id.yml
  34. 0
    7
      config/locales/io.yml
  35. 0
    10
      config/locales/it.yml
  36. 0
    10
      config/locales/ja.yml
  37. 0
    10
      config/locales/ka.yml
  38. 0
    10
      config/locales/ko.yml
  39. 0
    10
      config/locales/ms.yml
  40. 0
    10
      config/locales/nl.yml
  41. 0
    10
      config/locales/no.yml
  42. 0
    10
      config/locales/oc.yml
  43. 0
    10
      config/locales/pl.yml
  44. 0
    10
      config/locales/pt-BR.yml
  45. 0
    10
      config/locales/pt.yml
  46. 0
    10
      config/locales/ru.yml
  47. 0
    10
      config/locales/sk.yml
  48. 0
    10
      config/locales/sr-Latn.yml
  49. 0
    10
      config/locales/sr.yml
  50. 0
    10
      config/locales/sv.yml
  51. 0
    7
      config/locales/th.yml
  52. 0
    7
      config/locales/tr.yml
  53. 0
    10
      config/locales/uk.yml
  54. 0
    10
      config/locales/zh-CN.yml
  55. 0
    10
      config/locales/zh-HK.yml
  56. 0
    10
      config/locales/zh-TW.yml
  57. 1
    2
      config/navigation.rb
  58. 2
    6
      config/routes.rb
  59. 2
    22
      spec/controllers/admin/domain_blocks_controller_spec.rb
  60. 1
    1
      spec/policies/instance_policy_spec.rb

+ 3
- 8
app/controllers/admin/domain_blocks_controller.rb View File

@@ -4,14 +4,9 @@ module Admin
4 4
   class DomainBlocksController < BaseController
5 5
     before_action :set_domain_block, only: [:show, :destroy]
6 6
 
7
-    def index
8
-      authorize :domain_block, :index?
9
-      @domain_blocks = DomainBlock.page(params[:page])
10
-    end
11
-
12 7
     def new
13 8
       authorize :domain_block, :create?
14
-      @domain_block = DomainBlock.new
9
+      @domain_block = DomainBlock.new(domain: params[:_domain])
15 10
     end
16 11
 
17 12
     def create
@@ -22,7 +17,7 @@ module Admin
22 17
       if @domain_block.save
23 18
         DomainBlockWorker.perform_async(@domain_block.id)
24 19
         log_action :create, @domain_block
25
-        redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.created_msg')
20
+        redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
26 21
       else
27 22
         render :new
28 23
       end
@@ -36,7 +31,7 @@ module Admin
36 31
       authorize @domain_block, :destroy?
37 32
       UnblockDomainService.new.call(@domain_block, retroactive_unblock?)
38 33
       log_action :destroy, @domain_block
39
-      redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.destroyed_msg')
34
+      redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.destroyed_msg')
40 35
     end
41 36
 
42 37
     private

+ 14
- 13
app/controllers/admin/instances_controller.rb View File

@@ -4,14 +4,21 @@ module Admin
4 4
   class InstancesController < BaseController
5 5
     def index
6 6
       authorize :instance, :index?
7
+
7 8
       @instances = ordered_instances
8 9
     end
9 10
 
10
-    def resubscribe
11
-      authorize :instance, :resubscribe?
12
-      params.require(:by_domain)
13
-      Pubsubhubbub::SubscribeWorker.push_bulk(subscribeable_accounts.pluck(:id))
14
-      redirect_to admin_instances_path
11
+    def show
12
+      authorize :instance, :show?
13
+
14
+      @instance        = Instance.new(Account.by_domain_accounts.find_by(domain: params[:id]) || DomainBlock.find_by!(domain: params[:id]))
15
+      @following_count = Follow.where(account: Account.where(domain: params[:id])).count
16
+      @followers_count = Follow.where(target_account: Account.where(domain: params[:id])).count
17
+      @reports_count   = Report.where(target_account: Account.where(domain: params[:id])).count
18
+      @blocks_count    = Block.where(target_account: Account.where(domain: params[:id])).count
19
+      @available       = DeliveryFailureTracker.available?(Account.select(:shared_inbox_url).where(domain: params[:id]).first&.shared_inbox_url)
20
+      @media_storage   = MediaAttachment.where(account: Account.where(domain: params[:id])).sum(:file_file_size)
21
+      @domain_block    = DomainBlock.find_by(domain: params[:id])
15 22
     end
16 23
 
17 24
     private
@@ -27,17 +34,11 @@ module Admin
27 34
     helper_method :paginated_instances
28 35
 
29 36
     def ordered_instances
30
-      paginated_instances.map { |account| Instance.new(account) }
31
-    end
32
-
33
-    def subscribeable_accounts
34
-      Account.remote.where(protocol: :ostatus).where(domain: params[:by_domain])
37
+      paginated_instances.map { |resource| Instance.new(resource) }
35 38
     end
36 39
 
37 40
     def filter_params
38
-      params.permit(
39
-        :domain_name
40
-      )
41
+      params.permit(:limited)
41 42
     end
42 43
   end
43 44
 end

+ 2
- 1
app/helpers/admin/filter_helper.rb View File

@@ -6,8 +6,9 @@ module Admin::FilterHelper
6 6
   INVITE_FILTER        = %i(available expired).freeze
7 7
   CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze
8 8
   TAGS_FILTERS         = %i(hidden).freeze
9
+  INSTANCES_FILTERS    = %i(limited).freeze
9 10
 
10
-  FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS
11
+  FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS
11 12
 
12 13
   def filter_link_to(text, link_to_params, link_class_params = link_to_params)
13 14
     new_url = filtered_url_for(link_to_params)

+ 14
- 0
app/javascript/styles/mastodon/admin.scss View File

@@ -151,6 +151,20 @@ $no-columns-breakpoint: 600px;
151 151
       font-weight: 500;
152 152
     }
153 153
 
154
+    .directory__tag a {
155
+      box-shadow: none;
156
+    }
157
+
158
+    .directory__tag h4 {
159
+      font-size: 18px;
160
+      font-weight: 700;
161
+      color: $primary-text-color;
162
+      text-transform: none;
163
+      padding-bottom: 0;
164
+      margin-bottom: 0;
165
+      border-bottom: none;
166
+    }
167
+
154 168
     & > p {
155 169
       font-size: 14px;
156 170
       line-height: 18px;

+ 1
- 0
app/javascript/styles/mastodon/dashboard.scss View File

@@ -39,6 +39,7 @@
39 39
     color: $primary-text-color;
40 40
     font-family: $font-display, sans-serif;
41 41
     margin-bottom: 20px;
42
+    line-height: 30px;
42 43
   }
43 44
 
44 45
   &__text {

+ 17
- 4
app/models/instance.rb View File

@@ -3,10 +3,23 @@
3 3
 class Instance
4 4
   include ActiveModel::Model
5 5
 
6
-  attr_accessor :domain, :accounts_count
6
+  attr_accessor :domain, :accounts_count, :domain_block
7 7
 
8
-  def initialize(account)
9
-    @domain = account.domain
10
-    @accounts_count = account.accounts_count
8
+  def initialize(resource)
9
+    @domain         = resource.domain
10
+    @accounts_count = resource.accounts_count
11
+    @domain_block   = resource.is_a?(DomainBlock) ? resource : DomainBlock.find_by(domain: domain)
12
+  end
13
+
14
+  def cached_sample_accounts
15
+    Rails.cache.fetch("#{cache_key}/sample_accounts", expires_in: 12.hours) { Account.where(domain: domain).searchable.joins(:account_stat).popular.limit(3) }
16
+  end
17
+
18
+  def to_param
19
+    domain
20
+  end
21
+
22
+  def cache_key
23
+    domain
11 24
   end
12 25
 end

+ 3
- 14
app/models/instance_filter.rb View File

@@ -8,21 +8,10 @@ class InstanceFilter
8 8
   end
9 9
 
10 10
   def results
11
-    scope = Account.remote.by_domain_accounts
12
-    params.each do |key, value|
13
-      scope.merge!(scope_for(key, value)) if value.present?
14
-    end
15
-    scope
16
-  end
17
-
18
-  private
19
-
20
-  def scope_for(key, value)
21
-    case key.to_s
22
-    when 'domain_name'
23
-      Account.matches_domain(value)
11
+    if params[:limited].present?
12
+      DomainBlock.order(id: :desc)
24 13
     else
25
-      raise "Unknown filter: #{key}"
14
+      Account.remote.by_domain_accounts
26 15
     end
27 16
   end
28 17
 end

+ 1
- 1
app/policies/instance_policy.rb View File

@@ -5,7 +5,7 @@ class InstancePolicy < ApplicationPolicy
5 5
     admin?
6 6
   end
7 7
 
8
-  def resubscribe?
8
+  def show?
9 9
     admin?
10 10
   end
11 11
 end

+ 0
- 13
app/views/admin/domain_blocks/_domain_block.html.haml View File

@@ -1,13 +0,0 @@
1
-%tr
2
-  %td
3
-    %samp= domain_block.domain
4
-  %td.severity
5
-    = t("admin.domain_blocks.severities.#{domain_block.severity}")
6
-  %td.reject_media
7
-    - if domain_block.reject_media? || domain_block.suspend?
8
-      %i.fa.fa-check
9
-  %td.reject_reports
10
-    - if domain_block.reject_reports? || domain_block.suspend?
11
-      %i.fa.fa-check
12
-  %td
13
-    = table_link_to 'undo', t('admin.domain_blocks.undo'), admin_domain_block_path(domain_block)

+ 0
- 17
app/views/admin/domain_blocks/index.html.haml View File

@@ -1,17 +0,0 @@
1
-- content_for :page_title do
2
-  = t('admin.domain_blocks.title')
3
-
4
-.table-wrapper
5
-  %table.table
6
-    %thead
7
-      %tr
8
-        %th= t('admin.domain_blocks.domain')
9
-        %th= t('admin.domain_blocks.severity')
10
-        %th= t('admin.domain_blocks.reject_media')
11
-        %th= t('admin.domain_blocks.reject_reports')
12
-        %th
13
-    %tbody
14
-      = render @domain_blocks
15
-
16
-= paginate @domain_blocks
17
-= link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button'

+ 1
- 3
app/views/admin/instances/_instance.html.haml View File

@@ -1,7 +1,5 @@
1 1
 %tr
2 2
   %td
3
-    = link_to instance.domain, admin_accounts_path(by_domain: instance.domain)
3
+    = link_to instance.domain, admin_instance_path(instance)
4 4
   %td.count
5 5
     = instance.accounts_count
6
-  %td
7
-    = table_link_to 'paper-plane-o', t('admin.accounts.resubscribe'), resubscribe_admin_instances_url(by_domain: instance.domain), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }

+ 32
- 16
app/views/admin/instances/index.html.haml View File

@@ -1,23 +1,39 @@
1 1
 - content_for :page_title do
2 2
   = t('admin.instances.title')
3 3
 
4
-= form_tag admin_instances_url, method: 'GET', class: 'simple_form' do
5
-  .fields-group
6
-    - %i(domain_name).each do |key|
7
-      .input.string.optional
8
-        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.instances.#{key}")
4
+.filters
5
+  .filter-subset
6
+    %strong= t('admin.instances.moderation.title')
7
+    %ul
8
+      %li= filter_link_to t('admin.instances.moderation.all'), limited: nil
9
+      %li= filter_link_to t('admin.instances.moderation.limited'), limited: '1'
9 10
 
10
-    .actions
11
-      %button= t('admin.instances.search')
12
-      = link_to t('admin.instances.reset'), admin_instances_path, class: 'button negative'
11
+  %div{ style: 'flex: 1 1 auto; text-align: right' }
12
+    = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button'
13 13
 
14
-.table-wrapper
15
-  %table.table
16
-    %thead
17
-      %tr
18
-        %th= t('admin.instances.domain_name')
19
-        %th= t('admin.instances.account_count')
20
-    %tbody
21
-      = render @instances
14
+%hr.spacer/
15
+
16
+- @instances.each do |instance|
17
+  .directory__tag
18
+    = link_to admin_instance_path(instance) do
19
+      %h4
20
+        = instance.domain
21
+        %small
22
+          = t('admin.instances.known_accounts', count: instance.accounts_count)
23
+
24
+          - if instance.domain_block
25
+            - if !instance.domain_block.noop?
26
+              &bull;
27
+              = t("admin.domain_blocks.severity.#{instance.domain_block.severity}")
28
+            - if instance.domain_block.reject_media?
29
+              &bull;
30
+              = t('admin.domain_blocks.rejecting_media')
31
+            - if instance.domain_block.reject_reports?
32
+              &bull;
33
+              = t('admin.domain_blocks.rejecting_reports')
34
+
35
+      .avatar-stack
36
+        - instance.cached_sample_accounts.each do |account|
37
+          = image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar'
22 38
 
23 39
 = paginate paginated_instances

+ 44
- 0
app/views/admin/instances/show.html.haml View File

@@ -0,0 +1,44 @@
1
+- content_for :page_title do
2
+  = @instance.domain
3
+
4
+.dashboard__counters
5
+  %div
6
+    %div
7
+      .dashboard__counters__num= number_with_delimiter @following_count
8
+      .dashboard__counters__label= t 'admin.instances.total_followed_by_them'
9
+  %div
10
+    %div
11
+      .dashboard__counters__num= number_with_delimiter @followers_count
12
+      .dashboard__counters__label= t 'admin.instances.total_followed_by_us'
13
+  %div
14
+    %div
15
+      .dashboard__counters__num= number_to_human_size @media_storage
16
+      .dashboard__counters__label= t 'admin.instances.total_storage'
17
+  %div
18
+    %div
19
+      .dashboard__counters__num= number_with_delimiter @blocks_count
20
+      .dashboard__counters__label= t 'admin.instances.total_blocked_by_us'
21
+  %div
22
+    %div
23
+      .dashboard__counters__num= number_with_delimiter @reports_count
24
+      .dashboard__counters__label= t 'admin.instances.total_reported'
25
+  %div
26
+    %div
27
+      .dashboard__counters__num
28
+        - if @available
29
+          = fa_icon 'check'
30
+        - else
31
+          = fa_icon 'times'
32
+      .dashboard__counters__label= t 'admin.instances.delivery_available'
33
+
34
+%hr.spacer/
35
+
36
+%div{ style: 'overflow: hidden' }
37
+  %div{ style: 'float: left' }
38
+    = link_to t('admin.accounts.title'), admin_accounts_path(remote: '1', by_domain: @instance.domain), class: 'button'
39
+
40
+  %div{ style: 'float: right' }
41
+    - if @domain_block
42
+      = link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@domain_block), class: 'button'
43
+    - else
44
+      = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @instance.domain), class: 'button'

+ 0
- 10
config/locales/ar.yml View File

@@ -280,11 +280,6 @@ ar:
280 280
       reject_media: رفض ملفات الوسائط
281 281
       reject_media_hint: يزيل ملفات الوسائط المخزنة محليًا ويرفض تنزيل أي ملفات في المستقبل. غير ذي صلة للتعليق
282 282
       reject_reports: رفض التقارير
283
-      severities:
284
-        noop: لا شيء
285
-        silence: إخفاء أو كتم
286
-        suspend: تعليق
287
-      severity: الشدة
288 283
       show:
289 284
         affected_accounts:
290 285
           few: "%{count} حسابات معنية في قاعدة البيانات"
@@ -298,7 +293,6 @@ ar:
298 293
           suspend: إلغاء التعليق المفروض على كافة حسابات هذا النطاق
299 294
         title: رفع حظر النطاق عن %{domain}
300 295
         undo: إلغاء
301
-      title: حظر النطاقات
302 296
       undo: إلغاء
303 297
     email_domain_blocks:
304 298
       add_new: إضافة
@@ -311,10 +305,6 @@ ar:
311 305
         title: إضافة نطاق بريد جديد إلى اللائحة السوداء
312 306
       title: القائمة السوداء للبريد الإلكتروني
313 307
     instances:
314
-      account_count: الحسابات المعروفة
315
-      domain_name: النطاق
316
-      reset: إعادة تعيين
317
-      search: البحث
318 308
       title: مثيلات الخوادم المعروفة
319 309
     invites:
320 310
       deactivate_all: تعطيلها كافة

+ 0
- 2
config/locales/ast.yml View File

@@ -96,8 +96,6 @@ ast:
96 96
     email_domain_blocks:
97 97
       domain: Dominiu
98 98
     instances:
99
-      account_count: Cuentes conocíes
100
-      domain_name: Dominiu
101 99
       title: Instancies conocíes
102 100
     invites:
103 101
       filter:

+ 0
- 10
config/locales/ca.yml View File

@@ -263,11 +263,6 @@ ca:
263 263
       reject_media_hint: Elimina els fitxers multimèdia emmagatzemats localment i impedeix baixar-ne cap en el futur. Irrellevant en les suspensions
264 264
       reject_reports: Rebutja informes
265 265
       reject_reports_hint: Ignora tots els informes procedents d'aquest domini. No és rellevant per a les suspensions
266
-      severities:
267
-        noop: Cap
268
-        silence: Silenci
269
-        suspend: Suspensió
270
-      severity: Severitat
271 266
       show:
272 267
         affected_accounts:
273 268
           one: Un compte afectat en la base de dades
@@ -277,7 +272,6 @@ ca:
277 272
           suspend: Desfés la suspensió de tots els comptes d'aquest domini
278 273
         title: Desfés el bloqueig de domini de %{domain}
279 274
         undo: Desfés
280
-      title: Bloquejos de domini
281 275
       undo: Desfés
282 276
     email_domain_blocks:
283 277
       add_new: Afegeix
@@ -290,10 +284,6 @@ ca:
290 284
         title: Nova adreça de correu en la llista negra
291 285
       title: Llista negra de correus electrònics
292 286
     instances:
293
-      account_count: Comptes coneguts
294
-      domain_name: Domini
295
-      reset: Restableix
296
-      search: Cerca
297 287
       title: Instàncies conegudes
298 288
     invites:
299 289
       deactivate_all: Desactiva-ho tot

+ 0
- 10
config/locales/co.yml View File

@@ -265,11 +265,6 @@ co:
265 265
       reject_media_hint: Sguassa tutti i media caricati è ricusa caricamenti futuri. Inutile per una suspensione
266 266
       reject_reports: Righjittà i rapporti
267 267
       reject_reports_hint: Ignurà tutti i signalamenti chì venenu d'issu duminiu. Senz'oghjettu pè e suspensione
268
-      severities:
269
-        noop: Nisuna
270
-        silence: Silenzà
271
-        suspend: Suspende
272
-      severity: Severità
273 268
       show:
274 269
         affected_accounts:
275 270
           one: Un contu tuccatu indè a database
@@ -279,7 +274,6 @@ co:
279 274
           suspend: Ùn suspende più i conti nant’à stu duminiu
280 275
         title: Ùn bluccà più u duminiu %{domain}
281 276
         undo: Annullà
282
-      title: Blucchimi di duminiu
283 277
       undo: Annullà
284 278
     email_domain_blocks:
285 279
       add_new: Aghjustà
@@ -292,10 +286,6 @@ co:
292 286
         title: Nova iscrizzione nant’a lista nera e-mail
293 287
       title: Lista nera e-mail
294 288
     instances:
295
-      account_count: Conti cunnisciuti
296
-      domain_name: Duminiu
297
-      reset: Riinizializà
298
-      search: Cercà
299 289
       title: Istanze cunnisciute
300 290
     invites:
301 291
       deactivate_all: Disattivà tuttu

+ 0
- 10
config/locales/cs.yml View File

@@ -269,11 +269,6 @@ cs:
269 269
       reject_media_hint: Odstraní lokálně uložené soubory a odmítne jejich stažení v budoucnosti. Irelevantní pro suspenzace
270 270
       reject_reports: Odmítnout nahlášení
271 271
       reject_reports_hint: Ignorovat všechna nahlášení pocházející z této domény. Nepodstatné pro suspenzace
272
-      severities:
273
-        noop: Žádné
274
-        silence: Utišit
275
-        suspend: Suspendovat
276
-      severity: Přísnost
277 272
       show:
278 273
         affected_accounts:
279 274
           few: "%{count} účty v databázi byly ovlivněny"
@@ -284,7 +279,6 @@ cs:
284 279
           suspend: Zrušit suspenzaci všech existujících účtů z této domény
285 280
         title: Zrušit blokaci domény %{domain}
286 281
         undo: Odvolat
287
-      title: Doménové blokace
288 282
       undo: Odvolat
289 283
     email_domain_blocks:
290 284
       add_new: Přidat nový
@@ -297,10 +291,6 @@ cs:
297 291
         title: Nový e-mail pro zablokování
298 292
       title: Černá listina e-mailů
299 293
     instances:
300
-      account_count: Známé účty
301
-      domain_name: Doména
302
-      reset: Resetovat
303
-      search: Hledat
304 294
       title: Známé instance
305 295
     invites:
306 296
       deactivate_all: Deaktivovat vše

+ 0
- 10
config/locales/cy.yml View File

@@ -252,11 +252,6 @@ cy:
252 252
       reject_media_hint: Dileu dogfennau cyfryngau wedi eu cadw yn lleol ac yn gwrthod i lawrlwytho unrhyw rai yn y dyfodol. Amherthnasol i ataliadau
253 253
       reject_reports: Gwrthod adroddiadau
254 254
       reject_reports_hint: Anwybyddu'r holl adroddiadau sy'n dod o'r parth hwn. Amherthnasol i ataliadau
255
-      severities:
256
-        noop: Dim
257
-        silence: Tawelu
258
-        suspend: Atal
259
-      severity: Difrifoldeb
260 255
       show:
261 256
         affected_accounts: "%{count} o gyfrifoedd yn y bas data wedi eu hefeithio"
262 257
         retroactive:
@@ -264,7 +259,6 @@ cy:
264 259
           suspend: Dad-atal pob cyfrif o'r parth hwn sy'n bodoli
265 260
         title: Dadwneud blocio parth ar gyfer %{domain}
266 261
         undo: Dadwneud
267
-      title: Blociau parth
268 262
       undo: Dadwneud
269 263
     email_domain_blocks:
270 264
       add_new: Ychwanegu
@@ -277,10 +271,6 @@ cy:
277 271
         title: Cofnod newydd yng nghosbrestr e-byst
278 272
       title: Cosbrestr e-bost
279 273
     instances:
280
-      account_count: Cyfrifau hysbys
281
-      domain_name: Parth
282
-      reset: Ailosod
283
-      search: Chwilio
284 274
       title: Achosion hysbys
285 275
     invites:
286 276
       deactivate_all: Diffodd pob un

+ 0
- 10
config/locales/da.yml View File

@@ -257,11 +257,6 @@ da:
257 257
       reject_media: Afvis medie filer
258 258
       reject_media_hint: Fjerner lokalt lagrede multimedie filer og nægter at hente nogen i fremtiden. Irrelevant for udelukkelser
259 259
       reject_reports: Afvis anmeldelser
260
-      severities:
261
-        noop: Ingen
262
-        silence: Dæmp
263
-        suspend: Udeluk
264
-      severity: Alvorlighed
265 260
       show:
266 261
         affected_accounts:
267 262
           one: En konto i databasen påvirket
@@ -271,7 +266,6 @@ da:
271 266
           suspend: Fjern udelukkelsen af alle eksisterende konti fra dette domæne
272 267
         title: Annuller domæne blokeringen for domænet %{domain}
273 268
         undo: Fortryd
274
-      title: Domæne blokeringer
275 269
       undo: Fortryd
276 270
     email_domain_blocks:
277 271
       add_new: Tilføj ny
@@ -284,10 +278,6 @@ da:
284 278
         title: Ny email blokade opslag
285 279
       title: Email sortliste
286 280
     instances:
287
-      account_count: Kendte konti
288
-      domain_name: Domæne
289
-      reset: Nulstil
290
-      search: Søg
291 281
       title: Kendte instanser
292 282
     invites:
293 283
       deactivate_all: Deaktiver alle

+ 0
- 10
config/locales/de.yml View File

@@ -265,11 +265,6 @@ de:
265 265
       reject_media_hint: Entfernt lokal gespeicherte Mediendateien und verhindert deren künftiges Herunterladen. Für Sperren irrelevant
266 266
       reject_reports: Meldungen ablehnen
267 267
       reject_reports_hint: Ignoriere alle Meldungen von dieser Domain. Irrelevant für Sperrungen
268
-      severities:
269
-        noop: Kein
270
-        silence: Stummschaltung
271
-        suspend: Sperren
272
-      severity: Schweregrad
273 268
       show:
274 269
         affected_accounts:
275 270
           one: Ein Konto in der Datenbank betroffen
@@ -279,7 +274,6 @@ de:
279 274
           suspend: Alle existierenden Konten dieser Domain entsperren
280 275
         title: Domain-Blockade für %{domain} zurücknehmen
281 276
         undo: Zurücknehmen
282
-      title: Domain-Blockaden
283 277
       undo: Zurücknehmen
284 278
     email_domain_blocks:
285 279
       add_new: Neue hinzufügen
@@ -292,10 +286,6 @@ de:
292 286
         title: Neue E-Mail-Domain-Blockade
293 287
       title: E-Mail-Domain-Blockade
294 288
     instances:
295
-      account_count: Bekannte Konten
296
-      domain_name: Domain
297
-      reset: Zurücksetzen
298
-      search: Suchen
299 289
       title: Bekannte Instanzen
300 290
     invites:
301 291
       deactivate_all: Alle deaktivieren

+ 0
- 10
config/locales/el.yml View File

@@ -265,11 +265,6 @@ el:
265 265
       reject_media_hint: Αφαιρεί τα τοπικά αποθηκευμένα αρχεία πολυμέσων και αποτρέπει τη λήψη άλλων στο μέλλον. Δεν έχει σημασία για τις αναστολές
266 266
       reject_reports: Απόρριψη καταγγελιών
267 267
       reject_reports_hint: Αγνόηση όσων καταγγελιών προέρχονται από αυτό τον τομέα. Δεν σχετίζεται με τις παύσεις
268
-      severities:
269
-        noop: Κανένα
270
-        silence: Αποσιώπηση
271
-        suspend: Αναστολή
272
-      severity: Βαρύτητα
273 268
       show:
274 269
         affected_accounts:
275 270
           one: Επηρεάζεται ένας λογαριασμός στη βάση δεδομένων
@@ -279,7 +274,6 @@ el:
279 274
           suspend: Αναίρεση αναστολής όλων των λογαριασμών του τομέα
280 275
         title: Αναίρεση αποκλεισμού για τον τομέα %{domain}
281 276
         undo: Αναίρεση
282
-      title: Αποκλεισμένοι τομείς
283 277
       undo: Αναίρεση
284 278
     email_domain_blocks:
285 279
       add_new: Πρόσθεση νέου
@@ -292,10 +286,6 @@ el:
292 286
         title: Νέα εγγραφή email στη μαύρη λίστα
293 287
       title: Μαύρη λίστα email
294 288
     instances:
295
-      account_count: Γνωστοί λογαριασμοί
296
-      domain_name: Τομέας
297
-      reset: Επαναφορά
298
-      search: Αναζήτηση
299 289
       title: Γνωστοί κόμβοι
300 290
     invites:
301 291
       deactivate_all: Απενεργοποίηση όλων

+ 21
- 13
config/locales/en.yml View File

@@ -256,7 +256,7 @@ en:
256 256
       week_users_active: active this week
257 257
       week_users_new: users this week
258 258
     domain_blocks:
259
-      add_new: Add new
259
+      add_new: Add new domain block
260 260
       created_msg: Domain block is now being processed
261 261
       destroyed_msg: Domain block has been undone
262 262
       domain: Domain
@@ -273,11 +273,11 @@ en:
273 273
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
274 274
       reject_reports: Reject reports
275 275
       reject_reports_hint: Ignore all reports coming from this domain. Irrelevant for suspensions
276
-      severities:
277
-        noop: None
278
-        silence: Silence
279
-        suspend: Suspend
280
-      severity: Severity
276
+      rejecting_media: rejecting media files
277
+      rejecting_reports: rejecting reports
278
+      severity:
279
+        silence: silenced
280
+        suspend: suspended
281 281
       show:
282 282
         affected_accounts:
283 283
           one: One account in the database affected
@@ -287,8 +287,7 @@ en:
287 287
           suspend: Unsuspend all existing accounts from this domain
288 288
         title: Undo domain block for %{domain}
289 289
         undo: Undo
290
-      title: Domain blocks
291
-      undo: Undo
290
+      undo: Undo domain block
292 291
     email_domain_blocks:
293 292
       add_new: Add new
294 293
       created_msg: Successfully added e-mail domain to blacklist
@@ -303,11 +302,20 @@ en:
303 302
       back_to_account: Back To Account
304 303
       title: "%{acct}'s Followers"
305 304
     instances:
306
-      account_count: Known accounts
307
-      domain_name: Domain
308
-      reset: Reset
309
-      search: Search
310
-      title: Known instances
305
+      delivery_available: Delivery is available
306
+      known_accounts:
307
+        one: "%{count} known account"
308
+        other: "%{count} known accounts"
309
+      moderation:
310
+        all: All
311
+        limited: Limited
312
+        title: Moderation
313
+      title: Federation
314
+      total_blocked_by_us: Blocked by us
315
+      total_followed_by_them: Followed by them
316
+      total_followed_by_us: Followed by us
317
+      total_reported: Reports about them
318
+      total_storage: Media attachments
311 319
     invites:
312 320
       deactivate_all: Deactivate all
313 321
       filter:

+ 0
- 10
config/locales/eo.yml View File

@@ -261,11 +261,6 @@ eo:
261 261
         title: Nova domajna blokado
262 262
       reject_media: Malakcepti aŭdovidajn dosierojn
263 263
       reject_media_hint: Forigas aŭdovidaĵojn loke konservitajn kaj rifuzas alŝuti ajnan estonte. Senzorge pri haltigoj
264
-      severities:
265
-        noop: Nenio
266
-        silence: Kaŝi
267
-        suspend: Haltigi
268
-      severity: Severeco
269 264
       show:
270 265
         affected_accounts:
271 266
           one: Unu konto en la datumbazo esta influita
@@ -275,7 +270,6 @@ eo:
275 270
           suspend: Malhaltigi ĉiujn kontojn, kiuj ekzistas en ĉi tiu domajno
276 271
         title: Malfari domajnan blokadon por %{domain}
277 272
         undo: Malfari
278
-      title: Domajnaj blokadoj
279 273
       undo: Malfari
280 274
     email_domain_blocks:
281 275
       add_new: Aldoni novan
@@ -288,10 +282,6 @@ eo:
288 282
         title: Nova blokado de retadresa domajno
289 283
       title: Nigra listo de retadresaj domajnoj
290 284
     instances:
291
-      account_count: Konataj kontoj
292
-      domain_name: Domajno
293
-      reset: Restarigi
294
-      search: Serĉi
295 285
       title: Konataj nodoj
296 286
     invites:
297 287
       deactivate_all: Malaktivigi ĉion

+ 0
- 10
config/locales/es.yml View File

@@ -260,11 +260,6 @@ es:
260 260
       reject_media_hint: Remueve localmente archivos multimedia almacenados para descargar cualquiera en el futuro. Irrelevante para suspensiones
261 261
       reject_reports: Rechazar informes
262 262
       reject_reports_hint: Ignore todos los reportes de este dominio. Irrelevante para suspensiones
263
-      severities:
264
-        noop: Ninguno
265
-        silence: Silenciar
266
-        suspend: Suspender
267
-      severity: Severidad
268 263
       show:
269 264
         affected_accounts:
270 265
           one: Una cuenta en la base de datos afectada
@@ -274,7 +269,6 @@ es:
274 269
           suspend: Des-suspender todas las cuentas existentes de este dominio
275 270
         title: Deshacer bloque de dominio para %{domain}
276 271
         undo: Deshacer
277
-      title: Bloques de Dominio
278 272
       undo: Deshacer
279 273
     email_domain_blocks:
280 274
       add_new: Añadir nuevo
@@ -287,10 +281,6 @@ es:
287 281
         title: Nueva entrada en la lista negra de correo
288 282
       title: Lista negra de correo
289 283
     instances:
290
-      account_count: Cuentas conocidas
291
-      domain_name: Dominio
292
-      reset: Reiniciar
293
-      search: Buscar
294 284
       title: Instancias conocidas
295 285
     invites:
296 286
       deactivate_all: Desactivar todos

+ 0
- 10
config/locales/eu.yml View File

@@ -262,11 +262,6 @@ eu:
262 262
       reject_media_hint: Lokalki gordetako multimedia fitxategiak ezabatzen ditu eta etorkizunean fitxategi berriak deskargatzeari uko egingo dio. Ez du garrantzirik kanporaketetan
263 263
       reject_reports: Errefusatu salaketak
264 264
       reject_reports_hint: Ezikusi domeinu honetatik jasotako salaketak. Kanporatzeentzako garrantzirik gabekoa
265
-      severities:
266
-        noop: Bat ere ez
267
-        silence: Isilarazi
268
-        suspend: Kanporatu
269
-      severity: Larritasuna
270 265
       show:
271 266
         affected_accounts:
272 267
           one: Datu-baseko kontu bati eragiten dio
@@ -276,7 +271,6 @@ eu:
276 271
           suspend: Kendu kanporatzeko agindua domeinu honetako kontu guztiei
277 272
         title: Desegin %{domain} domeinuko blokeoa
278 273
         undo: Desegin
279
-      title: Domeinuen blokeoak
280 274
       undo: Desegin
281 275
     email_domain_blocks:
282 276
       add_new: Gehitu berria
@@ -289,10 +283,6 @@ eu:
289 283
         title: Sarrera berria e-mail zerrenda beltzean
290 284
       title: E-mail zerrenda beltza
291 285
     instances:
292
-      account_count: Kontu ezagunak
293
-      domain_name: Domeinua
294
-      reset: Berrezarri
295
-      search: Bilatu
296 286
       title: Instantzia ezagunak
297 287
     invites:
298 288
       deactivate_all: Desgaitu guztiak

+ 0
- 10
config/locales/fa.yml View File

@@ -260,11 +260,6 @@ fa:
260 260
       reject_media_hint: تصویرهای ذخیره‌شده در این‌جا را پاک می‌کند و جلوی دریافت تصویرها را در آینده می‌گیرد. بی‌تأثیر برای معلق‌شده‌ها
261 261
       reject_reports: نپذیرفتن گزارش‌ها
262 262
       reject_reports_hint: گزارش‌هایی را که از این دامین می‌آید نادیده می‌گیرد. بی‌تأثیر برای معلق‌شده‌ها
263
-      severities:
264
-        noop: هیچ
265
-        silence: بی‌صداکردن
266
-        suspend: معلق‌کردن
267
-      severity: شدت
268 263
       show:
269 264
         affected_accounts:
270 265
           one: روی یک حساب در پایگاه داده تأثیر گذاشت
@@ -274,7 +269,6 @@ fa:
274 269
           suspend: معلق‌شدن همهٔ حساب‌های این دامین را لغو کن
275 270
         title: واگردانی مسدودسازی دامنه برای %{domain}
276 271
         undo: واگردانی
277
-      title: دامین‌های مسدودشده
278 272
       undo: واگردانی
279 273
     email_domain_blocks:
280 274
       add_new: افزودن تازه
@@ -287,10 +281,6 @@ fa:
287 281
         title: مسدودسازی دامین ایمیل تازه
288 282
       title: مسدودسازی دامین‌های ایمیل
289 283
     instances:
290
-      account_count: حساب‌های شناخته‌شده
291
-      domain_name: دامین
292
-      reset: بازنشانی
293
-      search: جستجو
294 284
       title: سرورهای شناخته‌شده
295 285
     invites:
296 286
       deactivate_all: غیرفعال‌کردن همه

+ 0
- 10
config/locales/fi.yml View File

@@ -211,11 +211,6 @@ fi:
211 211
         title: Uusi verkkotunnuksen esto
212 212
       reject_media: Hylkää mediatiedostot
213 213
       reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikä lataa niitä enää jatkossa. Ei merkitystä jäähyn kohdalla
214
-      severities:
215
-        noop: Ei mitään
216
-        silence: Hiljennys
217
-        suspend: Jäähy
218
-      severity: Vakavuus
219 214
       show:
220 215
         affected_accounts:
221 216
           one: Vaikuttaa yhteen tiliin tietokannassa
@@ -225,7 +220,6 @@ fi:
225 220
           suspend: Peru kaikkien tässä verkkotunnuksessa jo olemassa olevien tilien jäähy
226 221
         title: Peru verkkotunnuksen %{domain} esto
227 222
         undo: Peru
228
-      title: Verkkotunnusten estot
229 223
       undo: Peru
230 224
     email_domain_blocks:
231 225
       add_new: Lisää uusi
@@ -238,10 +232,6 @@ fi:
238 232
         title: Uusi sähköpostiestolistan merkintä
239 233
       title: Sähköpostiestolista
240 234
     instances:
241
-      account_count: Tiedossa olevat tilit
242
-      domain_name: Verkkotunnus
243
-      reset: Palauta
244
-      search: Hae
245 235
       title: Tiedossa olevat instanssit
246 236
     invites:
247 237
       filter:

+ 0
- 10
config/locales/fr.yml View File

@@ -265,11 +265,6 @@ fr:
265 265
       reject_media_hint: Supprime localement les fichiers média stockés et refuse d’en télécharger ultérieurement. Ne concerne pas les suspensions
266 266
       reject_reports: Rapports de rejet
267 267
       reject_reports_hint: Ignorez tous les rapports provenant de ce domaine. Sans objet pour les suspensions
268
-      severities:
269
-        noop: Aucune
270
-        silence: Masquer
271
-        suspend: Suspendre
272
-      severity: Séverité
273 268
       show:
274 269
         affected_accounts:
275 270
           one: Un compte affecté dans la base de données
@@ -279,7 +274,6 @@ fr:
279 274
           suspend: Annuler la suspension sur tous les comptes existants pour ce domaine
280 275
         title: Annuler le blocage de domaine pour %{domain}
281 276
         undo: Annuler
282
-      title: Blocage de domaines
283 277
       undo: Annuler
284 278
     email_domain_blocks:
285 279
       add_new: Ajouter
@@ -292,10 +286,6 @@ fr:
292 286
         title: Nouveau blocage de domaine de courriel
293 287
       title: Blocage de domaines de courriel
294 288
     instances:
295
-      account_count: Comptes connus
296
-      domain_name: Domaine
297
-      reset: Réinitialiser
298
-      search: Rechercher
299 289
       title: Instances connues
300 290
     invites:
301 291
       deactivate_all: Tout désactiver

+ 0
- 10
config/locales/gl.yml View File

@@ -265,11 +265,6 @@ gl:
265 265
       reject_media_hint: Eliminar ficheiros de medios almacenados localmente e rexeita descargalos no futuro. Irrelevante para as suspensións
266 266
       reject_reports: Rexeitar informes
267 267
       reject_reports_hint: Ignorar todos os informes procedentes de este dominio. Irrelevante para as suspensións
268
-      severities:
269
-        noop: Ningún
270
-        silence: Silenciar
271
-        suspend: Suspender
272
-      severity: Severidade
273 268
       show:
274 269
         affected_accounts:
275 270
           one: Afectoulle a unha conta na base de datos
@@ -279,7 +274,6 @@ gl:
279 274
           suspend: Non suspender todas as contas existentes de este dominio
280 275
         title: Desfacer o bloqueo de dominio para %{domain}
281 276
         undo: Desfacer
282
-      title: Bloqueos de domino
283 277
       undo: Desfacer
284 278
     email_domain_blocks:
285 279
       add_new: Engadir novo
@@ -292,10 +286,6 @@ gl:
292 286
         title: Nova entrada la lista negra de e-mail
293 287
       title: Lista negra de E-mail
294 288
     instances:
295
-      account_count: Contas coñecidas
296
-      domain_name: Dominio
297
-      reset: Restablecer
298
-      search: Buscar
299 289
       title: Instancias coñecidas
300 290
     invites:
301 291
       deactivate_all: Desactivar todo

+ 0
- 7
config/locales/he.yml View File

@@ -156,10 +156,6 @@ he:
156 156
         title: חסימת שרת חדשה
157 157
       reject_media: חסימת קבצי מדיה
158 158
       reject_media_hint: מסירה קבצי מדיה השמורים מקומית ומונעת מהורדת קבצים נוספים בעתיד. לא רלוונטי להשעיות
159
-      severities:
160
-        silence: השתקה
161
-        suspend: השעייה
162
-      severity: חוּמרה
163 159
       show:
164 160
         affected_accounts:
165 161
           one: חשבון אחד במסד הנתונים מושפע
@@ -169,11 +165,8 @@ he:
169 165
           suspend: הסרת השעייה מכל החשבונות על שרת זה
170 166
         title: ביטול חסימת שרת עבור %{domain}
171 167
         undo: ביטול
172
-      title: חסימת שרתים
173 168
       undo: ביטול
174 169
     instances:
175
-      account_count: חשבונות מוכרים
176
-      domain_name: שם מתחם
177 170
       title: שרתים מוכרים
178 171
     reports:
179 172
       are_you_sure: 100% על בטוח?

+ 0
- 10
config/locales/hu.yml View File

@@ -195,11 +195,6 @@ hu:
195 195
         title: Új domain-tiltás
196 196
       reject_media: Médiafájlok elutasítása
197 197
       reject_media_hint: Eltávolítja a helyben tárolt médiafájlokat és a továbbiakban letiltja az új médiafájlok letöltését. Felfüggesztett fiókok esetében irreleváns opció
198
-      severities:
199
-        noop: Egyik sem
200
-        silence: Némítás
201
-        suspend: Felfüggesztés
202
-      severity: Súlyosság
203 198
       show:
204 199
         affected_accounts:
205 200
           one: Összesen egy fiók érintett az adatbázisban
@@ -209,7 +204,6 @@ hu:
209 204
           suspend: Minden felhasználó felfüggesztésének feloldása ezen a domainen
210 205
         title: "%{domain} domain tiltásának feloldása"
211 206
         undo: Visszavonás
212
-      title: Tiltott domainek
213 207
       undo: Visszavonás
214 208
     email_domain_blocks:
215 209
       add_new: Új hozzáadása
@@ -222,10 +216,6 @@ hu:
222 216
         title: Új e-mail feketelista bejegyzés
223 217
       title: E-mail feketelista
224 218
     instances:
225
-      account_count: Nyilvántartott fiókok
226
-      domain_name: Domain
227
-      reset: Visszaállítás
228
-      search: Keresés
229 219
       title: Nyilvántartott instanciák
230 220
     invites:
231 221
       filter:

+ 0
- 7
config/locales/id.yml View File

@@ -85,10 +85,6 @@ id:
85 85
         title: Pemblokiran domain baru
86 86
       reject_media: Tolak berkas media
87 87
       reject_media_hint: Hapus file media yang tersimpan dan menolak semua unduhan nantinya. Tidak terpengaruh dengan suspen
88
-      severities:
89
-        silence: Diamkan
90
-        suspend: Suspen
91
-      severity: Keparahan
92 88
       show:
93 89
         affected_accounts:
94 90
           one: Satu akun di dalam database terpengaruh
@@ -98,10 +94,7 @@ id:
98 94
           suspend: Hapus suspen terhadap akun pada domain ini
99 95
         title: Hapus pemblokiran domain %{domain}
100 96
         undo: Undo
101
-      title: Pemblokiran Domain
102 97
     instances:
103
-      account_count: Akun yang diketahui
104
-      domain_name: Domain
105 98
       title: Server yang diketahui
106 99
     reports:
107 100
       comment:

+ 0
- 7
config/locales/io.yml View File

@@ -75,10 +75,6 @@ io:
75 75
         title: New domain block
76 76
       reject_media: Reject media files
77 77
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
78
-      severities:
79
-        silence: Silence
80
-        suspend: Suspend
81
-      severity: Severity
82 78
       show:
83 79
         affected_accounts:
84 80
           one: One account in the database affected
@@ -88,11 +84,8 @@ io:
88 84
           suspend: Unsuspend all existing accounts from this domain
89 85
         title: Undo domain block for %{domain}
90 86
         undo: Undo
91
-      title: Domain Blocks
92 87
       undo: Undo
93 88
     instances:
94
-      account_count: Known accounts
95
-      domain_name: Domain
96 89
       title: Known Instances
97 90
     reports:
98 91
       comment:

+ 0
- 10
config/locales/it.yml View File

@@ -260,11 +260,6 @@ it:
260 260
       reject_media_hint: Rimuovi i file media salvati in locale e blocca i download futuri. Irrilevante per le sospensioni
261 261
       reject_reports: Respingi rapporti
262 262
       reject_reports_hint: Ignora tutti i rapporti provenienti da questo dominio. Irrilevante per sospensioni
263
-      severities:
264
-        noop: Nessuno
265
-        silence: Silenzia
266
-        suspend: Sospendi
267
-      severity: Severità
268 263
       show:
269 264
         affected_accounts:
270 265
           one: Interessato un solo account nel database
@@ -274,7 +269,6 @@ it:
274 269
           suspend: Annulla la sospensione di tutti gli account esistenti da questo dominio
275 270
         title: Annulla il blocco del dominio per %{domain}
276 271
         undo: Annulla
277
-      title: Blocchi dominio
278 272
       undo: Annulla
279 273
     email_domain_blocks:
280 274
       add_new: Aggiungi nuovo
@@ -287,10 +281,6 @@ it:
287 281
         title: Nuova voce della lista nera delle email
288 282
       title: Lista nera email
289 283
     instances:
290
-      account_count: Accounts conosciuti
291
-      domain_name: Dominio
292
-      reset: Reimposta
293
-      search: Cerca
294 284
       title: Istanze conosciute
295 285
     invites:
296 286
       deactivate_all: Disattiva tutto

+ 0
- 10
config/locales/ja.yml View File

@@ -265,11 +265,6 @@ ja:
265 265
       reject_media_hint: ローカルに保存されたメディアファイルを削除し、今後のダウンロードを拒否します。停止とは無関係です
266 266
       reject_reports: レポートを拒否
267 267
       reject_reports_hint: このドメインからのレポートをすべて無視します。停止とは無関係です
268
-      severities:
269
-        noop: なし
270
-        silence: サイレンス
271
-        suspend: 停止
272
-      severity: 深刻度
273 268
       show:
274 269
         affected_accounts:
275 270
           one: データベース中の一つのアカウントに影響します
@@ -279,7 +274,6 @@ ja:
279 274
           suspend: このドメインからの存在するすべてのアカウントの停止を戻す
280 275
         title: "%{domain}のドメインブロックを戻す"
281 276
         undo: 元に戻す
282
-      title: ドメインブロック
283 277
       undo: 元に戻す
284 278
     email_domain_blocks:
285 279
       add_new: 新規追加
@@ -292,10 +286,6 @@ ja:
292 286
         title: メールアドレス用ブラックリスト新規追加
293 287
       title: メールブラックリスト
294 288
     instances:
295
-      account_count: 既知のアカウント数
296
-      domain_name: ドメイン名
297
-      reset: リセット
298
-      search: 検索
299 289
       title: 既知のインスタンス
300 290
     invites:
301 291
       deactivate_all: すべて無効化

+ 0
- 10
config/locales/ka.yml View File

@@ -244,11 +244,6 @@ ka:
244 244
         title: ახალი დომენის ბლოკი
245 245
       reject_media: მედია ფაილების უარყოფა
246 246
       reject_media_hint: შლის ლოკალურად შენახულ მედია ფაილებს და უარყოფს სამომავლო გადმოტვირთებს. შეუსაბამო შეჩერებებისთვის
247
-      severities:
248
-        noop: არც ერთი
249
-        silence: გაჩუმება
250
-        suspend: შეჩერება
251
-      severity: სიმძიმე
252 247
       show:
253 248
         affected_accounts:
254 249
           one: გავლენა იქონია მონაცემთა ბაზაში ერთ ანგარიშზე
@@ -258,7 +253,6 @@ ka:
258 253
           suspend: ამ დომენში ყველა არსებულ ანგარიშზე შეჩერების მოშორება
259 254
         title: უკუაქციეთ დომენის ბლოკი %{domain} დომენზე
260 255
         undo: უკუქცევა
261
-      title: დომენის ბლოკები
262 256
       undo: უკუქცევა
263 257
     email_domain_blocks:
264 258
       add_new: ახლის დამატება
@@ -271,10 +265,6 @@ ka:
271 265
         title: ელ-ფოსტის ახალი შენატანი შავ სიაში
272 266
       title: ელ-ფოსტის შავი სია
273 267
     instances:
274
-      account_count: ცნობილი ანგარიშები
275
-      domain_name: დომენი
276
-      reset: გადატვირთვა
277
-      search: ძებნა
278 268
       title: ცნობილი ინსტანციები
279 269
     invites:
280 270
       deactivate_all: ყველას დეაქტივაცია

+ 0
- 10
config/locales/ko.yml View File

@@ -267,11 +267,6 @@ ko:
267 267
       reject_media_hint: 로컬에 저장된 미디어 파일을 삭제하고, 이후로도 다운로드를 거부합니다. 정지와는 관계 없습니다
268 268
       reject_reports: 신고 거부
269 269
       reject_reports_hint: 이 도메인으로부터의 모든 신고를 무시합니다. 정지와는 무관합니다
270
-      severities:
271
-        noop: 없음
272
-        silence: 침묵
273
-        suspend: 정지
274
-      severity: 심각도
275 270
       show:
276 271
         affected_accounts:
277 272
           one: 데이터베이스 중 1개의 계정에 영향을 끼칩니다
@@ -281,7 +276,6 @@ ko:
281 276
           suspend: 이 도메인에 존재하는 모든 계정의 계정 정지를 해제
282 277
         title: "%{domain}의 도메인 차단을 해제"
283 278
         undo: 실행 취소
284
-      title: 도메인 차단
285 279
       undo: 실행 취소
286 280
     email_domain_blocks:
287 281
       add_new: 새로 추가
@@ -294,10 +288,6 @@ ko:
294 288
         title: 새 이메일 도메인 차단
295 289
       title: Email 도메인 차단
296 290
     instances:
297
-      account_count: 알려진 계정의 수
298
-      domain_name: 도메인 이름
299
-      reset: 리셋
300
-      search: 검색
301 291
       title: 알려진 인스턴스들
302 292
     invites:
303 293
       deactivate_all: 전부 비활성화

+ 0
- 10
config/locales/ms.yml View File

@@ -260,11 +260,6 @@ ms:
260 260
       reject_media_hint: Buang fail media yang disimpan di sini dan menolak sebarang muat turun pada masa depan. Tidak berkaitan dengan penggantungan
261 261
       reject_reports: Tolak laporan
262 262
       reject_reports_hint: Abaikan semua laporan daripada domain ini. Tidak dikira untuk penggantungan
263
-      severities:
264
-        noop: Tiada
265
-        silence: Senyapkan
266
-        suspend: Gantungkan
267
-      severity: Tahap teruk
268 263
       show:
269 264
         affected_accounts:
270 265
           one: Satu akaun dalam pangkalan data menerima kesan
@@ -274,7 +269,6 @@ ms:
274 269
           suspend: Buang penggantungan semua akaun sedia ada daripada domain ini
275 270
         title: Buang sekatan domain %{domain}
276 271
         undo: Buang
277
-      title: Sekatan domain
278 272
       undo: Buang
279 273
     email_domain_blocks:
280 274
       add_new: Tambah
@@ -287,10 +281,6 @@ ms:
287 281
         title: Entri senarai hitam emel baru
288 282
       title: Senarai hitam emel
289 283
     instances:
290
-      account_count: Akaun diketahui
291
-      domain_name: Domain
292
-      reset: Set semula
293
-      search: Cari
294 284
       title: Tika diketahui
295 285
     invites:
296 286
       deactivate_all: Nyahaktifkan semua

+ 0
- 10
config/locales/nl.yml View File

@@ -265,11 +265,6 @@ nl:
265 265
       reject_media_hint: Verwijderd lokaal opgeslagen mediabestanden en weigert deze in de toekomst te downloaden. Irrelevant voor opgeschorte domeinen
266 266
       reject_reports: Rapportages weigeren
267 267
       reject_reports_hint: Alle rapportages die vanaf dit domein komen negeren. Irrelevant voor opgeschorte domeinen
268
-      severities:
269
-        noop: Geen
270
-        silence: Negeren
271
-        suspend: Opschorten
272
-      severity: Zwaarte
273 268
       show:
274 269
         affected_accounts:
275 270
           one: Eén account in de database aangepast
@@ -279,7 +274,6 @@ nl:
279 274
           suspend: Alle opgeschorte accounts van dit domein niet langer opschorten
280 275
         title: Domeinblokkade voor %{domain} ongedaan maken
281 276
         undo: Ongedaan maken
282
-      title: Domeinblokkades
283 277
       undo: Ongedaan maken
284 278
     email_domain_blocks:
285 279
       add_new: Nieuwe toevoegen
@@ -292,10 +286,6 @@ nl:
292 286
         title: Nieuw e-maildomein blokkeren
293 287
       title: E-maildomeinen blokkeren
294 288
     instances:
295
-      account_count: Bekende accounts
296
-      domain_name: Domein
297
-      reset: Opnieuw
298
-      search: Zoeken
299 289
       title: Bekende servers
300 290
     invites:
301 291
       deactivate_all: Alles deactiveren

+ 0
- 10
config/locales/no.yml View File

@@ -195,11 +195,6 @@
195 195
         title: Ny domeneblokkering
196 196
       reject_media: Avvis mediefiler
197 197
       reject_media_hint: Fjerner lokalt lagrede mediefiler og nekter å laste dem ned i fremtiden. Irrelevant for utvisninger
198
-      severities:
199
-        noop: Ingen
200
-        silence: Målbind
201
-        suspend: Utvis
202
-      severity: Alvorlighet
203 198
       show:
204 199
         affected_accounts:
205 200
           one: En konto i databasen påvirket
@@ -209,7 +204,6 @@
209 204
           suspend: Avutvis alle eksisterende kontoer fra dette domenet
210 205
         title: Angre domeneblokkering for %{domain}
211 206
         undo: Angre
212
-      title: Domeneblokkeringer
213 207
       undo: Angre
214 208
     email_domain_blocks:
215 209
       add_new: Lag ny
@@ -222,10 +216,6 @@
222 216
         title: Ny blokkeringsoppføring av e-postdomene
223 217
       title: Blokkering av e-postdomene
224 218
     instances:
225
-      account_count: Kjente kontoer
226
-      domain_name: Domene
227
-      reset: Tilbakestill
228
-      search: Søk
229 219
       title: Kjente instanser
230 220
     invites:
231 221
       filter:

+ 0
- 10
config/locales/oc.yml View File

@@ -265,11 +265,6 @@ oc:
265 265
       reject_media_hint: Lèva los fichièrs gardats localament e regèta las demandas de telecargament dins lo futur. Servís pas a res per las suspensions
266 266
       reject_reports: Regetar los senhalaments
267 267
       reject_reports_hint: Ignorar totes los senhalaments que venon d’aqueste domeni. Pas pertiment per las suspensions
268
-      severities:
269
-        noop: Cap
270
-        silence: Silenci
271
-        suspend: Suspendre
272
-      severity: Severitat
273 268
       show:
274 269
         affected_accounts:
275 270
           one: Un compte de la basa de donadas tocat
@@ -279,7 +274,6 @@ oc:
279 274
           suspend: Levar la suspension de totes los comptes d’aqueste domeni
280 275
         title: Restablir lo blocatge de domeni de %{domain}
281 276
         undo: Restablir
282
-      title: Blòc de domeni
283 277
       undo: Restablir
284 278
     email_domain_blocks:
285 279
       add_new: Ajustar
@@ -292,10 +286,6 @@ oc:
292 286
         title: Nòu blocatge de domeni de corrièl
293 287
       title: Blocatge de domeni de corrièl
294 288
     instances:
295
-      account_count: Comptes coneguts
296
-      domain_name: Domeni
297
-      reset: Reïnicializar
298
-      search: Cercar
299 289
       title: Instàncias conegudas
300 290
     invites:
301 291
       deactivate_all: O desactivar tot

+ 0
- 10
config/locales/pl.yml View File

@@ -271,11 +271,6 @@ pl:
271 271
       reject_media_hint: Usuwa przechowywane lokalnie pliki multimedialne i nie pozwala na ich pobieranie. Nieprzydatne przy zawieszeniu
272 272
       reject_reports: Odrzucaj zgłoszenia
273 273
       reject_reports_hint: Zgłoszenia z tej instancji będą ignorowane. Nieprzydatne przy zawieszeniu
274
-      severities:
275
-        noop: Nic nie rób
276
-        silence: Wycisz
277
-        suspend: Zawieś
278
-      severity: Priorytet
279 274
       show:
280 275
         affected_accounts: Dotyczy %{count} kont w bazie danych
281 276
         retroactive:
@@ -283,7 +278,6 @@ pl:
283 278
           suspend: Odwołaj zawieszenie wszystkich kont w tej domenie
284 279
         title: Odwołaj blokadę dla domeny %{domain}
285 280
         undo: Cofnij
286
-      title: Zablokowane domeny
287 281
       undo: Cofnij
288 282
     email_domain_blocks:
289 283
       add_new: Dodaj nową
@@ -296,10 +290,6 @@ pl:
296 290
         title: Nowa blokada domeny e-mail
297 291
       title: Blokowanie domen e-mail
298 292
     instances:
299
-      account_count: Znane konta
300
-      domain_name: Domena
301
-      reset: Przywróć
302
-      search: Szukaj
303 293
       title: Znane instancje
304 294
     invites:
305 295
       deactivate_all: Unieważnij wszystkie

+ 0
- 10
config/locales/pt-BR.yml View File

@@ -263,11 +263,6 @@ pt-BR:
263 263
       reject_media_hint: Remove arquivos de mídia armazenados localmente e recusa quaisquer outros no futuro. Irrelevante para suspensões
264 264
       reject_reports: Rejeitar denúncias
265 265
       reject_reports_hint: Ignorar todas as denúncias vindas deste domíno. Irrelevante para suspensões
266
-      severities:
267
-        noop: Nenhum
268
-        silence: Silêncio
269
-        suspend: Suspensão
270
-      severity: Rigidez
271 266
       show:
272 267
         affected_accounts:
273 268
           one: Uma conta no banco de dados foi afetada
@@ -277,7 +272,6 @@ pt-BR:
277 272
           suspend: Retirar suspensão de todas as contas neste domínio
278 273
         title: Retirar bloqueio de domínio de %{domain}
279 274
         undo: Retirar
280
-      title: Bloqueios de domínio
281 275
       undo: Retirar
282 276
     email_domain_blocks:
283 277
       add_new: Adicionar novo
@@ -290,10 +284,6 @@ pt-BR:
290 284
         title: Novo bloqueio de domínio de e-mail
291 285
       title: Bloqueio de Domínio de E-mail
292 286
     instances:
293
-      account_count: Contas conhecidas
294
-      domain_name: Domínio
295
-      reset: Resetar
296
-      search: Buscar
297 287
       title: Instâncias conhecidas
298 288
     invites:
299 289
       deactivate_all: Desativar todos

+ 0
- 10
config/locales/pt.yml View File

@@ -195,11 +195,6 @@ pt:
195 195
         title: Novo bloqueio de domínio
196 196
       reject_media: Rejeitar ficheiros de media
197 197
       reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer guardar novos no futuro. Irrelevante na suspensão
198
-      severities:
199
-        noop: Nenhum
200
-        silence: Silenciar
201
-        suspend: Suspender
202
-      severity: Severidade
203 198
       show:
204 199
         affected_accounts:
205 200
           one: Uma conta na base de dados afectada
@@ -209,7 +204,6 @@ pt:
209 204
           suspend: Não suspender todas as contas existentes nesse domínio
210 205
         title: Remover o bloqueio de domínio de %{domain}
211 206
         undo: Anular
212
-      title: Bloqueio de domínio
213 207
       undo: Anular
214 208
     email_domain_blocks:
215 209
       add_new: Adicionar novo
@@ -222,10 +216,6 @@ pt:
222 216
         title: Novo bloqueio de domínio de email
223 217
       title: Bloqueio de Domínio de Email
224 218
     instances:
225
-      account_count: Contas conhecidas
226
-      domain_name: Domínio
227
-      reset: Restaurar
228
-      search: Pesquisar
229 219
       title: Instâncias conhecidas
230 220
     invites:
231 221
       filter:

+ 0
- 10
config/locales/ru.yml View File

@@ -260,11 +260,6 @@ ru:
260 260
         title: Новая доменная блокировка
261 261
       reject_media: Запретить медиаконтент
262 262
       reject_media_hint: Удаляет локально хранимый медиаконтент и запрещает его загрузку в будущем. Не имеет значения в случае блокировки
263
-      severities:
264
-        noop: Ничего
265
-        silence: Глушение
266
-        suspend: Блокировка
267
-      severity: Строгость
268 263
       show:
269 264
         affected_accounts:
270 265
           few: Влияет на %{count} аккаунта в базе данных
@@ -276,7 +271,6 @@ ru:
276 271
           suspend: Снять блокировку со всех существующих аккаунтов этого домена
277 272
         title: Снять блокировку с домена %{domain}
278 273
         undo: Отменить
279
-      title: Доменные блокировки
280 274
       undo: Отменить
281 275
     email_domain_blocks:
282 276
       add_new: Добавить новую
@@ -289,10 +283,6 @@ ru:
289 283
         title: Новая доменная блокировка еmail
290 284
       title: Доменная блокировка email
291 285
     instances:
292
-      account_count: Известных аккаунтов
293
-      domain_name: Домен
294
-      reset: Сбросить
295
-      search: Поиск
296 286
       title: Известные узлы
297 287
     invites:
298 288
       deactivate_all: Отключить все

+ 0
- 10
config/locales/sk.yml View File

@@ -269,11 +269,6 @@ sk:
269 269
       reject_media_hint: Zmaže lokálne uložené súbory médií a odmietne ich sťahovanie v budúcnosti. Irelevantné pre suspendáciu
270 270
       reject_reports: Zamietni hlásenia
271 271
       reject_reports_hint: Ignoruj všetky hlásenia prichádzajúce z tejto domény. Nevplýva na blokovania
272
-      severities:
273
-        noop: Žiadne
274
-        silence: Stíšiť
275
-        suspend: Suspendovať
276
-      severity: Závažnosť
277 272
       show:
278 273
         affected_accounts:
279 274
           few: "%{count} účty v databáze ovplyvnených"
@@ -284,7 +279,6 @@ sk:
284 279
           suspend: Zrušiť suspendáciu všetkých existujúcich účtov z tejto domény
285 280
         title: Zrušiť blokovanie domény pre %{domain}
286 281
         undo: Vrátiť späť
287
-      title: Blokovanie domén
288 282
       undo: Späť
289 283
     email_domain_blocks:
290 284
       add_new: Pridať nový
@@ -297,10 +291,6 @@ sk:
297 291
         title: Nový email na zablokovanie
298 292
       title: Blokované emailové adresy
299 293
     instances:
300
-      account_count: Známe účty
301
-      domain_name: Doména
302
-      reset: Resetovať
303
-      search: Hľadať
304 294
       title: Známe instancie
305 295
     invites:
306 296
       deactivate_all: Pozastaviť všetky

+ 0
- 10
config/locales/sr-Latn.yml View File

@@ -195,11 +195,6 @@ sr-Latn:
195 195
         title: Novo blokiranje domena
196 196
       reject_media: Odbaci multimediju
197 197
       reject_media_hint: Uklanja lokalno uskladištene multimedijske fajlove i odbija da ih skida na dalje. Nebitno je za suspenziju
198
-      severities:
199
-        noop: Ništa
200
-        silence: Ućutkavanje
201
-        suspend: Suspenzija
202
-      severity: Oštrina
203 198
       show:
204 199
         affected_accounts:
205 200
           few: Utiče na %{count} naloga u bazi
@@ -211,7 +206,6 @@ sr-Latn:
211 206
           suspend: Ugasi suspenzije za sve postojeće naloge sa ovog domena
212 207
         title: Poništi blokadu domena za domen %{domain}
213 208
         undo: Poništi
214
-      title: Blokade domena
215 209
       undo: Poništi
216 210
     email_domain_blocks:
217 211
       add_new: Dodaj novuAdd new
@@ -224,10 +218,6 @@ sr-Latn:
224 218
         title: Nova stavka u crnoj listi e-pošti
225 219
       title: Crna lista adresa e-pošte
226 220
     instances:
227
-      account_count: Poznati nalozi
228
-      domain_name: Domen
229
-      reset: Resetuj
230
-      search: Pretraga
231 221
       title: Poznate instance
232 222
     invites:
233 223
       filter:

+ 0
- 10
config/locales/sr.yml View File

@@ -268,11 +268,6 @@ sr:
268 268
       reject_media_hint: Уклања локално ускладиштене мултимедијске фајлове и одбија да их скида убудуће. Небитно је за суспензију
269 269
       reject_reports: Одбаци извештај
270 270
       reject_reports_hint: Игнориши све извештаје који долазе са овог домена. Небитно је за суспензије
271
-      severities:
272
-        noop: Ништа
273
-        silence: Ућуткавање
274
-        suspend: Суспензија
275
-      severity: Оштрина
276 271
       show:
277 272
         affected_accounts:
278 273
           few: Утиче на %{count} налога у бази
@@ -284,7 +279,6 @@ sr:
284 279
           suspend: Уклони суспензије за све постојеће налоге са овог домена
285 280
         title: Поништи блокаду домена за %{domain}
286 281
         undo: Поништи
287
-      title: Блокаде домена
288 282
       undo: Поништи
289 283
     email_domain_blocks:
290 284
       add_new: Додај нови
@@ -297,10 +291,6 @@ sr:
297 291
         title: Нова ставка е-поштe у црној листи
298 292
       title: Црна листа E-поште
299 293
     instances:
300
-      account_count: Познати налози
301
-      domain_name: Домен
302
-      reset: Ресетуј
303
-      search: Претрага
304 294
       title: Познате инстанце
305 295
     invites:
306 296
       deactivate_all: Деактивирај све

+ 0
- 10
config/locales/sv.yml View File

@@ -213,11 +213,6 @@ sv:
213 213
         title: Nytt domänblock
214 214
       reject_media: Avvisa mediafiler
215 215
       reject_media_hint: Raderar lokalt lagrade mediefiler och förhindrar möjligheten att ladda ner något i framtiden. Irrelevant för suspensioner
216
-      severities:
217
-        noop: Ingen
218
-        silence: Tysta ner
219
-        suspend: Suspendera
220
-      severity: Svårighet
221 216
       show:
222 217
         affected_accounts:
223 218
           one: Ett konto i databasen drabbades
@@ -227,7 +222,6 @@ sv:
227 222
           suspend: Ta bort suspendering från alla befintliga konton på den här domänen
228 223
         title: Ångra domänblockering för %{domain}
229 224
         undo: Ångra
230
-      title: Domänblockering
231 225
       undo: Ångra
232 226
     email_domain_blocks:
233 227
       add_new: Lägg till ny
@@ -240,10 +234,6 @@ sv:
240 234
         title: Ny E-postdomänblocklistningsinmatning
241 235
       title: E-postdomänblock
242 236
     instances:
243
-      account_count: Kända konton
244
-      domain_name: Domän
245
-      reset: Återställa
246
-      search: Sök
247 237
       title: Kända instanser
248 238
     invites:
249 239
       filter:

+ 0
- 7
config/locales/th.yml View File

@@ -84,10 +84,6 @@ th:
84 84
         title: การบล๊อกโดเมนใหม่
85 85
       reject_media: ไม่อนุมัติไฟล์สื่อ
86 86
       reject_media_hint: ลบไฟล์สื่อที่เก็บไว้ในเครื่อง และ ป้องกันการดาวน์โหลดในอนาคต. Irrelevant for suspensions
87
-      severities:
88
-        silence: ปิดเสียง
89
-        suspend: หยุดไว้
90
-      severity: Severity
91 87
       show:
92 88
         affected_accounts:
93 89
           one: มีผลต่อหนึ่งแอคเค๊าท์ในฐานข้อมูล
@@ -97,11 +93,8 @@ th:
97 93
           suspend: ยกเลิกการหยุดทุกแอคเค๊าท์จากโดเมน
98 94
         title: ยกเลิกการบล๊อกโดเมน %{domain}
99 95
         undo: ยกเลิก
100
-      title: บล๊อกโดเมน
101 96
       undo: ยกเลิก
102 97
     instances:
103
-      account_count: Known accounts
104
-      domain_name: ชื่อโดเมน
105 98
       title: Known Instances
106 99
     reports:
107 100
       comment:

+ 0
- 7
config/locales/tr.yml View File

@@ -83,10 +83,6 @@ tr:
83 83
         title: Yeni domain bloğu
84 84
       reject_media: Ortam dosyalarını reddetme
85 85
       reject_media_hint: Yerel olarak depolanmış ortam dosyalarını ve gelecekte indirilecek olanları reddeder. Uzaklaştırma için uygun değildir
86
-      severities:
87
-        silence: Sustur
88
-        suspend: Uzaklaştır
89
-      severity: İşlem
90 86
       show:
91 87
         affected_accounts:
92 88
           one: Veritabanındaki bir hesap etkilendi
@@ -96,11 +92,8 @@ tr:
96 92
           suspend: Bu domaindeki tüm hesapların üzerindeki uzaklaştırma işlemini kaldır
97 93
         title: "%{domain} domain'i için yapılan işlemi geri al"
98 94
         undo: Geri al
99
-      title: Domain Blokları
100 95
       undo: Geri al
101 96
     instances:
102
-      account_count: Bilinen hesaplar
103
-      domain_name: Domain
104 97
       title: Bilinen Sunucular
105 98
     reports:
106 99
       comment:

+ 0
- 10
config/locales/uk.yml View File

@@ -237,11 +237,6 @@ uk:
237 237
         title: Нове блокування домену
238 238
       reject_media: Заборонити медіаконтент
239 239
       reject_media_hint: Видаляє медіаконтент, збережений локально, і забороняє його завантаження у майбутньому. Не має значення у випадку блокування
240
-      severities:
241
-        noop: Нічого
242
-        silence: Глушення
243
-        suspend: Блокування
244
-      severity: Суворість
245 240
       show:
246 241
         affected_accounts:
247 242
           few: Впливає на %{count} акаунти у базі даних
@@ -253,7 +248,6 @@ uk:
253 248
           suspend: Зняти блокування з усіх існуючих акаунтів цього домену
254 249
         title: Зняти блокування з домена %{domain}
255 250
         undo: Відмінити
256
-      title: Доменні блокування
257 251
       undo: Відмінити
258 252
     email_domain_blocks:
259 253
       add_new: Додати
@@ -266,10 +260,6 @@ uk:
266 260
         title: Нове доменне блокування домену email
267 261
       title: Чорний список поштових доменів
268 262
     instances:
269
-      account_count: Відомі аккаунти
270
-      domain_name: Домен
271
-      reset: Скинути
272
-      search: Пошук
273 263
       title: Відомі інстанції
274 264
     invites:
275 265
       filter:

+ 0
- 10
config/locales/zh-CN.yml View File

@@ -246,11 +246,6 @@ zh-CN:
246 246
         title: 添加域名屏蔽
247 247
       reject_media: 拒绝接收媒体文件
248 248
       reject_media_hint: 删除本地已缓存的媒体文件,并且不再接收来自该域名的任何媒体文件。此选项不影响封禁
249
-      severities:
250
-        noop: 无
251
-        silence: 自动隐藏
252
-        suspend: 自动封禁
253
-      severity: 屏蔽级别
254 249
       show:
255 250
         affected_accounts:
256 251
           one: 将会影响到数据库中的 1 个帐户
@@ -260,7 +255,6 @@ zh-CN:
260 255
           suspend: 对此域名的所有帐户解除封禁
261 256
         title: 撤销对 %{domain} 的域名屏蔽
262 257
         undo: 撤销
263
-      title: 域名屏蔽
264 258
       undo: 撤销
265 259
     email_domain_blocks:
266 260
       add_new: 添加新条目
@@ -273,10 +267,6 @@ zh-CN:
273 267
         title: 添加电子邮件域名屏蔽
274 268
       title: 电子邮件域名屏蔽
275 269
     instances:
276
-      account_count: 已知帐户
277
-      domain_name: 域名
278
-      reset: 重置
279
-      search: 搜索
280 270
       title: 已知实例
281 271
     invites:
282 272
       deactivate_all: 撤销所有邀请链接

+ 0
- 10
config/locales/zh-HK.yml View File

@@ -213,11 +213,6 @@ zh-HK:
213 213
         title: 新增域名阻隔
214 214
       reject_media: 拒絕媒體檔案
215 215
       reject_media_hint: 刪除本地緩存的媒體檔案,再也不在未來下載這個站點的檔案。和自動刪除無關
216
-      severities:
217
-        noop: 無
218
-        silence: 自動靜音
219
-        suspend: 自動刪除
220
-      severity: 阻隔分級
221 216
       show:
222 217
         affected_accounts: 資料庫中有%{count}個用戶受影響
223 218
         retroactive:
@@ -225,7 +220,6 @@ zh-HK:
225 220
           suspend: 對此域名的所有用戶取消除名
226 221
         title: 撤銷 %{domain} 的域名阻隔
227 222
         undo: 撤銷
228
-      title: 域名阻隔
229 223
       undo: 撤銷
230 224
     email_domain_blocks:
231 225
       add_new: 加入新項目
@@ -238,10 +232,6 @@ zh-HK:
238 232
         title: 新增電郵網域阻隔
239 233
       title: 電郵網域阻隔
240 234
     instances:
241
-      account_count: 已知帳號
242
-      domain_name: 域名
243
-      reset: 重設
244
-      search: 搜索
245 235
       title: 已知服務站
246 236
     invites:
247 237
       filter:

+ 0
- 10
config/locales/zh-TW.yml View File

@@ -218,11 +218,6 @@ zh-TW:
218 218
         title: 新增封鎖網域
219 219
       reject_media: 拒絕媒體檔案
220 220
       reject_media_hint: 刪除本地緩存的媒體檔案,並且不再接收來自該網域的任何媒體檔案。與自動封鎖無關
221
-      severities:
222
-        noop: 無
223
-        silence: 自動靜音
224
-        suspend: 自動封鎖
225
-      severity: 嚴重度
226 221
       show:
227 222
         affected_accounts: 資料庫中有%{count}個使用者受影響
228 223
         retroactive:
@@ -230,7 +225,6 @@ zh-TW:
230 225
           suspend: 對此網域的所有使用者取消封鎖
231 226
         title: 撤銷 %{domain} 的網域封鎖
232 227
         undo: 撤銷
233
-      title: 網域封鎖
234 228
       undo: 撤銷
235 229
     email_domain_blocks:
236 230
       add_new: 加入新項目
@@ -243,10 +237,6 @@ zh-TW:
243 237
         title: 新增E-mail封鎖
244 238
       title: E-mail封鎖
245 239
     instances:
246
-      account_count: 已知帳戶
247
-      domain_name: 網域
248
-      reset: 重設
249
-      search: 搜尋
250 240
       title: 已知站點
251 241
     invites:
252 242
       filter:

+ 1
- 2
config/navigation.rb View File

@@ -29,8 +29,7 @@ SimpleNavigation::Configuration.run do |navigation|
29 29
       admin.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url, highlights_on: %r{/admin/accounts}
30 30
       admin.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path
31 31
       admin.item :tags, safe_join([fa_icon('tag fw'), t('admin.tags.title')]), admin_tags_path
32
-      admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url, highlights_on: %r{/admin/instances}, if: -> { current_user.admin? }
33
-      admin.item :domain_blocks, safe_join([fa_icon('lock fw'), t('admin.domain_blocks.title')]), admin_domain_blocks_url, highlights_on: %r{/admin/domain_blocks}, if: -> { current_user.admin? }
32
+      admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url, highlights_on: %r{/admin/instances|/admin/domain_blocks}, if: -> { current_user.admin? }
34 33
       admin.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? }
35 34
     end
36 35
 

+ 2
- 6
config/routes.rb View File

@@ -138,7 +138,7 @@ Rails.application.routes.draw do
138 138
     get '/dashboard', to: 'dashboard#index'
139 139
 
140 140
     resources :subscriptions, only: [:index]
141
-    resources :domain_blocks, only: [:index, :new, :create, :show, :destroy]
141
+    resources :domain_blocks, only: [:new, :create, :show, :destroy]
142 142
     resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
143 143
     resources :action_logs, only: [:index]
144 144
     resources :warning_presets, except: [:new]
@@ -157,11 +157,7 @@ Rails.application.routes.draw do
157 157
       end
158 158
     end
159 159
 
160
-    resources :instances, only: [:index] do
161
-      collection do
162
-        post :resubscribe
163
-      end
164
-    end
160
+    resources :instances, only: [:index, :show], constraints: { id: /[^\/]+/ }
165 161
 
166 162
     resources :reports, only: [:index, :show] do
167 163
       member do

+ 2
- 22
spec/controllers/admin/domain_blocks_controller_spec.rb View File

@@ -7,26 +7,6 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
7 7
     sign_in Fabricate(:user, admin: true), scope: :user
8 8
   end
9 9
 
10
-  describe 'GET #index' do
11
-    around do |example|
12
-      default_per_page = DomainBlock.default_per_page
13
-      DomainBlock.paginates_per 1
14
-      example.run
15
-      DomainBlock.paginates_per default_per_page
16
-    end
17
-
18
-    it 'renders domain blocks' do
19
-      2.times { Fabricate(:domain_block) }
20
-
21
-      get :index, params: { page: 2 }
22
-
23
-      assigned = assigns(:domain_blocks)
24
-      expect(assigned.count).to eq 1
25
-      expect(assigned.klass).to be DomainBlock
26
-      expect(response).to have_http_status(200)
27
-    end
28
-  end
29
-
30 10
   describe 'GET #new' do
31 11
     it 'assigns a new domain block' do
32 12
       get :new
@@ -53,7 +33,7 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
53 33
 
54 34
       expect(DomainBlockWorker).to have_received(:perform_async)
55 35
       expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
56
-      expect(response).to redirect_to(admin_domain_blocks_path)
36
+      expect(response).to redirect_to(admin_instances_path(limited: '1'))
57 37
     end
58 38
 
59 39
     it 'renders new when failed to save' do
@@ -76,7 +56,7 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
76 56
 
77 57
       expect(service).to have_received(:call).with(domain_block, true)
78 58
       expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.destroyed_msg')
79
-      expect(response).to redirect_to(admin_domain_blocks_path)
59
+      expect(response).to redirect_to(admin_instances_path(limited: '1'))
80 60
     end
81 61
   end
82 62
 end

+ 1
- 1
spec/policies/instance_policy_spec.rb View File

@@ -8,7 +8,7 @@ RSpec.describe InstancePolicy do
8 8
   let(:admin)   { Fabricate(:user, admin: true).account }
9 9
   let(:john)    { Fabricate(:user).account }
10 10
 
11
-  permissions :index?, :resubscribe? do
11
+  permissions :index? do
12 12
     context 'admin' do
13 13
       it 'permits' do
14 14
         expect(subject).to permit(admin, Instance)

Loading…
Cancel
Save