- From: Ville Skytta via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 15 Aug 2006 21:49:32 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv10817/httpd/cgi-bin
Modified Files:
check sendfeedback.pl
Log Message:
Config::General docs/workarounds from 0_7 branch.
Index: sendfeedback.pl
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/sendfeedback.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sendfeedback.pl 25 Feb 2005 00:18:51 -0000 1.4
+++ sendfeedback.pl 15 Aug 2006 21:49:29 -0000 1.5
@@ -70,12 +70,22 @@
our $lang = 'en_US'; # @@@ TODO: 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 0> issues:
+# http://lists.w3.org/Archives/Public/public-qa-dev/2006Feb/0022.html
+# http://lists.w3.org/Archives/Public/public-qa-dev/2006Feb/0025.html
+# https://rt.cpan.org/Public/Bug/Display.html?id=17852
+$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: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -d -r1.460 -r1.461
--- check 5 Aug 2006 09:42:21 -0000 1.460
+++ check 15 Aug 2006 21:49:29 -0000 1.461
@@ -195,6 +195,9 @@
)->getall();
# 'en_US' should be replaced by $lang for lang-neg
# Config::General workarounds for <msg 0> issues:
+# http://lists.w3.org/Archives/Public/public-qa-dev/2006Feb/0022.html
+# http://lists.w3.org/Archives/Public/public-qa-dev/2006Feb/0025.html
+# https://rt.cpan.org/Public/Bug/Display.html?id=17852
$rsrc{msg}{0} ||=
delete($rsrc{'msg 0'}) || # < 2.31
{ original => delete($rsrc{msg}{original}), # 2.31
Received on Tuesday, 15 August 2006 21:49:39 UTC