Merge lp:~porten-deactivatedaccount/eventum/devel into lp:eventum

[Harri Porten]

Recognize Italian reply prefix in mail subject.

We encountered mails with Rif: subject prefix. Searching the Net I also found RIF: and Rif.:

[lp:~porten-deactivatedaccount/eventum/devel]

4265. By Elan Ruusamäe on 2011-01-26

fix argument order: first is expected and second is result

4266. By Elan Ruusamäe on 2011-01-26

make testing not depend on config

4267. By Elan Ruusamäe on 2011-01-26

- fix RemoveExcessRe testing

4268. By Elan Ruusamäe on 2011-01-26

Deprecate fixEncoding, wrap it to decodeQuotedPrintable

4269. By Elan Ruusamäe on 2011-01-26

Recognize Italian reply prefix in mail subject (Harri Porten) (merge #47469)

=== modified file 'docs/ChangeLog'
--- docs/ChangeLog	2011-01-25 13:09:42 +0000
+++ docs/ChangeLog	2011-01-25 22:14:17 +0000
@@ -25,6 +25,7 @@
 - Allow translating 'Re: ' in email subjects (Elan Ruusamäe)
 - Add 'Subscribe Me' button to issue details screen for quickly add user itself to default notification options (Elan Ruusamäe)
 - Respect charset when processing Mime_Helper::fixEncoding, [merge req#47336]
+- Recognize Italian reply prefix in mail subject (Harri Porten)
 
 2010-08-19, Version 2.3
 - Removed reference to dynCalendar.css (Bryan, #42301)

=== modified file 'lib/eventum/class.mail_helper.php'
--- lib/eventum/class.mail_helper.php	2011-01-19 10:31:30 +0000
+++ lib/eventum/class.mail_helper.php	2011-01-25 22:14:17 +0000
@@ -94,7 +94,7 @@
         }
         // XXX: this works in most cases,
         // probably the reply prefixes should be configrable per Eventum install
-        $re_pattern = "/(\[#\d+\] ){0,1}(([Rr][Ee][Ss]?|Ответ|Antwort|SV|[Aa][Ww])(\[[0-9]+\])?[ \t]*: ){2}(.*)/";
+        $re_pattern = "/(\[#\d+\] ){0,1}(([Rr][Ee][Ss]?|Ответ|Antwort|SV|[Aa][Ww]|[Rr][Ii][Ff]\.?)(\[[0-9]+\])?[ \t]*: ){2}(.*)/";
         if (preg_match($re_pattern, $subject, $matches)) {
             // TRANSLATORS: %1 = email subject
             $re_format = '$1'.ev_gettext('Re: %1$s', '$5');

=== modified file 'tests/Mail_HelperTest.php'
--- tests/Mail_HelperTest.php	2011-01-19 10:31:30 +0000
+++ tests/Mail_HelperTest.php	2011-01-25 22:14:17 +0000
@@ -107,6 +107,11 @@
         $subject = 're[2]: re: subject';
         $res = $this->object->RemoveExcessRe($subject);
         $this->assertEquals($res, 'Re: subject', 're[2]: with squares');
+
+        // Italian
+        $subject = 'RIF: rif: Rif.: subject';
+        $res = $this->object->RemoveExcessRe($subject);
+        $this->assertEquals($res, 'Re: subject', 'RIF/rif prefix');
     }
 
     public function testRemoveExcessReIssueId()