Merge pull request #567 from ikedas/6.2.42-bonus by ikedas

Refactoring on mail templates

default/mail_tt2/automatic_bounce_management.tt2

 [%# automatic_bounce_management.tt2 ~%]
-Subject: [% FILTER qencode %][%|loc(list.name)%]List %1 automatic bounce management[%END%][%END%]
+Subject: [%"List %1 automatic bounce management"|loc(list.name)|qencode%]
 
 [% IF action == 'notify_bouncers' -%]
 [%|loc(total,list.name)%]Because we received MANY non-delivery reports, the %1 subscribers listed below have been notified that they might be removed from list %2:[%END%]

default/mail_tt2/bye.tt2

 From: [% fromlist %]
-Subject: [% FILTER qencode %][%|loc(list.name)%]Unsubscribed from %1[%END%][%END%]
+Subject: [%"Unsubscribed from %1"|loc(list.name)|qencode%]
 
 [%|loc(user.email,list.name,domain)%]Your email address (%1) has been removed from list %2@%3[%END%]
 [%|loc%]bye![%END%]

default/mail_tt2/certif_warning.tt2

-Subject: [% FILTER qencode %][%|loc%]near expiration of your certificate[%END%][%END%]
+Subject: [%"near expiration of your certificate"|loc|qencode%]
 
 [%|loc(expiration_date)%]Your authentication certificate will expire on %1.[%END%]
 [%|loc%]The certificate subject is:[%END%]

default/mail_tt2/command_report.tt2

 [%# command_report.tt2 ~%]
 To: [% to %]
-Subject: [% FILTER qencode %][%|loc%]Results of your commands[%END%][%END%]
+Subject: [%"Results of your commands"|loc|qencode%]
 X-Loop: [% conf.email %]@[% domain %]
 
 [%############################-%]

default/mail_tt2/d_install_shared.tt2

 [%# d_install_shared.tt2 ~%]
 From: [% fromlist %]
-Subject: [% FILTER qencode %][%|loc%]Your document has been installed[%END%][%END%]
+Subject: [%"Your document has been installed"|loc|qencode%]
 
 [%|loc(filename,list.name,domain,installed_by)%]Your document %1 for list %2@%3 has been installed by %4 list moderator.[%END%]
 

default/mail_tt2/d_reject_shared.tt2

 From: [% fromlist %]
-Subject: [% FILTER qencode %][%|loc%]Your document has been rejected[%END%][%END%]
+Subject: [%"Your document has been rejected"|loc|qencode%]
 
 [%|loc(filename,list.name,domain,rejected_by)%]Your document %1 for list %2@%3 has been rejected by %4 list moderator.[%END%]

default/mail_tt2/delivery_status_notification.tt2

@@ -2,31 +2,31 @@
 Content-Type: multipart/report; report-type=delivery-status; 
 	boundary="[% boundary %]"
 [% IF action == "delivered" -%]
-Subject: [% FILTER qencode %][%|loc%]Message was successfully delivered[%END%][%END%]
+Subject: [%"Message was successfully delivered"|loc|qencode%]
 [% ELSIF status == '4.2.1' -%]
-Subject: [% FILTER qencode %][%|loc%]List could not be created[%END%][%END%]
+Subject: [%"List could not be created"|loc|qencode%]
 [% ELSIF status == '4.2.4' -%]
-Subject: [% FILTER qencode %][%|loc%]List unknown[%END%][%END%]
+Subject: [%"List unknown"|loc|qencode%]
 [% ELSIF status == '5.1.1' || status == '5.1.2' -%]
-Subject: [% FILTER qencode %][%|loc%]List unknown[%END%][%END%]
+Subject: [%"List unknown"|loc|qencode%]
 [% ELSIF status == '5.2.3' -%]
-Subject: [% FILTER qencode %][%|loc%]Too large message[%END%][%END%]
+Subject: [%"Too large message"|loc|qencode%]
 [% ELSIF status == '5.3.0' -%]
-Subject: [% FILTER qencode %][%|loc%]Message distribution: Internal server error[%END%][%END%]
+Subject: [%"Message distribution: Internal server error"|loc|qencode%]
 [% ELSIF status == '5.3.5' -%]
-Subject: [% FILTER qencode %][%|loc%]Message distribution: User error[%END%][%END%]
+Subject: [%"Message distribution: User error"|loc|qencode%]
 [% ELSIF status == '5.6.0' -%]
-Subject: [% FILTER qencode %][%|loc%]Message distribution: User error[%END%][%END%]
+Subject: [%"Message distribution: User error"|loc|qencode%]
 [% ELSIF status == '5.6.1' -%]
-Subject: [% FILTER qencode %][%|loc%]Results of your commands[%END%][%END%]
+Subject: [%"Results of your commands"|loc|qencode%]
 [% ELSIF status == '5.6.5' -%]
-Subject: [% FILTER qencode %][%|loc%]Cannot personalize message[%END%][%END%]
+Subject: [%"Cannot personalize message"|loc|qencode%]
 [% ELSIF status == '5.7.0' -%]
-Subject: [% FILTER qencode %][%|loc%]A virus in your mail[%END%][%END%]
+Subject: [%"A virus in your mail"|loc|qencode%]
 [% ELSIF status == '5.7.1' -%]
-Subject: [% FILTER qencode %][%|loc%]Message distribution: Authorization denied[%END%][%END%]
+Subject: [%"Message distribution: Authorization denied"|loc|qencode%]
 [% ELSE -%]
-Subject: [% FILTER qencode %][%|loc(action)%]Delivery Status Notification: %1[%END%][%END%]
+Subject: [%"Delivery Status Notification: %1"|loc(action)|qencode%]
 [% END -%]
 X-Loop: [% conf.email %]@[% domain %]
 

default/mail_tt2/digest.tt2

 From: [% fromlist %]
 To: [% to %]
 Reply-to: [% replyto %]
-Subject: [% FILTER qencode %][%|loc(list.name,date)%]%1 Digest %2[%END%][% IF total_group > 1 %][%|loc(current_group,total_group)%] (%1/%2)[%END%][% END %][%END%]
+[% IF total_group > 1 -%]
+Subject: [%"%1 Digest %2"|loc(list.name,date)|qencode%]
+[%- ELSE -%]
+Subject: [%"%1 Digest %2 (%3/%4)"|loc(list.name,date,current_group,total_group)|qencode%]
+[%- END %]
 Content-Type: multipart/mixed; boundary="[% boundary1 %]"
 
 --[% boundary1 %]

default/mail_tt2/digestplain.tt2

 From: [% fromlist %]
 To: [% to %]
 Reply-to: [% replyto %]
-Subject: [% FILTER qencode %][%|loc(list.name,date)%]%1 Digest %2[%END%][% IF total_group > 1 %][%|loc(current_group,total_group)%] (%1/%2)[%END%][% END %][%END%]
+[% IF total_group > 1 -%]
+Subject: [%"%1 Digest %2"|loc(list.name,date)|qencode%]
+[%- ELSE -%]
+Subject: [%"%1 Digest %2 (%3/%4)"|loc(list.name,date,current_group,total_group)|qencode%]
+[%- END %]
 X-Sympa-NoWrap: yes
 
 [%|loc(list.name,date)%]%1 digest %2[%END%]

default/mail_tt2/expire_deletion.tt2

 From: [% fromlist %]
-Subject: [% FILTER qencode %][%|loc(list.name)%]Removed from %1[%END%][%END%]
+Subject: [%"Removed from %1"|loc(list.name)|qencode%]
 
 [%|loc(user.email,list.name,domain)%]Your address (%1) has been removed from list
 %2@%3

default/mail_tt2/expire_warning1.tt2

 [%# expire_warning1.tt2 ~%]
-Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
+Subject: [%"resubscription to %1"|loc(list.name)|qencode%]
 
 [%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
 [% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]

default/mail_tt2/expire_warning2.tt2

 [%# expire_warning2.tt2 ~%]
 From: [% fromlist %]
-Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
+Subject: [%"resubscription to %1"|loc(list.name)|qencode%]
 
 [%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
 [% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]

default/mail_tt2/get_archive.tt2

 To: [% to %]
-Subject: [% FILTER qencode %][%subject%][%END%]
+Subject: [% subject | qencode %]
 Content-Type: multipart/mixed; boundary="[% boundary1 %]"
 
 --[% boundary1 %]

default/mail_tt2/global_remind.tt2

-Subject: [% FILTER qencode %][%|loc%]Subscription summary[%END%][%END%]
+Subject: [%"Subscription summary"|loc|qencode%]
 X-Sympa-NoWrap: yes
 
 [%|wrap -%]

default/mail_tt2/helpfile.tt2

-Subject: [% FILTER qencode %][%|loc%]User guide[%END%][%END%]
+Subject: [%"User guide"|loc|qencode%]
 
               SYMPA -- Systeme de Multi-Postage Automatique
 [%|loc%]                       (Automatic Mailing System)[%END%]

default/mail_tt2/index_archive.tt2

-Subject: [% FILTER qencode %][%|loc(list.name)%]Archives index of list %1[%END%][%END%]
+Subject: [%"Archives index of list %1"|loc(list.name)|qencode%]
 
 [% FOREACH a = archives -%]
 [% a -%]

default/mail_tt2/info_report.tt2

 From: [% fromlist %]
-Subject: [% FILTER qencode %][%|loc(list.name)%]INFO %1[%END%][%END%]
+Subject: [%"INFO %1"|loc(list.name)|qencode%]
 
 [%|loc(list.name,domain)%]Information regarding list %1@%2:[%END%]
 

default/mail_tt2/invite.tt2

 [%# invite.tt2 ~%]
 From: [% requested_by %]
 Reply-To: [% conf.email %]@[% domain %]
-Subject: [% FILTER qencode %][%|loc(list.name)%]Invitation to join list %1[%END%][%END%]
+Subject: [%"Invitation to join list %1"|loc(list.name)|qencode%]
 
 [%|loc(list.subject)%]This list is about %1, so you are probably concerned.[%END%]
 

default/mail_tt2/list_created.tt2

 [%# list_created.tt2 ~%]
-Subject: [% FILTER qencode %][%|loc(list.name)%]%1 mailing list creation[%END%][%END%]
+Subject: [%"%1 mailing list creation"|loc(list.name)|qencode%]
 
 [%|loc(list.name,domain)%]%1@%2 mailing list has been activated by listmaster.[%END%]
 

default/mail_tt2/list_rejected.tt2

-Subject: [% FILTER qencode %][%|loc(list.name)%]Rejected mailing list %1 creation[%END%][%END%]
+Subject: [%"Rejected mailing list %1 creation"|loc(list.name)|qencode%]
 
 [%|loc(list.name,domain)%]%1@%2 mailing list has been rejected by listmaster.[%END%]