Commit 1a1766ee authored by IKEDA Soji's avatar IKEDA Soji
Browse files

[change] Rename mhonarc-ressources.tt2 to mhonarc_rc.tt2

parent 50a7398e
......@@ -32,7 +32,7 @@ nobase_default_DATA = \
create_list.conf \
edit_list.conf \
ldap_alias_entry.tt2 \
mhonarc-ressources.tt2 \
mhonarc_rc.tt2 \
mime.types \
nrcpt_by_domain.conf \
sympa.wsdl \
......
......@@ -1873,7 +1873,7 @@ div.admin_cmd a {
}
[%~ END # IF 0 ~%]
/* Calendar in mhonarc-ressources.tt2 */
/* Calendar in mhonarc_rc.tt2 */
ul.calendar {
margin-left:0!important;
padding-left:0!important;
......@@ -1919,7 +1919,7 @@ ul li.calendarLinksInactive {
ul li.calendarYear {
border: 1px solid;
}
/* end calendar in mhonarc-ressources.tt2 */
/* end calendar in mhonarc_rc.tt2 */
abbr,
acronym,
......
......@@ -165,7 +165,7 @@ foreach my $tpl (@templates) {
if ($tpl =~ /mhonarc\-ressources$/) {
rename $tpl, "$tpl.incompatible";
printf STDERR
"File $tpl could not be translated to TT2 ; it has been renamed $tpl.incompatible. You should customize a standard mhonarc-ressourses.tt2 file\n";
"File $tpl could not be translated to TT2 ; it has been renamed $tpl.incompatible. You should customize a standard mhonarc_rc.tt2 file\n";
next;
}
......
......@@ -489,8 +489,7 @@ sub html_store {
return undef;
}
my $mhonarc_ressources =
Sympa::search_fullpath($list, 'mhonarc-ressources.tt2');
my $mhonarc_rc = Sympa::search_fullpath($list, 'mhonarc_rc.tt2');
$log->syslog(
'debug',
......@@ -504,7 +503,7 @@ sub html_store {
Conf::get_robot_conf($list->{'domain'}, 'mhonarc'),
'-add',
'-addressmodifycode' => '1', # w/a: Clear old cache in .mhonarc.db.
'-rcfile' => $mhonarc_ressources,
'-rcfile' => $mhonarc_rc,
'-outdir' => $self->{arc_directory},
'-definevars' => sprintf(
"listname='%s' hostname=%s yyyy=%s mois=%s yyyymm=%s-%s wdir=%s base=%s/arc with_tslice=1 with_powered_by=1",
......@@ -641,8 +640,7 @@ sub html_rebuild {
my $robot_id = $list->{'domain'};
my $arc_directory = $self->{arc_directory};
my $mhonarc_ressources =
Sympa::search_fullpath($list, 'mhonarc-ressources.tt2');
my $mhonarc_rc = Sympa::search_fullpath($list, 'mhonarc_rc.tt2');
# Remove existing HTML files and .mhonarc.db.
my $dh;
......@@ -670,7 +668,7 @@ sub html_rebuild {
my @cmd = (
Conf::get_robot_conf($robot_id, 'mhonarc'),
'-addressmodifycode' => '1', # w/a: Clear old cache in .mhonarc.db.
'-rcfile' => $mhonarc_ressources,
'-rcfile' => $mhonarc_rc,
'-outdir' => $arc_directory,
'-definevars' => sprintf(
"listname='%s' hostname=%s yyyy=%s mois=%s yyyymm=%s-%s wdir=%s base=%s/arc with_tslice=1 with_powered_by=1",
......@@ -884,10 +882,9 @@ sub html_format {
map { Sympa::Tools::Text::encode_uri($_) } @$attachment_url;
}
my $mhonarc_ressources =
Sympa::search_fullpath($that, 'mhonarc-ressources.tt2');
unless ($mhonarc_ressources) {
$log->syslog('notice', 'Cannot find any MhOnArc ressource file');
my $mhonarc_rc = Sympa::search_fullpath($that, 'mhonarc_rc.tt2');
unless ($mhonarc_rc) {
$log->syslog('notice', 'Cannot find any MHonArc resource file');
return undef;
}
......@@ -920,7 +917,7 @@ sub html_format {
my $exitcode = system(
Conf::get_robot_conf($robot, 'mhonarc'),
'-single',
'-rcfile' => $mhonarc_ressources,
'-rcfile' => $mhonarc_rc,
'-definevars' => sprintf(
"listname='%s' hostname=%s yyyy='' mois='' with_tslice='' with_powered_by=''",
$listname, $domain
......
......@@ -282,7 +282,16 @@ Print this help message.
F<$SPOOLDIR/outgoing/> outgoing Sympa directory.
F<$DEFAULTDIR/mhonarc-ressources.tt2> template of MHonArc resource file.
F<$DEFAULTDIR/mhonarc_rc.tt2> template of MHonArc resource file.
=over
=item *
F<mhonarc-ressources.tt2> was replaced with F<mhonarc_rc.tt2>
on Sympa 6.2.61b.1.
=back
F<--CONFIG--> Sympa configuration file.
......
......@@ -65,7 +65,7 @@ sub _do_test {
close $fh;
$tpl = "[% TAGS $tags %]$tpl";
$tpl = [split /(?<=\n)/, $tpl];
} elsif ($tpl eq 'mhonarc-ressources.tt2') {
} elsif ($tpl eq 'mhonarc_rc.tt2') {
open my $fh, '<', $dir . '/' . $tpl;
$tpl = do { local $RS; <$fh> };
close $fh;
......
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