Commit 905445ae authored by sikeda's avatar sikeda
Browse files

[bug] Fixed several misspellings of the word "occurrence(s)" in sources.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@10709 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 73e0ac22
......@@ -4702,7 +4702,7 @@ sub do_search {
push @{$param->{'similar_subscribers'}}, $user;
last if($#{$param->{'similar_subscribers'}} + 1 > $max_select);
}
$param->{'similar_subscribers_occurence'} = $#{$param->{'similar_subscribers'}} + 1;
$param->{'similar_subscribers_occurrence'} = $#{$param->{'similar_subscribers'}} + 1;
}
# for misspelling in 6.2a or earlier.
$param->{'similar_subscribers_occurence'} =
......
......@@ -4542,7 +4542,7 @@ sub get_list_member_no_object {
}else {
my $error = $sth->err;
if ($error) {
Log::do_log('err',"An error occured while fetching the data from the database.");
Log::do_log('err',"An error occurred while fetching the data from the database.");
return undef;
}else{
Log::do_log('debug2',"No user with the email %s is subscribed to list %s@%s",$email,$name,$options->{'domain'});
......@@ -7312,7 +7312,7 @@ sub _load_list_members_from_include {
}
}
## If an error occured, return an undef value
## If an error occurred, return an undef value
$result->{'users'} = \%users;
$result->{'errors'} = \@errors;
$result->{'exclusions'} = \@ex_sources;
......@@ -7438,7 +7438,7 @@ sub _load_list_admin_from_include {
}
}
## If an error occured, return an undef value
## If an error occurred, return an undef value
unless (defined $total) {
return undef;
}
......@@ -9405,7 +9405,7 @@ sub _load_list_config_file {
if (defined $admin{$pname}) {
unless (($pinfo->{$pname}{'occurrence'} eq '0-n') or
($pinfo->{$pname}{'occurrence'} eq '1-n')) {
Log::do_log('err', 'Multiple occurences of a unique parameter "%s" in %s', $pname, $config_file);
Log::do_log('err', 'Multiple occurrences of a unique parameter "%s" in %s', $pname, $config_file);
}
}
......
......@@ -536,7 +536,7 @@ our %pinfo = (
'group' => 'sending',
'gettext_id' => "Allow message personnalization",
'format' => ['on', 'off'],
'occurence' => '0-1',
'occurrence' => '0-1',
'default' => {'conf' => 'merge_feature'}
},
......@@ -544,7 +544,7 @@ our %pinfo = (
'group' => 'sending',
'gettext_id' => "Reject mail from automates (crontab, etc)?",
'format' => ['on', 'off'],
'occurence' => '0-1',
'occurrence' => '0-1',
'default' => {'conf' => 'reject_mail_from_automates_feature'}
},
......@@ -860,7 +860,7 @@ our %pinfo = (
'gettext_id' =>
"Notify subscribers when they are included from a data source?",
'format' => ['on', 'off'],
'occurence' => '0-1',
'occurrence' => '0-1',
'default' => 'off',
},
......@@ -1444,7 +1444,7 @@ our %pinfo = (
'order' => 9,
'gettext_id' => "Name of email entry",
'format' => '\S+',
'occurence' => '1'
'occurrence' => '1'
},
'select' => {
'order' => 10,
......@@ -1608,7 +1608,7 @@ our %pinfo = (
'order' => 18,
'gettext_id' => "Name of email entry",
'format' => '\S+',
'occurence' => '1'
'occurrence' => '1'
},
'nosync_time_ranges' => {
'order' => 19,
......@@ -1693,7 +1693,7 @@ our %pinfo = (
'order' => 10,
'gettext_id' => "Name of email entry",
'format' => '\S+',
'occurence' => '1'
'occurrence' => '1'
},
'nosync_time_ranges' => {
'order' => 11,
......@@ -1713,7 +1713,7 @@ our %pinfo = (
'gettext_comment' =>
"Enable/Disable DKIM. This feature require Mail::DKIM to installed and may be some custom scenario to be updated",
'format' => ['on', 'off'],
'occurence' => '0-1',
'occurrence' => '0-1',
'default' => {'conf' => 'dkim_feature'}
},
......@@ -1729,7 +1729,7 @@ our %pinfo = (
'gettext_comment' =>
"The file must contain a RSA pem encoded private key",
'format' => '\S+',
'occurence' => '0-1',
'occurrence' => '0-1',
'default' => {'conf' => 'dkim_private_key_path'}
},
'selector' => {
......@@ -1738,7 +1738,7 @@ our %pinfo = (
'gettext_comment' =>
"The selector is used in order to build the DNS query for public key. It is up to you to choose the value you want but verify that you can query the public DKIM key for <selector>._domainkey.your_domain",
'format' => '\S+',
'occurence' => '0-1',
'occurrence' => '0-1',
'default' => {'conf' => 'dkim_selector'}
},
'header_list' => {
......@@ -1748,7 +1748,7 @@ our %pinfo = (
'gettext_comment' =>
'You should probably use the default value which is the value recommended by RFC4871',
'format' => '\S+',
'occurence' => '0-1',
'occurrence' => '0-1',
'default' => {'conf' => 'dkim_header_list'},
'obsolete' => 1,
},
......@@ -1759,7 +1759,7 @@ our %pinfo = (
'gettext_comment' =>
'The DKIM "d=" tag, is the domain of the signing entity. the list domain MUST be included in the "d=" domain',
'format' => '\S+',
'occurence' => '0-1',
'occurrence' => '0-1',
'default' => {'conf' => 'dkim_signer_domain'}
},
'signer_identity' => {
......@@ -1769,7 +1769,7 @@ our %pinfo = (
'gettext_comment' =>
'DKIM "i=" tag, you should probably not use this parameter, as recommended by RFC 4871, default for list brodcasted messages is i=<listname>-request@<domain>',
'format' => '\S+',
'occurence' => '0-1'
'occurrence' => '0-1'
},
},
'occurrence' => '0-1'
......@@ -1945,7 +1945,7 @@ our %pinfo = (
'gettext_id' =>
"Allow picture display? (must be enabled for the current robot)",
'format' => ['on', 'off'],
'occurence' => '0-1',
'occurrence' => '0-1',
'default' => {'conf' => 'pictures_feature'}
},
......@@ -2065,7 +2065,7 @@ our %pinfo = (
'gettext_id' => "type",
'format' => ['string', 'text', 'integer', 'enum'],
'default' => 'string',
'occurence' => 1
'occurrence' => 1
},
'enum_values' => {
'order' => 5,
......
......@@ -4040,7 +4040,7 @@ sub get_children_processes_list {
# Function : decode_header
# Description : return header value decoded to UTF-8 or undef.
# trailing newline will be removed.
# If sep is given, return all occurrances joined by it.
# If sep is given, return all occurrences joined by it.
## IN : msg, tag, [sep]
#*******************************************
sub decode_header {
......
......@@ -127,7 +127,7 @@ foreach my $alias (@aliases) {
$command_value = $queue_transport;
}
# We substitute all occurences of + by - for the rest of the attributes, including the dn.
# We substitute all occurrences of + by - for the rest of the attributes, including the dn.
# The rationale behind this is that the "uid" attribute prevents the use of the '+' character.
$alias_value =~ s/\+/\-/g;
......
......@@ -1662,7 +1662,7 @@ sub DoFile {
## Sampling delay is over, reinit
$loop_info{$sender}{'date_init'} = time;
## We apply Decrease factor if a loop occured
## We apply Decrease factor if a loop occurred
$loop_info{$sender}{'count'} *= $Conf::Conf{'loop_command_decrease_factor'};
}
......
......@@ -1793,7 +1793,7 @@ sub error {
my $message = $_[1];
my @param;
$param[0] = "An error has occured during the execution of the task $task_file :
$param[0] = "An error has occurred during the execution of the task $task_file :
$message";
Log::do_log ('err', "$message");
change_label ($task_file, 'ERROR') unless ($task_file eq '');
......
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