Update of /
In directory
Modified Files:
check sendfeedback.pl
Log Message:
Config::General docs/workarounds from 0_7 branch.
Index: sendfeedback.pl
RCS file: /,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
sendfeedback.pl25 Feb 2005 00:18:51 -00001.4
sendfeedback.pl15 Aug 2006 21:49:29 -00001.5
@@ -70,12 +70,22 @@
our $lang = 'en_US'; # @@@ TD: conneg
# Read error message + explanations file
-our $error_messages_list = File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'error_messages.cfg');
-our %config_opts = (-ConfigFile =$error_messages_list);
-our %rsrc = Config::General->new(%config_opts)->getall();
+our %rsrc = Config::General->new(
+ -MergeDuplicateBlocks =1,
+ -ConfigFile =File::Spec->catfile($CFG->{Paths}->{Templates},
+ $lang, 'error_messages.cfg'),
+ )->getall();
+# Config::General workarounds for <msg 0issues:
+#
+#
+#
+$rsrc{msg}{0} ||=
+ delete($rsrc{'msg 0'}) || # < 2.31
+ { original =delete($rsrc{msg}{original}), # 2.31
+ verbose =delete($rsrc{msg}{verbose}),
+ };
$RSRC = \%rsrc;
-
our $T = HTML::Template->new(
filename =File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'feedback.tmpl'),
die_on_bad_params =FALSE,
Index: check
RCS file: /,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -d -r1.460 -r1.461
check5 Aug 2006 09:42:21 -00001.460
check15 Aug 2006 21:49:29 -00001.461
@@ -195,6 +195,9 @@
)->getall();
# 'en_US' should be replaced by $lang for lang-neg
# Config::General workarounds for <msg 0issues:
+#
+#
+#
$rsrc{msg}{0} ||=
delete($rsrc{'msg 0'}) || # < 2.31
{ original =delete($rsrc{msg}{original}), # 2.31