svn commit: r1100004 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Conf.pm rules/10_default_prefs.cf

[mm...@apache.org]

Author: mmartinec
Date: Fri May  6 00:12:41 2011
New Revision: 1100004

URL: http://svn.apache.org/viewvc?rev=1100004&view=rev
Log:
Bug 6566: X-Ham-Report default wording ("has identified this incoming email as possible spam") is confusing and inaccurate - conditionalized report template

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/rules/10_default_prefs.cf

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1100004&r1=1100003&r2=1100004&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Fri May  6 00:12:41 2011
@@ -4435,6 +4435,7 @@ sub feature_originating_ip_headers { 1 }
 sub feature_dns_local_ports_permit_avoid { 1 }
 sub feature_bayes_auto_learn_on_error { 1 }
 sub feature_uri_host_listed { 1 }
+sub feature_yesno_takes_args { 1 }
 sub feature_bug6558_free { 1 }
 
 ###########################################################################

Modified: spamassassin/trunk/rules/10_default_prefs.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/10_default_prefs.cf?rev=1100004&r1=1100003&r2=1100004&view=diff
==============================================================================
--- spamassassin/trunk/rules/10_default_prefs.cf (original)
+++ spamassassin/trunk/rules/10_default_prefs.cf Fri May  6 00:12:41 2011
@@ -26,9 +26,15 @@
 # Default template. Try to keep it under 78 columns (inside the the dots below).
 #      ........................................................................
 clear_report_template
+if can(Mail::SpamAssassin::Conf::feature_yesno_takes_args)
+report Spam detection software, running on the system "_HOSTNAME_",
+report has_YESNO(, NOT)_ identified this incoming email as_YESNO( possible,)_ spam.  The original
+report message has been attached to this so you can view it or label
+else
 report Spam detection software, running on the system "_HOSTNAME_", has
 report identified this incoming email as possible spam.  The original message
 report has been attached to this so you can view it (if it isn't spam) or label
+endif
 report similar future email.  If you have any questions, see
 report _CONTACTADDRESS_ for details.
 report