Commit ffe9510d authored by IKEDA Soji's avatar IKEDA Soji
Browse files

WWSympa: wwsympa_url would be optional

parent ad27668d
...@@ -13,4 +13,6 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]List %1 automatic bounce managem ...@@ -13,4 +13,6 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]List %1 automatic bounce managem
[% user %] [% user %]
[% END %] [% END %]
[% IF conf.wwsympa_url -%]
[%|loc%]Managing bouncing subscribers:[%END%] [% 'reviewbouncing' | url_abs([list.name]) %] [%|loc%]Managing bouncing subscribers:[%END%] [% 'reviewbouncing' | url_abs([list.name]) %]
[% END -%]
...@@ -126,4 +126,6 @@ X-Loop: [% conf.email %]@[% domain %] ...@@ -126,4 +126,6 @@ X-Loop: [% conf.email %]@[% domain %]
-----------==========================================----------- -----------==========================================-----------
[% IF conf.wwsympa_url -%]
[%|loc(conf.wwsympa_url)%]For further information, check the mailing list web site %1[%END%] [%|loc(conf.wwsympa_url)%]For further information, check the mailing list web site %1[%END%]
[% END -%]
...@@ -2,12 +2,16 @@ ...@@ -2,12 +2,16 @@
Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%] Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
[%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%] [%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
[% | mailtourl({subject => "sub ${list.name}"}) ~%] [% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[% conf.email %]@[% domain %]
[%~ END %]
[%|loc%]Everything about this list: [%END%][% 'info' | url_abs([list.name]) %] [% IF conf.wwsympa_url -%]
[%|loc%]Unsubscription:[%END%] [%|loc%]Everything about this list: [%END ~%]
[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%] [% 'info' | url_abs([list.name]) %]
[% conf.email %]@[% domain %] [%|loc%]Unsubscription:[%END%] [%""~%]
[%~ END %] [% 'signoff' | url_abs([list.name]) %]
[% ELSE -%]
[%|loc%]Information about this list: [%END ~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "info ${list.name}"}) %]
[%|loc%]Unsubscription:[%END%] [%""~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sig ${list.name} ${user.email}"}) %]
[% END -%]
...@@ -3,12 +3,16 @@ From: [% fromlist %] ...@@ -3,12 +3,16 @@ From: [% fromlist %]
Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%] Subject: [% FILTER qencode %][%|loc(list.name)%]resubscription to %1[%END%][%END%]
[%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%] [%|loc(list.name,domain,user.email)%]You have been subscriber of list %1@%2 with email %3 for 1 year or more.[%END%]
[% | mailtourl({subject => "sub ${list.name}"}) ~%] [% "${conf.email}@${domain}" | mailtourl({subject => "sub ${list.name}"}) %]
[% conf.email %]@[% domain %]
[%~ END %]
[%|loc%]Everything about this list: [%END%][% 'info' | url_abs([list.name]) %] [% IF conf.wwsympa_url -%]
[%|loc%]Unsubscription:[%END%] [%|loc%]Everything about this list: [%END ~%]
[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%] [% 'info' | url_abs([list.name]) %]
[% conf.email %]@[% domain %] [%|loc%]Unsubscription:[%END%] [%""~%]
[%~ END %] [% 'signoff' | url_abs([list.name]) %]
[% ELSE -%]
[%|loc%]Information about this list: [%END ~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "info ${list.name}"}) %]
[%|loc%]Unsubscription:[%END%] [%""~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sig ${list.name} ${user.email}"}) %]
[% END -%]
...@@ -6,15 +6,13 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Invitation to join list %1[%END% ...@@ -6,15 +6,13 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Invitation to join list %1[%END%
[%|loc(list.subject)%]This list is about %1, so you are probably concerned.[%END%] [%|loc(list.subject)%]This list is about %1, so you are probably concerned.[%END%]
[%|loc%]To subscribe, click the following URL:[%END%] [%|loc%]To subscribe, click the following URL:[%END%]
[% IF user_interfaces.size() == 1 && user_interfaces.0 == 'mail' -%] [% IF conf.wwsympa_url -%]
[% | mailtourl({subject => "AUTH ${keyauth} ${cmd}"}) ~%] [% 'auth' | url_abs([keyauth,'subscribe',list.name],{email=>user.email}) %]
[% conf.email %]@[% domain %] [%~ ELSE -%]
[%~ END %] [% "${conf.email}@${domain}" | mailtourl({subject => "AUTH ${keyauth} ${cmd}"}) %]
[%|loc(conf.email,domain)%]Or send a message to %1@%2 with the following subject:[%END%] [%|loc(conf.email,domain)%]Or send a message to %1@%2 with the following subject:[%END%]
AUTH [% keyauth %] [% cmd %] AUTH [% keyauth %] [% cmd %]
[%- ELSE -%] [%~ END -%]
[% 'auth' | url_abs([keyauth,'subscribe'],{email=>user.email}) %]
[%- END %]
[%|loc%]If you don't want to subscribe just ignore this message.[%END%] [%|loc%]If you don't want to subscribe just ignore this message.[%END%]
...@@ -3,8 +3,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]%1 mailing list creation[%END%][ ...@@ -3,8 +3,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]%1 mailing list creation[%END%][
[%|loc(list.name,domain)%]%1@%2 mailing list has been activated by listmaster.[%END%] [%|loc(list.name,domain)%]%1@%2 mailing list has been activated by listmaster.[%END%]
[% IF conf.wwsympa_url -%]
[%|loc%]homepage[%END%] [%|loc%]homepage[%END%]
[% 'info' | url_abs([list.name]) %] [% 'info' | url_abs([list.name]) %]
[%|loc(list.name)%]%1 admin page[%END%] [%|loc(list.name)%]%1 admin page[%END%]
[% 'admin' | url_abs([list.name]) %] [% 'admin' | url_abs([list.name]) %]
[% END -%]
...@@ -6,6 +6,7 @@ Subject: [% FILTER qencode %][%|loc%]Your message has been rejected[%END%][%END% ...@@ -6,6 +6,7 @@ Subject: [% FILTER qencode %][%|loc%]Your message has been rejected[%END%][%END%
[%|loc(subject)%](Subject of your mail: %1)[%END%] [%|loc(subject)%](Subject of your mail: %1)[%END%]
[% IF conf.wwsympa_url -%]
[%|loc(list.name)%]Check %1 list usage:[%END%] [%|loc(list.name)%]Check %1 list usage:[%END%]
[% 'info' | url_abs([list.name]) %] [% 'info' | url_abs([list.name]) %]
[% END -%]
...@@ -6,10 +6,14 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Reminder of your subscription to ...@@ -6,10 +6,14 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Reminder of your subscription to
[%|loc%]It is important to us to not send mail to people that don't want to receive it. If you do not want to be on this mailing list, please follow the instructions below to remove yourself.[%END%] [%|loc%]It is important to us to not send mail to people that don't want to receive it. If you do not want to be on this mailing list, please follow the instructions below to remove yourself.[%END%]
[%|loc%]List information: [%END%][% 'info' | url_abs([list.name]) %] [% IF conf.wwsympa_url -%]
[% IF subscriber.included != 1 %] [%|loc%]List information: [%END ~%]
[%|loc%]To unsubscribe:[%END%] [% 'info' | url_abs([list.name]) %]
[% | mailtourl({subject => "sig ${list.name} ${user.email}"}) ~%] [%|loc%]To unsubscribe:[%END%] [%""~%]
[% conf.email %]@[% domain %] [% 'signoff' | url_abs([list.name]) %]
[%~ END %] [% ELSE -%]
[%END%] [%|loc%]List information: [%END ~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "info ${list.name}"}) %]
[%|loc%]To unsubscribe:[%END%] [%""~%]
[% "${conf.email}@${domain}" | mailtourl({subject => "sig ${list.name} ${user.email}"}) %]
[% END -%]
...@@ -33,7 +33,7 @@ Subject: [% FILTER qencode %]AUTH [%keyauth%] [%cmd%][%END%] ...@@ -33,7 +33,7 @@ Subject: [% FILTER qencode %]AUTH [%keyauth%] [%cmd%][%END%]
[%- END -%] [%- END -%]
[% IF user_interfaces.size() == 1 and user_interfaces.0 == 'mail' -%] [% IF not conf.wwsympa_url -%]
[% sympa = BLOCK %][% conf.email %]@[% domain %][%END -%] [% sympa = BLOCK %][% conf.email %]@[% domain %][%END -%]
[%|loc(sympa,"AUTH ${keyauth} ${cmd}") %]If you want this action to be taken, please [%|loc(sympa,"AUTH ${keyauth} ${cmd}") %]If you want this action to be taken, please
......
...@@ -31,8 +31,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Management of list %1[%END%][%EN ...@@ -31,8 +31,10 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Management of list %1[%END%][%EN
[%|loc(delegator,list.name,domain)%]You have been delegated the responsability of list moderator by %1 for list %2@%3.[%END%] [%|loc(delegator,list.name,domain)%]You have been delegated the responsability of list moderator by %1 for list %2@%3.[%END%]
[% END %] [% END %]
[% IF conf.wwsympa_url -%]
[%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %] [%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %]
[%|loc%]Owner and moderator guide:[%END%] [% 'help/admin' | url_abs %] [%|loc%]Owner and moderator guide:[%END%] [% 'help/admin' | url_abs %]
[% END -%]
[% ELSIF type == 'ticket_to_family_signoff' -%] [% ELSIF type == 'ticket_to_family_signoff' -%]
Subject: [% FILTER qencode %][%|loc(family)%]Unsubscribing from family %1[%END%][%END%] Subject: [% FILTER qencode %][%|loc(family)%]Unsubscribing from family %1[%END%][%END%]
......
...@@ -10,6 +10,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Welcome to list %1[%END%][%END%] ...@@ -10,6 +10,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Welcome to list %1[%END%][%END%]
[% CATCH %] [% CATCH %]
[% END %] [% END %]
[% IF conf.wwsympa_url -%]
[%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %] [%|loc%]The list homepage:[%END%] [% 'info' | url_abs([list.name]) %]
[%|loc%]General informations about mailing lists:[%END%] [% 'help/introduction' | url_abs %] [%|loc%]General informations about mailing lists:[%END%] [% 'help/introduction' | url_abs %]
[% END -%]
...@@ -8,5 +8,7 @@ Subject: %2[%END%] ...@@ -8,5 +8,7 @@ Subject: %2[%END%]
[%|loc(user.email)%]It was not possible to send you the message because the mailing list manager was unable to access your personal certificate (email %1).[%END%] [%|loc(user.email)%]It was not possible to send you the message because the mailing list manager was unable to access your personal certificate (email %1).[%END%]
[%|loc(conf.email,domain)%]Please, in order to receive future encrypted messages send a signed message to %1@%2.[%END%] [%|loc(conf.email,domain)%]Please, in order to receive future encrypted messages send a signed message to %1@%2.[%END%]
[% IF conf.wwsympa_url -%]
[%|loc%]Information about this list:[%END%] [%|loc%]Information about this list:[%END%]
[% 'info' | url_abs([list.name]) %] [% 'info' | url_abs([list.name]) %]
[% END -%]
...@@ -1249,10 +1249,11 @@ our @params = ( ...@@ -1249,10 +1249,11 @@ our @params = (
# Basic configuration # Basic configuration
{ 'name' => 'wwsympa_url', { 'name' => 'wwsympa_url',
'sample' => 'http://web.example.org/sympa', 'sample' => 'https://web.example.org/sympa',
'gettext_id' => 'URL prefix of web interface', 'gettext_id' => 'URL prefix of web interface',
'vhost' => '1', 'vhost' => '1',
'file' => 'sympa.conf', 'file' => 'sympa.conf',
'optional' => '1',
'edit' => '1', 'edit' => '1',
'gettext_comment' => 'gettext_comment' =>
'This is used to construct URLs of web interface.', 'This is used to construct URLs of web interface.',
......
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