diff options
| -rwxr-xr-x | httpd/cgi-bin/check | 7 | ||||
| -rwxr-xr-x | httpd/cgi-bin/sendfeedback.pl | 20 |
2 files changed, 20 insertions, 7 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check index 659f35b..da4199b 100755 --- a/httpd/cgi-bin/check +++ b/httpd/cgi-bin/check @@ -14,7 +14,7 @@ # This source code is available under the license at: # http://www.w3.org/Consortium/Legal/copyright-software # -# $Id: check,v 1.460 2006-08-05 09:42:21 ville Exp $ +# $Id: check,v 1.461 2006-08-15 21:49:29 ville Exp $ # # Disable buffering on STDOUT! @@ -180,7 +180,7 @@ Directory not readable (permission denied): @_r # # Strings - $VERSION = q$Revision: 1.460 $; + $VERSION = q$Revision: 1.461 $; $VERSION =~ s/Revision: ([\d\.]+) /$1/; # @@ -195,6 +195,9 @@ my %rsrc = Config::General->new( )->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 diff --git a/httpd/cgi-bin/sendfeedback.pl b/httpd/cgi-bin/sendfeedback.pl index b1ecc36..b321b7d 100755 --- a/httpd/cgi-bin/sendfeedback.pl +++ b/httpd/cgi-bin/sendfeedback.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -T ## ## feedback generator for W3C Markup Validation Service -# # $Id: sendfeedback.pl,v 1.4 2005-02-25 00:18:51 ot Exp $ +# # $Id: sendfeedback.pl,v 1.5 2006-08-15 21:49:29 ville Exp $ ## Pragmas. use strict; @@ -70,12 +70,22 @@ our $q = new CGI; 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, |