- From: Olivier Thereaux via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 24 Mar 2005 08:37:29 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/share/templates/en_US
In directory hutz:/tmp/cvs-serv16122/share/templates/en_US
Modified Files:
warnings.tmpl
Log Message:
Modifying warnings when a charset override has been selected for a document with no charset declared at all.
Should fix http://www.w3.org/Bugs/Public/show_bug.cgi?id=1133
Index: warnings.tmpl
===================================================================
RCS file: /sources/public/validator/share/templates/en_US/warnings.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- warnings.tmpl 1 Mar 2005 17:03:00 -0000 1.6
+++ warnings.tmpl 24 Mar 2005 08:37:27 -0000 1.7
@@ -48,15 +48,31 @@
</TMPL_IF>
<TMPL_IF NAME="W04">
<dt id="W04">No Character Encoding Found!
- Falling back to <code>UTF-8</code>.</dt>
+ <TMPL_IF NAME="W04_override">
+ Using
+ <TMPL_ELSE>
+ Falling back to
+ </TMPL_IF>
+ <code><TMPL_IF NAME="W04_charset"><TMPL_VAR NAME="W04_charset" ESCAPE="HTML"><TMPL_ELSE>UTF-8</TMPL_IF></code>.
+ </dt>
<dd>
+ <TMPL_IF NAME="W04_override">
+ <p>I was not able to extract a character encoding labeling from any of
+ the valid sources for such information. I will use the character
+ encoding <code><TMPL_IF NAME="W04_charset"><TMPL_VAR NAME="W04_charset" ESCAPE="HTML"><TMPL_ELSE>UTF-8</TMPL_IF></code>,
+ which you have chosen via the <code>Encoding</code> override option, for
+ tentative validation.
+ </p>
+ <TMPL_ELSE>
<p>
I was not able to extract a character encoding labeling from any of
the valid sources for such information. Without encoding information
it is impossible to reliably validate the document. I'm falling back
- to the "UTF-8" encoding and will attempt to perform the validation,
+ to the "<code><TMPL_IF NAME="W04_charset"><TMPL_VAR NAME="W04_charset" ESCAPE="HTML"><TMPL_ELSE>UTF-8</TMPL_IF></code>"
+ encoding and will attempt to perform the validation,
but this is likely to fail for all non-trivial documents.
</p>
+ </TMPL_IF>
<TMPL_IF NAME="opt_verbose">
<p>The sources I tried to find encoding information include:</p>
<ul>
Received on Thursday, 24 March 2005 08:37:29 UTC