Mailing List Archive

Author: duncf
Date: Wed Feb 18 17:32:10 2004
New Revision: 6747

Modified:
incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm
incubator/spamassassin/trunk/rules/30_text_de.cf
incubator/spamassassin/trunk/rules/30_text_fr.cf
Log:
Fix a few instances of _HITS_. Also, fix despamassassinification of _SCORE_ in spam with report_safe 0

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin.pm Wed Feb 18 17:32:10 2004
@@ -1032,6 +1032,7 @@
my $tag = $self->{conf}->{rewrite_header}->{'Subject'};
$tag = quotemeta($tag);
$tag =~ s/_HITS_/\\d{2}\\.\\d{2}/g;
+ $tag =~ s/_SCORE_/\\d{2}\\.\\d{2}/g;
$tag =~ s/_REQD_/\\d{2}\\.\\d{2}/g;
1 while $hdrs =~ s/^Subject: ${tag} /Subject: /gm;
} else {

Modified: incubator/spamassassin/trunk/rules/30_text_de.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_de.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_de.cf Wed Feb 18 17:32:10 2004
@@ -37,7 +37,7 @@
lang de report
lang de report Vorschau: _PREVIEW_
lang de report
-lang de report Inhaltsanalyse im Detail: (_HITS_ Punkte, _REQD_ benötigt)
+lang de report Inhaltsanalyse im Detail: (_SCORE_ Punkte, _REQD_ benötigt)
lang de report
lang de report "Pnkt Regelname Beschreibung"
lang de report ---- ---------------------- --------------------------------------------------
@@ -47,7 +47,7 @@
# ........................................................................
lang de clear_terse_report_template
lang de terse_report ---- Start des SpamAssassin-Reports
-lang de terse_report _HITS_ Punkte, _REQD_ benötigt;
+lang de terse_report _SCORE_ Punkte, _REQD_ benötigt;
lang de terse_report _SUMMARY_
lang de terse_report ---- Ende des SpamAssassin-Reports
# ........................................................................

Modified: incubator/spamassassin/trunk/rules/30_text_fr.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_fr.cf (original)
+++ incubator/spamassassin/trunk/rules/30_text_fr.cf Wed Feb 18 17:32:10 2004
@@ -47,7 +47,7 @@
lang fr report
lang fr report Voir http://spamassassin.org/tag/ pour plus de détails (en anglais).
lang fr report
-lang fr report Détails de l'analyse du message: (_HITS_ points, _REQD_ requis)
+lang fr report Détails de l'analyse du message: (_SCORE_ points, _REQD_ requis)
lang fr report _SUMMARY_
lang fr report -------------------- Fin de Rapport SpamAssassin ---------------------

@@ -58,7 +58,7 @@

lang fr clear-terse-report-template
lang fr terse-report ------------------ Début de Rapport SpamAssassin ---------------------
-lang fr terse-report _HITS_ points, _REQD_ points requis ;
+lang fr terse-report _SCORE_ points, _REQD_ points requis ;
lang fr terse-report _SUMMARY_
lang fr terse-report -------------------- Fin de Rapport SpamAssassin ---------------------