Improve spam_hosts copy (#8203)

tshenry · October 18, 2019, 4:31pm

Increase size of the reviewable’s conversation excerpt to prevent truncation of the new copy
Remove the domain parameter from the flag_linked_posts_as_spam method in the user model since it is no longer needed
Remove the domain interpolation variable from all translation files
Add “All posts from this user that include links should be reviewed.” to server.en.yml for added clarity on why the posts entered the queue

diff --git a/app/models/user.rb b/app/models/user.rb
index 7ed158b2a2..337748b75a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1006,7 +1006,6 @@ class User < ActiveRecord::Base
 
       message = I18n.t(
         'flag_reason.spam_hosts',
-        domain: tl.domain,
         base_path: Discourse.base_path,
         locale: SiteSetting.default_locale
       )
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index a3e5bd858a..3cc9986c78 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -1505,7 +1505,7 @@ ar:
     missing: "نأسف، لم نعثر على أيّ صورة رمزيّة مرتبطة بعنوان البريد هذا. هلّا أعدت رفعها ثانيةً؟"
   flag_reason:
     sockpuppet: "عضو جديد نشر موضوع جديد ثم قام عضو جديد اخر له نفس الIP (%{ip_address}) بالرد علية. انظر إعدادات<a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "عضو جديد حاول إنشاء عدة منشورات تحتوي علي روابط لنفس العنوان (%{domain}). انظر إعدادات <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "عضو جديد حاول إنشاء عدة منشورات تحتوي علي روابط لنفس العنوان. انظر إعدادات <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     user_email_no_user: "تعذّر العثور على مستخدم معرّفه %{user_id}"
     user_email_post_not_found: "تعذر إيجاد المشاركة ذات المعرف %{post_id}"
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index b47d4b32b7..8bd9573a36 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -1952,7 +1952,7 @@ be:
     missing: "На жаль, мы не можам знайсці якія-небудзь аватар, звязаны з гэтым адрасам электроннай пошты. Вы можаце паспрабаваць загрузіць яго зноў?"
   flag_reason:
     sockpuppet: "Новы карыстальнік стварыў тэму, і яшчэ адзін новы карыстальнік у тым жа IP-адрасе (% {ip_address}) адказаў. См% Класс <A HREF = '{базовый_путь}"
-    spam_hosts: "Гэты новы карыстальнік спрабаваў стварыць некалькі пастоў з спасылкамі на адной і той жа вобласці (% {дамена}). См% Класс <A HREF = '{базовый_путь}"
+    spam_hosts: "Гэты новы карыстальнік спрабаваў стварыць некалькі пастоў з спасылкамі на адной і той жа вобласці. См% Класс <A HREF = '{базовый_путь}"
   skipped_email_log:
     exceeded_emails_limit: "перавышаны max_emails_per_day_per_user"
     exceeded_bounces_limit: "перавышаны bounce_score_threshold"
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 8037e5dc13..594ae1fc51 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -2781,7 +2781,7 @@ ca:
     missing: "No podem trobar cap avatar associat amb aquesta adreça de correu. Proveu de pujar-lo de nou."
   flag_reason:
     sockpuppet: "Un usuari nou ha creat un tema, i un altre usuari nou amb la mateixa adreça IP (%{ip_address}) hi ha respost. Mireu el paràmetre <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> de la configuració del lloc web."
-    spam_hosts: "Aquest usuari nou ha creat moltes publicacions amb enllaços al mateix domini (%{domain}). Vegeu el paràmetre <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> de la configuració del lloc web."
+    spam_hosts: "Aquest usuari nou ha creat moltes publicacions amb enllaços al mateix domini. Vegeu el paràmetre <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> de la configuració del lloc web."
   skipped_email_log:
     exceeded_emails_limit: "S'ha excedit max_emails_per_day_per_user"
     exceeded_bounces_limit: "S'ha superat bounce_score_threshold"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 991bbabbe5..862a0be27d 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -3170,7 +3170,7 @@ de:
     missing: "Hoppla, wir können kein Profilbild für diese E-Mail-Adresse finden. Kannst du versuchen es erneut hochzuladen?"
   flag_reason:
     sockpuppet: "Ein neuer Benutzer hat ein Thema erstellt und ein anderer neuer Benutzer mit der selben IP-Adresse (%{ip_address}) hat darauf geantwortet. Beachte die <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> Einstellung."
-    spam_hosts: "Dieser Benutzer hat versucht, mehrere Antworten mit Links zur gleichen Domain (%{domain}) zu schreiben. Beachte die <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>-Einstellung."
+    spam_hosts: "Dieser Benutzer hat versucht, mehrere Antworten mit Links zur gleichen Domain zu schreiben. Beachte die <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>-Einstellung."
   skipped_email_log:
     exceeded_emails_limit: "max_emails_per_day_per_user überschritten"
     exceeded_bounces_limit: "bounce_score_threshold wurde überschritten"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 19e6640d68..83154ed945 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -2213,7 +2213,7 @@ el:
     missing: "Λυπούμαστε, αλλά δεν μπορέσαμε να βρούμε κάποιο άβαταρ που να αντιστοιχίζεται με τη συγκεκριμένη διεύθυνση email. Μπορείτε να δοκιμάσετε να το ανεβάσετε ξανά;"
   flag_reason:
     sockpuppet: "Ένας νέος χρήστης δημιούργησε ένα νήμα και ένας άλλος νέος χρήσης με την ίδια διεύθυνση IP (%{ip_address}) απάντησε. Δες τις ρυθμίσεις ιστοτόπου <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
-    spam_hosts: "Αυτός ο νέος χρήστης προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους προς το ίδιο domain (%{domain}). Δες τις ρυθμίσεις ιστοτόπου <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
+    spam_hosts: "Αυτός ο νέος χρήστης προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους προς το ίδιο domain. Δες τις ρυθμίσεις ιστοτόπου <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   skipped_email_log:
     exceeded_emails_limit: "Υπέρβαση max_emails_per_day_per_user"
     exceeded_bounces_limit: "Υπέρβαση bounce_score_threshold"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d88a01ccc1..61c5369303 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -3638,7 +3638,7 @@ en:
 
   flag_reason:
     sockpuppet: "A new user created a topic, and another new user at the same IP address (%{ip_address}) replied. See the <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> site setting."
-    spam_hosts: "This new user tried to create multiple posts with links to the same domain (%{domain}). See the <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> site setting."
+    spam_hosts: "This new user tried to create multiple posts with links to the same domain. All posts from this user that include links should be reviewed. See the <a href='%{base_path}/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a> site setting."
 
   skipped_email_log:
     exceeded_emails_limit: "Exceeded max_emails_per_day_per_user"
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 57f5437b0b..e4edd47efb 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -3213,7 +3213,7 @@ es:
     missing: "Lo sentimos, no pudimos encontrar un avatar asociado a esa dirección de correo electrónico. ¿Puedes intentar subirlo de nuevo?"
   flag_reason:
     sockpuppet: "Un usuario nuevo creó un tema y otro usuario nuevo le ha respondido desde la misma dirección IP (%{ip_address}). Revisa la opción <a href='%{base_path}/admin/site_settings/category/spam'>`flag_sockpuppets`</a> en la configuración del sitio."

[... diff too long, it was truncated ...]

GitHub sha: 95114f87

eviltrout · October 21, 2019, 6:17pm