From d13e56e692e65344b436d5585289b9268fe43669 Mon Sep 17 00:00:00 2001 From: f Date: Mon, 18 Mar 2024 18:09:32 -0300 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20descripci=C3=B3n=20para=20las=20list?= =?UTF-8?q?as=20de=20bloqueo=20#15643?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 6f76fe57..075b62ec 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -180,7 +180,7 @@ en: reply_to: Reply to instances: title: My block lists - description: Description + description: "Blocklists contain instances known for hosting hate speech, promote fascism, violence, sexual/gendered abuse and/or misinformation." custom_block: Custom block lists submit: Save block lists instance: diff --git a/config/locales/es.yml b/config/locales/es.yml index 39d35afe..2d4974b1 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -179,7 +179,7 @@ es: reply_to: En respuesta a instances: title: Mis listas de bloqueo - description: Descripción de listas de bloqueo + description: "Las listas de bloqueo contienen instancias conocidas por alojar discurso de odio, promover el fascismo, la violencia, abuso sexual y/o desinformación." custom_block: Lista personalizada de bloqueo submit: Guardar listas de bloqueo instance: From 979f3c1b3ac214856840a7bfa248603229dbdbfe Mon Sep 17 00:00:00 2001 From: f Date: Mon, 18 Mar 2024 18:12:02 -0300 Subject: [PATCH 2/2] fix: ayuda para la lista customizada #15643 --- app/views/moderation_queue/_block_instances_textarea.haml | 2 +- config/locales/en.yml | 3 +++ config/locales/es.yml | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/moderation_queue/_block_instances_textarea.haml b/app/views/moderation_queue/_block_instances_textarea.haml index 9729d4de..7daf0410 100644 --- a/app/views/moderation_queue/_block_instances_textarea.haml +++ b/app/views/moderation_queue/_block_instances_textarea.haml @@ -1,3 +1,3 @@ .form-group = label_tag 'custom_blocklist', t('moderation_queue.instances.custom_block') - = text_area_tag 'custom_blocklist', nil, class: 'form-control' + = text_area_tag 'custom_blocklist', nil, class: 'form-control', placeholder: t('moderation_queue.instances.custom_block_placeholder') diff --git a/config/locales/en.yml b/config/locales/en.yml index 075b62ec..35b857e6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -182,6 +182,9 @@ en: title: My block lists description: "Blocklists contain instances known for hosting hate speech, promote fascism, violence, sexual/gendered abuse and/or misinformation." custom_block: Custom block lists + custom_block_placeholder: | + a.doma.in + per.li.ne submit: Save block lists instance: users: "Users:" diff --git a/config/locales/es.yml b/config/locales/es.yml index 2d4974b1..77e611ed 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -181,6 +181,9 @@ es: title: Mis listas de bloqueo description: "Las listas de bloqueo contienen instancias conocidas por alojar discurso de odio, promover el fascismo, la violencia, abuso sexual y/o desinformación." custom_block: Lista personalizada de bloqueo + custom_block_placeholder: | + un.domin.io + por.lin.ea submit: Guardar listas de bloqueo instance: users: "Usuaries:"