Commit cfab756b authored by sikeda's avatar sikeda
Browse files

[svn] Retrieving recent modifications from sympa-6.1-branch.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@10267 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 42b5962e
...@@ -379,6 +379,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server erro ...@@ -379,6 +379,7 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server erro
[%ELSIF error == 'new_document_failed' %][%|loc(path,list.name)%]Unable to create a SharedDocument with path '%1' for list '%2'.[%END%] [%ELSIF error == 'new_document_failed' %][%|loc(path,list.name)%]Unable to create a SharedDocument with path '%1' for list '%2'.[%END%]
[%ELSIF error == 'cookie_error' %][%|loc%]Parameter cookie undefined, authentication failure.[%END%] [%ELSIF error == 'cookie_error' %][%|loc%]Parameter cookie undefined, authentication failure.[%END%]
[%ELSIF error == 'cookie_error_env' %][%|loc(env)%]Cookie error: '%1' undefined, authentication failure.[%END%] [%ELSIF error == 'cookie_error_env' %][%|loc(env)%]Cookie error: '%1' undefined, authentication failure.[%END%]
[%ELSIF error == 'unable_to_rename_list' %][%|loc(list.name,new_listname)%]Unable to rename list '%1' to '%2'.[%END%]
[%ELSIF error%][%error%] [%ELSIF error%][%error%]
[%END%] [%END%]
[%|loc%]See logs for more details.[%END%] [%|loc%]See logs for more details.[%END%]
......
...@@ -75,7 +75,8 @@ my %regexp = ('email' => '([\w\-\_\.\/\+\=\'\&]+|\".*\")\@[\w\-]+(\.[\w\-]+)+', ...@@ -75,7 +75,8 @@ my %regexp = ('email' => '([\w\-\_\.\/\+\=\'\&]+|\".*\")\@[\w\-]+(\.[\w\-]+)+',
'time' => $time_regexp, 'time' => $time_regexp,
'time_range' => $time_range_regexp, 'time_range' => $time_range_regexp,
'time_ranges' => $time_range_regexp.'(?:\s+'.$time_range_regexp.')*', 'time_ranges' => $time_range_regexp.'(?:\s+'.$time_range_regexp.')*',
're' => '(?i)(?:AW|(?:\xD0\x9D|\xD0\xBD)(?:\xD0\x90|\xD0\xB0)|Re(?:\^\d+|\*\d+|\*\*\d+|\[\d+\])?|Rif|SV|VS)\s*:', 're' => '(?i)(?:AW|(?:\xD0\x9D|\xD0\xBD)(?:\xD0\x90|\xD0\xB0)|Re(?:\^\d+|\*\d+|\*\*\d+|\[\d+\])?|Rif|SV|VS|Antw|\xCE\x91(?:\xCE\xA0|\xCF\x80)|\xCE\xA3(?:\xCE\xA7\xCE\x95\xCE\xA4|\xCF\x87\xCE\xB5\xCF\x84)|Odp|YNT)\s*:',
# ( de | ru etc. | en, la etc. | it | da, sv | fi | nl | el | el | pl | tr ).
); );
my %openssl_errors = (1 => 'an error occurred parsing the command options', my %openssl_errors = (1 => 'an error occurred parsing the command options',
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
[% ELSIF i_err.msg == 'db_update_failed' %][%|loc(i_err.key)%]Failed to update database.[%END%] [% ELSIF i_err.msg == 'db_update_failed' %][%|loc(i_err.key)%]Failed to update database.[%END%]
[% ELSIF i_err.msg == 'file_update_failed' %][%|loc(i_err.key)%]Failed to update a file.[%END%] [% ELSIF i_err.msg == 'file_update_failed' %][%|loc(i_err.key)%]Failed to update a file.[%END%]
[% ELSIF i_err.msg == 'create_list' %][%|loc(i_err.listname)%]Failed creating list '%1'. The list might already exist or listname might include forbidden characters.[%END%] [% ELSIF i_err.msg == 'create_list' %][%|loc(i_err.listname)%]Failed creating list '%1'. The list might already exist or listname might include forbidden characters.[%END%]
[% ELSIF i_err.msg == 'unable_to_rename_list' %][%|loc(i_err.listname,i_err.new_listname)%]Unable to rename list '%1' to '%2'.[%END%]
[% END %] [% END %]
<br /> <br />
......
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