Merge branch 'issue-15109-1' of https://0xacab.org/sutty/sutty into production.panel.sutty.nl

app/views/components/_btn_base.haml

@@ -5,5 +5,5 @@
 - local_assigns[:class]    = "btn #{local_assigns[:class]}"
 
 -# @todo path es obligatorio
-= button_to local_assigns[:path], **local_assigns do
+= button_to local_assigns[:path], **local_assigns.compact do
   = text

app/views/components/_comments_btn_box.haml

@@ -1,8 +1,11 @@
 -# Componente Botonera de Comentarios
 
+- local_data = { report: { confirm: t('.confirm_report') } }
+
 .d-flex.flex-row
   - ActivityPub.events.each do |event|
     = render 'components/btn_base',
       text: t(".text_#{event}"),
       path: public_send(:"site_activity_pub_#{event}_path", activity_pub_id: activity_pub),
-      disabled: !activity_pub.public_send(:"may_#{event}?")
+      disabled: !activity_pub.public_send(:"may_#{event}?"),
+      data: local_data[event]

app/views/components/_instances_btn_box.haml

@@ -1,6 +1,10 @@
 -# Componente botonera de moderación de Instancias
 
-- btn_class = 'btn btn-secondary'
-= render 'components/btn_base', path: site_instance_moderation_pause_path(instance_moderation_id: instance_moderation), text: t('.text_check'), class: btn_class, disabled: !instance_moderation.may_pause?
-= render 'components/btn_base', path: site_instance_moderation_allow_path(instance_moderation_id: instance_moderation), text: t('.text_allow'), class: btn_class, disabled: !instance_moderation.may_allow?
-= render 'components/btn_base', path: site_instance_moderation_block_path(instance_moderation_id: instance_moderation), text: t('.text_deny'), class: btn_class, disabled: !instance_moderation.may_block?
+- local_data = {}
+- InstanceModeration.events.each do |event|
+  = render 'components/btn_base',
+    path: public_send(:"site_instance_moderation_#{event}_path", instance_moderation_id: instance_moderation),
+    text: t(".text_#{event}"),
+    class: 'btn btn-secondary',
+    disabled: !instance_moderation.public_send(:"may_#{event}?"),
+    data: local_data[event]

app/views/components/_profiles_btn_box.haml

@@ -1,9 +1,10 @@
 -# Componente Botonera de Moderación de Cuentas (Remote_profile)
 .d-flex.flex-row
-  - btn_class = 'btn-secondary'
+  - local_data = { report: { confirm: t('.confirm_report') } }
   - ActorModeration.events.each do |actor_event|
     = render 'components/btn_base',
       text: t(".text_#{actor_event}"),
       path: public_send(:"site_actor_moderation_#{actor_event}_path", actor_moderation_id: actor_moderation),
-      class: btn_class,
-      disabled: !actor_moderation.public_send(:"may_#{actor_event}?")
+      class: 'btn-secondary',
+      disabled: !actor_moderation.public_send(:"may_#{actor_event}?"),
+      data: local_data[actor_event]

config/locales/en.yml

@@ -106,15 +106,17 @@ en:
       text_reject: Reject
       text_reply: Reply
       text_report: Report
+      confirm_report: "Send report to the remote instance?"
     instances_btn_box:
-      text_check: Check case by case
+      text_pause: Check case by case
       text_allow: Allow everything
-      text_deny: Block instance
+      text_block: Block instance
     profiles_btn_box:
       text_pause: Always check
       text_allow: Always approve
       text_block: Block
       text_report: Report
+      confirm_report: "Send report to the remote instance?"
   remote_flags:
     report_message: "Hi! Someone using Sutty CMS reported this account on your instance. We don't have support for customized report messages yet, but we will soon. You can reach us at %{panel_actor_mention}."
   activity_pubs:

config/locales/es.yml

@@ -105,8 +105,9 @@ es:
       text_approve: Aceptar
       text_reject: Rechazar
       text_report: Reportar
+      confirm_report: "¿Enviar el reporte a la instancia remota?"
     instances_btn_box:
-      text_check: Moderar caso por caso
+      text_pause: Moderar caso por caso
       text_allow: Permitir todo
       text_deny: Bloquear instancia
     profiles_btn_box:
@@ -114,6 +115,7 @@ es:
       text_allow: Aprobar siempre
       text_block: Bloquear
       text_report: Reportar
+      confirm_report: "¿Enviar el reporte a la instancia remota?"
   remote_flags:
     report_message: "¡Hola! Une usuarie de Sutty CMS reportó esta cuenta en tu instancia. Todavía no tenemos soporte para mensajes personalizados. Podés contactarnos en %{panel_actor_mention}."
   activity_pubs: