Commit 749a72d9 authored by olivier.salaun's avatar olivier.salaun
Browse files

Change: no more use encoding defined in PO files to determine charset for messages.

We now use the charsets defined in Language.pm instead.
We now use [% charset %] in mail_tt2 files and &Language::GetCharset() in the code
These changes will make it easier to mode all PO files to UTF-8


git-svn-id: https://subversion.renater.fr/sympa/trunk@4032 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent df9e415d
......@@ -2,7 +2,7 @@ From: [% fromlist %]
To: [% to %]
Subject: [% FILTER qencode %][%subject%][%END%]
Mime-version: 1.0
Content-Type: multipart/mixed; charset=[%|loc%]_charset_[%END%]; boundary="[% boundary%]"
Content-Type: multipart/mixed; charset=[% charset %]; boundary="[% boundary%]"
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
--[% boundary %]
......
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc(list.name)%]Unsubscribed from %1[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(user.email,list.name,list.host)%]Your email address (%1) has been removed from list %2@%3[%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc%]near expiration of your certificate[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(expiration_date)%]Your authentification certificate will expire on %1.[%END%]
......
......@@ -3,7 +3,7 @@ To: [% to %]
Subject: [% FILTER qencode %][%|loc%]Results of your commands[%END%][%END%]
X-Loop: [% conf.sympa %]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%############################-%]
......
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc%]Your document has been installed.[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
......
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc%]Your document has been rejected.[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(filename,list.name,list.host,rejected_by)%]Your document %1 for list %2@%3
......
......@@ -6,7 +6,7 @@ Mime-version: 1.0
Content-Type: multipart/mixed; boundary="[% boundary1 %]"
--[% boundary1 %]
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc%]Table of contents:[%END%]
......@@ -31,7 +31,7 @@ X-Sympa-Attach: yes
[% END %]
--[% boundary2 %]
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
Content-Disposition: inline
......
......@@ -3,7 +3,7 @@ To: [% to %]
Reply-to: [% replyto %]
Subject: [% FILTER qencode %][%|loc(list.name,date)%]%1 Digest %2[%END%] [% IF total_group > 1 -%]([% current_group %]/[% total_group %])[% END %][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(list.name,date)%]%1 Digest %2[%END%]
......
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc(list.name)%]Removed from %1[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(user.email,list.name,list.host)%]Your address (%1) has been removed from list
......
From: [% conf.email %]@[% conf.host %]
Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(list.name,list.host,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more;[%END%]
......
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Tansfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(list.name,list.host,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more;[%END%]
......
......@@ -5,7 +5,7 @@ Mime-version: 1.0
Content-Type: multipart/mixed; boundary="[% boundary1 %]"
--[% boundary1 %]
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc%]Table of contents:[%END%]
......@@ -30,7 +30,7 @@ X-Sympa-Attach: yes
[% END %]
--[% boundary2 %]
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
Content-Disposition: inline
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc%]Subscription summary[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(user.email)%]Summary of your subscription (using the e-mail %1).[%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc%]User guide[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
SYMPA -- Systeme de Multi-Postage Automatique
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc(list.name)%]Archives index of list %1[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[% FOREACH a = archives -%]
......
From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc(list.name)%]INFO %1[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(list.name,list.host)%]Information regarding list %1@%2[%END%] :
......
......@@ -2,7 +2,7 @@ From: [% requested_by %]
Reply-To: [% conf.sympa %]
Subject: [% FILTER qencode %][%|loc(list.name)%]Invitation to join list %1[%END%][%END%]
Mime-version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(list.subject)%]This list is about %1, so you are probably concerned.[%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][%|loc(list.name)%]%1 mailing list creation[%END%][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(list.name,list.host)%]%1@%2 mailing list has been activated by listmaster.[%END%]
......
From: SYMPA <[% conf.email %]@[% conf.host %]>
Subject: [% FILTER qencode %][% list.name %][%END%]
MIME-Version: 1.0
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
Content-Transfer-Encoding: [%|loc%]_encoding_[%END%]
[%|loc(list.name,list.host)%]%1@%2 mailing list has been rejected by listmaster.[%END%]
......@@ -7,7 +7,7 @@ Content-Type: multipart/report; report-type=delivery-status;
--[% boundary %]
Content-Description: Notification
Content-Type: text/plain; charset=[%|loc%]_charset_[%END%];
Content-Type: text/plain; charset=[% charset %];
[%|loc%]This is an automatic response sent by Sympa Mailing Lists Manager.[%END%]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment