Commit 73e0ac22 authored by sikeda's avatar sikeda
Browse files

[dev] French spelling in English messages and variable names: "receipient" and "adresse".

*NOTE*: On bulkmailer_table, a column is named "recEipients_bulkmailer"; it should not be changed.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@10708 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent cf436711
......@@ -110,7 +110,7 @@ sub corrige {
my ($adr, $from) = @_;
## adresse X400
## X400 address
if ($adr =~ /^\//) {
my (%x400, $newadr);
......@@ -337,7 +337,7 @@ sub anabounce {
}
local $/ = '';
}elsif (/^Your message adressed to .* couldn\'t be delivered/m) {
}elsif (/^Your message add?ressed to .* couldn\'t be delivered/m) {
my $adr;
......@@ -346,7 +346,7 @@ sub anabounce {
local $/ = "\n";
foreach (@paragraphe) {
if (/^Your message adressed to (.*) couldn\'t be delivered, for the following reason :/) {
if (/^Your message add?ressed to (.*) couldn\'t be delivered, for the following reason :/) {
$adr = $1;
$adr =~ s/^[\"\<](.+)[\"\>]$/$1/;
$type = 5;
......
......@@ -127,7 +127,8 @@ sub next {
}
# select the packet that has been locked previously
unless ($sth = SDM::do_query( "SELECT messagekey_bulkmailer AS messagekey, messageid_bulkmailer AS messageid, packetid_bulkmailer AS packetid, receipients_bulkmailer AS receipients, returnpath_bulkmailer AS returnpath, listname_bulkmailer AS listname, robot_bulkmailer AS robot, priority_message_bulkmailer AS priority_message, priority_packet_bulkmailer AS priority_packet, verp_bulkmailer AS verp, tracking_bulkmailer AS tracking, merge_bulkmailer as merge, reception_date_bulkmailer AS reception_date, delivery_date_bulkmailer AS delivery_date FROM bulkmailer_table WHERE lock_bulkmailer=%s %s",SDM::quote($lock), $order)) {
#FIXME: A column name is recEipients_bulkmailer.
unless ($sth = SDM::do_query( "SELECT messagekey_bulkmailer AS messagekey, messageid_bulkmailer AS messageid, packetid_bulkmailer AS packetid, receipients_bulkmailer AS recipients, returnpath_bulkmailer AS returnpath, listname_bulkmailer AS listname, robot_bulkmailer AS robot, priority_message_bulkmailer AS priority_message, priority_packet_bulkmailer AS priority_packet, verp_bulkmailer AS verp, tracking_bulkmailer AS tracking, merge_bulkmailer as merge, reception_date_bulkmailer AS reception_date, delivery_date_bulkmailer AS delivery_date FROM bulkmailer_table WHERE lock_bulkmailer=%s %s",SDM::quote($lock), $order)) {
Log::do_log('err','Unable to retrieve informations for packet %s of message %s',$packet->{'packetid'}, $packet->{'messagekey'});
return undef;
}
......@@ -541,7 +542,7 @@ sub store {
my $current_date = int(time);
# second : create each receipient packet in bulkmailer_table
# second : create each recipient packet in bulkmailer_table
my $type = ref $rcpts;
unless (ref $rcpts) {
......
......@@ -1169,7 +1169,7 @@ sub get_owners_email {
}
## Returns an array of editors' email addresses
# or owners if there isn't any editors'email adress
# or owners if there isn't any editors' email addresses
sub get_editors_email {
my($self,$param) = @_;
Log::do_log('debug3', 'List::get_editors_email(%s,%s)', $self->{'name'}, $param -> {'ignore_nomail'});
......@@ -2250,7 +2250,7 @@ sub send_file {
# if the list have it's private_key and cert sign the message
# . used only for the welcome message, could be usefull in other case?
# . a list should have several certificats and use if possible a certificat
# issued by the same CA as the receipient CA if it exists
# issued by the same CA as the recipient CA if it exists
if ($sign_mode eq 'smime') {
$data->{'fromlist'} = $self->get_list_address();
$data->{'replyto'} = $self->get_list_address('owner');
......@@ -2620,7 +2620,7 @@ sub send_msg {
$reception_option = 'mail' unless $reception_option ;
}
## Preparing VERP receipients.
## Preparing VERP recipients.
my @verp_selected_tabrcpt = extract_verp_rcpt($verp_rate, $xsequence,\@selected_tabrcpt, \@possible_verptabrcpt);
my $verp= 'off';
......@@ -3207,7 +3207,7 @@ sub send_notify_to_listmaster {
my @tosend;
if($operation eq 'automatic_bounce_management') {
## Automatic action done on bouncing adresses
## Automatic action done on bouncing addresses
delete $data->{'alarm'};
my $list = List->new($data->{'list'}{'name'}, $robot);
unless(defined $list) {
......
......@@ -461,7 +461,7 @@ sub get_first_db_log {
}
# if the listmaster want to make a search by an IP adress.
# if the listmaster want to make a search by an IP address.
if ($select->{'ip'}) {
$statement .= sprintf ' AND client_logs = %s ', SDM::quote($select->{'ip'
});
......
......@@ -263,9 +263,10 @@ my %full_db_struct = (
'doc'=>'The message Id',
'order'=>3,
},
##FIXME: column name is "recEipients_bulkmailer"
'receipients_bulkmailer' => {
'struct'=> 'text',
'doc'=>'the comma separated list of receipient email for this message',
'doc'=>'the comma separated list of recipient email for this message',
'order'=>4,
},
'returnpath_bulkmailer' => {
......@@ -295,7 +296,7 @@ my %full_db_struct = (
},
'merge_bulkmailer' => {
'struct'=> 'int(1)',
'doc'=>'Boolean, if true, the message is to be parsed as a TT2 template foreach receipient',
'doc'=>'Boolean, if true, the message is to be parsed as a TT2 template foreach recipient',
'order'=>10,
},
'priority_message_bulkmailer' => {
......@@ -324,7 +325,7 @@ my %full_db_struct = (
'order'=>15,
},
},
'doc'=>'storage of receipients with a ref to a message in spool_table. So a very simple process can distribute them',
'doc'=>'storage of recipients with a ref to a message in spool_table. So a very simple process can distribute them',
'order'=>4,
},
'exclusion_table' => {
......@@ -477,12 +478,12 @@ my %full_db_struct = (
},
'recipient_notification' => {
'struct'=> 'varchar(100)',
'doc'=>'email adresse of receipient for which a DSN or MDM was received',
'doc'=>'email address of recipient for which a DSN or MDM was received',
'order'=>3,
},
'reception_option_notification' => {
'struct'=> 'varchar(20)',
'doc'=>'The subscription option of the subscriber when the related message was sent to the list. Ussefull because some receipient may have option such as //digest// or //nomail//',
'doc'=>'The subscription option of the subscriber when the related message was sent to the list. Ussefull because some recipient may have option such as //digest// or //nomail//',
'order'=>4,
},
'status_notification' => {
......@@ -520,7 +521,7 @@ my %full_db_struct = (
'doc'=>'FIXME',
'not_null'=>1},
},
'doc' => 'used for message tracking feature. If the list is configured for tracking, outgoing messages include a delivery status notification request and optionnaly a return receipt request.When DSN MDN are received by Syamp, they are store in this table in relation with the related list and message_id',
'doc' => 'used for message tracking feature. If the list is configured for tracking, outgoing messages include a delivery status notification request and optionnaly a return receipt request. When DSN MDN are received by Sympa, they are stored in this table in relation with the related list and message_id',
'order' => 8,
},
'logs_table' => {
......
......@@ -90,7 +90,7 @@ sub get_mac {
return undef;
}
unless ($email) {
Log::do_log('err', 'get_mac : failure missing email adresse or cookie MD5 digest');
Log::do_log('err', 'get_mac : failure missing email address or cookie MD5 digest');
return undef;
}
......
......@@ -712,7 +712,7 @@ sub sendto {
))
) {
Log::do_log('err',
'Unable to encrypt message to list %s for receipient %s',
'Unable to encrypt message to list %s for recipient %s',
$listname, $email);
return undef;
}
......
......@@ -277,7 +277,7 @@ sub sanitize_var {
return 1;
}
## Sorts the list of adresses by domain name
## Sorts the list of addresses by domain name
## Input : users hash
## Sort by domain.
sub sortbydomain {
......
......@@ -188,18 +188,18 @@ while (!$end) {
if ($file =~ /^\.remove\.((.*)\.(\d\d\d\d\-\d\d))\.\d+$/ ) {
my $arclistdir = $1;
my $listadress = $2;
my $listname = $2;
my $yyyymm = $3;
##my $arcpath = "$arcpath/$listadress/$yyyymm";
##my $arcpath = "$arcpath/$listname/$yyyymm";
my $list;
unless ($list = List->new($listadress)) {
Log::do_log('err',"remove : unknown list $listadress");
unless ($list = List->new($listname)) {
Log::do_log('err',"remove : unknown list $listname");
next;
}
my $arcpath = Conf::get_robot_conf($list->{'domain'},'arc_path')."/$listadress/$yyyymm";
my $arcpath = Conf::get_robot_conf($list->{'domain'},'arc_path')."/$listname/$yyyymm";
Log::do_log('debug',"start remove process :listadress :'$listadress' arclistdir '$arclistdir' arcpath '$arcpath' yyyymm '$yyyymm'");
Log::do_log('debug',"start remove process :listname :'$listname' arclistdir '$arclistdir' arcpath '$arcpath' yyyymm '$yyyymm'");
Log::do_log('debug',"remove found : $file for list $yyyymm");
......
......@@ -290,11 +290,11 @@ while (!$end) {
$data->{'messageid'} = $message_from_spool->{'messageid'};
$data->{'listname'} = $bulk->{'listname'};
$data->{'robot'} = $bulk->{'robot'};
#XXX$data->{'to'} = $bulk->{'receipients'}; #XXX Insecure
#XXX$data->{'to'} = $bulk->{'recipients'}; #XXX Insecure
$data->{'wwsympa_url'} = Conf::get_robot_conf($bulk->{'robot'},'wwsympa_url');
my $rcpt; # It is the email of a subscriber, use it in the foreach
my @rcpts = split /,/,$bulk->{'receipients'}; # Contain all the subscribers
my @rcpts = split /,/,$bulk->{'recipients'}; # Contain all the subscribers
## Use an intermediate handler to encode to filesystem_encoding
my $user;
......
......@@ -1612,7 +1612,7 @@ sub DoFile {
}elsif ($rcpt =~ /^listmaster(\@(\S+))?$/) {
$status = DoForward('sympa', 'listmaster', $robot, $message);
## Mail adressed to the robot and mail
## Mail addressed to the robot and mail
## to <list>-subscribe or <list>-unsubscribe are commands
}elsif (($rcpt =~ /^(sympa|$conf_email)(\@\S+)?$/i) || ($type =~ /^(subscribe|unsubscribe)$/o)) {
$status = DoCommand($rcpt, $robot, $message);
......
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