- From: Olivier Thereaux via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 15 Nov 2006 08:02:48 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/misc
In directory hutz:/tmp/cvs-serv30215/misc
Modified Files:
docs_errors.pl
Log Message:
Hand merge of branch 0.7 with HEAD at tag validator-0_7_4-release
Index: docs_errors.pl
===================================================================
RCS file: /sources/public/validator/misc/docs_errors.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- docs_errors.pl 18 Mar 2005 06:44:14 -0000 1.3
+++ docs_errors.pl 15 Nov 2006 08:02:46 -0000 1.4
@@ -67,8 +67,18 @@
# Read error message + explanations file
our $error_messages_file = File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'error_messages.cfg');
-our %config_errs = (-ConfigFile => $error_messages_file);
+our %config_errs = ( -MergeDuplicateBlocks => 1,
+ -ConfigFile => $error_messages_file);
our %rsrc = Config::General->new(%config_errs)->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;
Received on Wednesday, 15 November 2006 08:02:59 UTC