diff --git a/app/models/user.rb b/app/models/user.rb index 7ed158b2a22..337748b75a3 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 a3e5bd858a9..3cc9986c784 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}) بالرد علية. انظر إعدادات`flag_sockpuppets`." - spam_hosts: "عضو جديد حاول إنشاء عدة منشورات تحتوي علي روابط لنفس العنوان (%{domain}). انظر إعدادات `newuser_spam_host_threshold`." + spam_hosts: "عضو جديد حاول إنشاء عدة منشورات تحتوي علي روابط لنفس العنوان. انظر إعدادات `newuser_spam_host_threshold`." 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 b47d4b32b7b..8bd9573a36a 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}) адказаў. См% Класс `flag_sockpuppets` 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 `newuser_spam_host_threshold` 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 `newuser_spam_host_threshold` 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 991bbabbe50..862a0be27d0 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 `flag_sockpuppets` Einstellung." - spam_hosts: "Dieser Benutzer hat versucht, mehrere Antworten mit Links zur gleichen Domain (%{domain}) zu schreiben. Beachte die `newuser_spam_host_threshold`-Einstellung." + spam_hosts: "Dieser Benutzer hat versucht, mehrere Antworten mit Links zur gleichen Domain zu schreiben. Beachte die `newuser_spam_host_threshold`-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 19e6640d68a..83154ed945b 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}) απάντησε. Δες τις ρυθμίσεις ιστοτόπου `flag_sockpuppets`." - spam_hosts: "Αυτός ο νέος χρήστης προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους προς το ίδιο domain (%{domain}). Δες τις ρυθμίσεις ιστοτόπου `newuser_spam_host_threshold`." + spam_hosts: "Αυτός ο νέος χρήστης προσπάθησε να δημιουργήσει πολλαπλές αναρτήσεις με συνδέσμους προς το ίδιο domain. Δες τις ρυθμίσεις ιστοτόπου `newuser_spam_host_threshold`." 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 d88a01ccc11..61c5369303d 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 `flag_sockpuppets` site setting." - spam_hosts: "This new user tried to create multiple posts with links to the same domain (%{domain}). See the `newuser_spam_host_threshold` 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 `newuser_spam_host_threshold` 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 57f5437b0bf..e4edd47efbe 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 `flag_sockpuppets` en la configuración del sitio." - spam_hosts: "Este usuario nuevo intentó crear varios temas con enlaces al mismo dominio (%{domain}). Revisa la opción `newuser_spam_host_threshold` en la configuración del sitio." + spam_hosts: "Este usuario nuevo intentó crear varios temas con enlaces al mismo dominio. Revisa la opción `newuser_spam_host_threshold` en la configuración del sitio." skipped_email_log: exceeded_emails_limit: "max_emails_per_day_per_user excedido" exceeded_bounces_limit: "bounce_score_threshold excedido" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index 2de06d76249..712f34bd519 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -1988,7 +1988,7 @@ fa_IR: missing: "با عرض پوزش، نمی‌توانیم آواتار مرتبطی با این ایمیل پیدا کنیم. لطفا دوباره آپلود کنید." flag_reason: sockpuppet: "یک کاربر جدید موضوع جدیدی ایجاد کرده و کاربری با همان آیپی به موضوع پاسخ داده (%{ip_address}). قسمت `flag_sockpuppets` را از تنظیمات سایت ببینید." - spam_hosts: "این کاربر تلاش کرده چند نوشته با لینک به یک دامنه ارسال کند(%{domain}). قسمت `newuser_spam_host_threshold` را از تنظیمات سایت ببینید." + spam_hosts: "این کاربر تلاش کرده چند نوشته با لینک به یک دامنه ارسال کند. قسمت `newuser_spam_host_threshold` را از تنظیمات سایت ببینید." skipped_email_log: exceeded_emails_limit: "مقدار max_emails_per_day_per_user بیش از حد مجاز است" exceeded_bounces_limit: "مقدار bounce_score_threshold بیش از حد مجاز است" diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 23cc32ab28f..4304ef29bd3 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -2975,7 +2975,7 @@ fi: missing: "Pahoittelut, emme löydä profiilikuvaa, joka olisi yhdistetty tähän sähköpostiosoitteeseen. Voitko yrittää ladata sen uudestaan?" flag_reason: sockpuppet: "Uusi käyttäjä aloitti ketjun, johon toinen uusi käyttäjä samasta IP-osoitteesta (%{ip_address}) vastasi. Katso asetus `flag_sockpuppets`." - spam_hosts: "Tämä uusi käyttäjä yritti luoda useita viestejä, jotka sisälsivät linkkejä samaan verkkotunnukseen (%{domain}). Katso asetus `newuser_spam_host_threshold`." + spam_hosts: "Tämä uusi käyttäjä yritti luoda useita viestejä, jotka sisälsivät linkkejä samaan verkkotunnukseen. Katso asetus `newuser_spam_host_threshold`." skipped_email_log: exceeded_emails_limit: "max_emails_per_day_per_user ylitettiin" exceeded_bounces_limit: "bounce_score_threshold ylitettiin" diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 4ef2c26c8c8..195ef25a12d 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -3165,7 +3165,7 @@ fr: missing: "Désolé, nous ne parvenons pas à trouver un avatar associé à cette adresse mail. Pouvez-vous essayer de la télécharger à nouveau ?" flag_reason: sockpuppet: "Un nouvel utilisateur a créé un sujet et un autre nouvel utilisateur avec la même adresse IP (%{ip_address}) a répondu. Voir le paramètre `flag_sockpuppets`." - spam_hosts: "Ce nouvel utilisateur a tenté de créer plusieurs messages avec des liens vers le même domaine (%{domain}). Voir le paramètre `newuser_spam_host_threshold`." + spam_hosts: "Ce nouvel utilisateur a tenté de créer plusieurs messages avec des liens vers le même domaine. Voir le paramètre `newuser_spam_host_threshold`." skipped_email_log: exceeded_emails_limit: "max_emails_per_day_per_user dépassé" exceeded_bounces_limit: "bounce_score_threshold dépassé" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 7f610a0db5c..ca4f8a82ffb 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -3341,7 +3341,7 @@ he: missing: "מצטערים, אנחנו לא יכולים למצוא אף דמות שמקושרת לכתובת מייל זו. תוכלו להעלות זאת שוב?" flag_reason: sockpuppet: "משתמש חדש יצר נושא, ומשתמש חדש אחר מאותה כתובת IP (%{ip_address}) ענו להם. ראו את הגדרת האתר `flag_sockpuppets`." - spam_hosts: "משתמש חדש זה ניסה ליצור מספר פוסטים עם קישורים לאותה הכתובת (%{domain}). ראו את הגדרת האתר `newuser_spam_host_threshold`." + spam_hosts: "משתמש חדש זה ניסה ליצור מספר פוסטים עם קישורים לאותה הכתובת. ראו את הגדרת האתר `newuser_spam_host_threshold`." skipped_email_log: exceeded_emails_limit: "נחצה max_emails_per_day_per_user" exceeded_bounces_limit: "נחצה bounce_score_threshold" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 915fe730b01..9aa94b4135e 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -2991,7 +2991,7 @@ it: missing: "Spiacenti, non troviamo nessun avatar associato a questo indirizzo email. Puoi provare a caricarlo nuovamente?" flag_reason: sockpuppet: "Un nuovo utente ha creato un argomento, e un altro nuovo utente ha risposto dallo stesso indirizzo IP (%{ip_address}). Vedi l'impostazione del sito `flag_sockpuppets`." - spam_hosts: "Questo nuovo utente ha provato a creare più messaggi con collegamenti allo stesso dominio (%{domain}). Vedi l'impostazione del sito `newuser_spam_host_threshold`." + spam_hosts: "Questo nuovo utente ha provato a creare più messaggi con collegamenti allo stesso dominio. Vedi l'impostazione del sito `newuser_spam_host_threshold`." skipped_email_log: exceeded_emails_limit: "Ha superato max_emails_per_day_per_user" exceeded_bounces_limit: "Ha superato bounce_score_threshold" diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index e78a0e9bd11..2409e6e5bc4 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -2387,7 +2387,7 @@ nl: missing: "Sorry, we kunnen geen avatar vinden die met dat e-mailadres is gekoppeld. Kunt u proberen deze opnieuw te uploaden?" flag_reason: sockpuppet: "Een nieuwe gebruiker heeft een topic aangemaakt, en een andere nieuwe gebruiker op hetzelfde IP-adres (%{ip_address}) heeft geantwoord. Bekijk de website-instelling 'flag_sockpuppets'." - spam_hosts: "Deze nieuwe gebruiker heeft geprobeerd meerdere berichten met koppelingen naar hetzelfde domein (%{domain}) aan te maken. Bekijk de website-instelling newuser_spam_host_threshold." + spam_hosts: "Deze nieuwe gebruiker heeft geprobeerd meerdere berichten met koppelingen naar hetzelfde domein aan te maken. Bekijk de website-instelling newuser_spam_host_threshold." skipped_email_log: exceeded_emails_limit: "max_emails_per_day_per_user overschreden" exceeded_bounces_limit: "bounce_score_threshold overschreden" diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 009dcfada96..d217b61d4a0 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -2356,7 +2356,7 @@ pl_PL: missing: "Przepraszamy, nie możemy odnaleźć żadnego avatara przypisanego do tego konta email. Spróbuj załadować go ponownie" flag_reason: sockpuppet: "Nowy użytkownik stworzył temat, a inny nowy użytkownik z tym samym adresem IP (%{ip_address}) odpowiedział. 'flag_sockpuppets' ustawienia strony." - spam_hosts: "Ten nowy użytkownik próbował stworzyć wiele postów z linkami do tej samej domeny (%{domain}). Zobacz `newuser_spam_host_threshold ustawienia strony." + spam_hosts: "Ten nowy użytkownik próbował stworzyć wiele postów z linkami do tej samej domeny. Zobacz `newuser_spam_host_threshold ustawienia strony." skipped_email_log: exceeded_emails_limit: "Przekroczono maksymalną, dzienną liczbę emaili dla użytkownika" exceeded_bounces_limit: "Przekroczono bounce_score_threshold " diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index 079927df7cf..703522e759e 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -1732,7 +1732,7 @@ pt: missing: "Desculpe, mas não conseguimos encontrar nenhum avatar associado com esse endereço de email. Pode tentar carregá-lo novamente?" flag_reason: sockpuppet: "Um novo utilizador criou um tópico, no qual um outro novo utilizador com o mesmo IP (%{ip_address}) respondeu. Veja as configurações de `flag_sockpuppets` nas configurações do sítio." - spam_hosts: "Este novo utilizador tentou criar múltiplas publicações com ligações ao mesmo domínio (%{domain}). Verifique as configurações do sítio de `newuser_spam_host_threshold`." + spam_hosts: "Este novo utilizador tentou criar múltiplas publicações com ligações ao mesmo domínio. Verifique as configurações do sítio de `newuser_spam_host_threshold`." skipped_email_log: exceeded_emails_limit: "Excedeu max_emails_per_day_per_user" exceeded_bounces_limit: "Ultrapassou bounce_score_threshold" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 11bbbe1ec43..d70f59a881f 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -3071,7 +3071,7 @@ pt_BR: missing: "Desculpe! Não conseguimos achar nenhum avatar associado a esse endereço de email. Você pode tentar novamente?" flag_reason: sockpuppet: "Um novo usuário criou um tópico, e um outro novo usuário no mesmo endereço IP (%{ip_address}) respondeu. Veja a configuração `flag_sockpuppets` do site." - spam_hosts: "Esse novo usuário tentou criar múltiplas publicações com links para o mesmo domínio (%{domain}). Veja a configuração `newuser_spam_host_threshold` do site." + spam_hosts: "Esse novo usuário tentou criar múltiplas publicações com links para o mesmo domínio. Veja a configuração `newuser_spam_host_threshold` do site." skipped_email_log: exceeded_emails_limit: "Excedido max_emails_per_day_per_user" exceeded_bounces_limit: "Excedido bounce_score_threshold" diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index 7980d31645d..141e5150a6d 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -1659,7 +1659,7 @@ ro: missing: "Ne pare rău, dar nu putem găsi avatarul asociat cu această adresă de email. Ai putea să îl încarci din nou?" flag_reason: sockpuppet: "Un utilizator nou a creat un subiect, și un alt utilizator nou de la aceeași adresă de IP (%{ip_address}) a răspuns. Vezi `flag_sockpuppets` la setările site-ului." - spam_hosts: "Acest nou utilizator a încrecat să creeze postări multiple cu link-uri către acelasi domeniu (%{domain}). Vezi `newuser_spam_host_threshold` la setările site-ului." + spam_hosts: "Acest nou utilizator a încrecat să creeze postări multiple cu link-uri către acelasi domeniu. Vezi `newuser_spam_host_threshold` la setările site-ului." skipped_email_log: exceeded_emails_limit: "Depășit max_emails_per_day_per_user" exceeded_bounces_limit: "Depășit bounce_score_threshold" diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index d9871774af8..d328125a6d1 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -2292,7 +2292,7 @@ ru: missing: "К сожалению, нам не удалось найти ни одного аватара, связанного с этим электронным адресом. Попытаетесь загрузить аватар снова?" flag_reason: sockpuppet: "Новый пользователь создал тему, а другой новый пользователь ответил с этого же IP адреса (%{ip_address}). Смотрите параметр `flag_sockpuppets` сайта." - spam_hosts: "Этот новый пользователь пытался создать множество сообщений с ссылками на один и тот же домен (%{domain}). Смотрите параметр `newuser_spam_host_threshold` сайта." + spam_hosts: "Этот новый пользователь пытался создать множество сообщений с ссылками на один и тот же домен. Смотрите параметр `newuser_spam_host_threshold` сайта." skipped_email_log: exceeded_emails_limit: "Превышен max_emails_per_day_per_user" exceeded_bounces_limit: "Превышен bounce_score_threshold" diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml index 7cccd9846e0..41a036709bd 100644 --- a/config/locales/server.sl.yml +++ b/config/locales/server.sl.yml @@ -1782,7 +1782,7 @@ sl: edit_reason: "prenos slik v lokalno kopijo" flag_reason: sockpuppet: "Nov uporabnik je ustvaril temo in drugi novi uporabnik z enakim IP naslovom (%{ip_address}) je odgovoril. Preverite `flag_sockpuppets` nastavitev strani." - spam_hosts: "Ta novi uporabnik je poskusil ustvariti več prispevkov z povezavami na enako domeno (%{domain}). Preverite `newuser_spam_host_threshold` nastavitev strani." + spam_hosts: "Ta novi uporabnik je poskusil ustvariti več prispevkov z povezavami na enako domeno. Preverite `newuser_spam_host_threshold` nastavitev strani." edit_this_page: "Uredi to stran" csv_export: boolean_yes: "Da" diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index db726cab34f..4d1a95b9ec4 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -1604,7 +1604,7 @@ sv: missing: "Tyvärr, vi kunde inte hitta någon avatar associerad med den e-postadressen. Kan du försöka ladda upp den igen?" flag_reason: sockpuppet: "En ny användare skapade ett ämne, och en annan ny användare på samma IP-adress (%{ip_address}) svarade. Granska webbplatsinställningen `flag_sockpuppets`." - spam_hosts: "Den här nya användaren försökte skapa flera inlägg med länkar till samma domän (%{domain}). Granska webbplatsinställningen `newuser_spam_host_threshold`." + spam_hosts: "Den här nya användaren försökte skapa flera inlägg med länkar till samma domän. Granska webbplatsinställningen `newuser_spam_host_threshold`." skipped_email_log: exceeded_emails_limit: "Översteg max_emails_per_day_per_user" exceeded_bounces_limit: "Översteg bounce_score_threshold" diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml index 22ffedf85e1..ea688c5c82d 100644 --- a/config/locales/server.sw.yml +++ b/config/locales/server.sw.yml @@ -1846,7 +1846,7 @@ sw: missing: "Samahani, tumeshindwa kuona picha inayoendana na barua pepe hiyo. Unaweza kuipakia tena?" flag_reason: sockpuppet: "Mtumiaji mpya ametengeneza mada, na mtumiaji mpya mwenye anwani ya mtandao hiyo hiyo (%{ip_address}) amejibu. Angalia mpangilio wa tovuti `flag_sockpuppets`." - spam_hosts: "Mtumiaji mpya amejaribu kutengeneza machapisho mengi yenye viungo kwenda kwa kikoa (%{domain}). Tembelea `newuser_spam_host_threshold` mpangilio wa tovuti." + spam_hosts: "Mtumiaji mpya amejaribu kutengeneza machapisho mengi yenye viungo kwenda kwa kikoa. Tembelea `newuser_spam_host_threshold` mpangilio wa tovuti." skipped_email_log: exceeded_emails_limit: "Kiwango kimepita max_emails_per_day_per_user" exceeded_bounces_limit: "Kiwango kimepita bounce_score_threshold" diff --git a/lib/reviewable/conversation.rb b/lib/reviewable/conversation.rb index 1b867888f3b..53eba48ef1a 100644 --- a/lib/reviewable/conversation.rb +++ b/lib/reviewable/conversation.rb @@ -15,7 +15,7 @@ class Reviewable < ActiveRecord::Base end def self.excerpt(cooked) - excerpt = ::Post.excerpt(cooked, 200, keep_emoji_images: true) + excerpt = ::Post.excerpt(cooked, 250, keep_emoji_images: true) # remove the first link if it's the first node fragment = Nokogiri::HTML.fragment(excerpt) if fragment.children.first == fragment.css("a:first").first && fragment.children.first