summaryrefslogtreecommitdiffstats
path: root/share/templates
diff options
context:
space:
mode:
Diffstat (limited to 'share/templates')
-rw-r--r--share/templates/en_US/error_messages.cfg30
-rw-r--r--share/templates/en_US/soap_output.tmpl71
-rw-r--r--share/templates/en_US/table.tmpl6
-rw-r--r--share/templates/en_US/ucn_output.tmpl34
4 files changed, 113 insertions, 28 deletions
diff --git a/share/templates/en_US/error_messages.cfg b/share/templates/en_US/error_messages.cfg
index 815f2ff..1f58987 100644
--- a/share/templates/en_US/error_messages.cfg
+++ b/share/templates/en_US/error_messages.cfg
@@ -2038,3 +2038,33 @@ verbose <<.EOF.
</div>
.EOF.
</msg>
+<msg obsolete-interface>
+ original = "This interface to HTML5 document checking is obsolete. Use an interface to the W3C Nu Html Checker instead."
+ verbose <<.EOF.
+ <div class="ve obsolete-interface">
+ <p>
+ The method you used to check this document relies on an obsolete interface
+ that will become permanently unavailable in the near future.
+ The currently-supported method is to instead use the W3C Nu Html Checker at
+ <a href="https://validator.w3.org/nu/">https://validator.w3.org/nu/</a>.
+ See the documentation on the W3C Nu Html Checker's
+ <a href="https://github.com/validator/validator/wiki/Service:-Input:-GET">GET interface</a>,
+ <a href="https://github.com/validator/validator/wiki/Service:-Input:-POST-body">POST interface</a>,
+ and
+ <a href="https://github.com/validator/validator/wiki/Service:-Common-parameters">the parameters</a>
+ that both interfaces provide, such as the
+ <a href="https://github.com/validator/validator/wiki/Output%3A-JSON">out=json</a>,
+ <a href="https://github.com/validator/validator/wiki/Output:-XML">out=xml</a>,
+ and
+ <a href="https://github.com/validator/validator/wiki/Output:-GNU">out=gnu</a>
+ parameters/output-formats.
+ </p>
+ <p>
+ For comments or questions about this message, send mail to
+ <a href="mailto:www-validator@w3.org">www-validator@w3.org</a>
+ or to
+ <a href="https://twitter.com/w3c">@w3c</a> on twitter.
+ </p>
+ </div>
+ .EOF.
+</msg>
diff --git a/share/templates/en_US/soap_output.tmpl b/share/templates/en_US/soap_output.tmpl
index 7b3dec9..a87ff0a 100644
--- a/share/templates/en_US/soap_output.tmpl
+++ b/share/templates/en_US/soap_output.tmpl
@@ -16,10 +16,60 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
<m:doctype><TMPL_VAR NAME="file_doctype" ESCAPE="HTML"></m:doctype>
<m:charset><TMPL_VAR NAME="file_charset" ESCAPE="HTML"></m:charset>
<m:validity><TMPL_IF NAME="VALID">true<TMPL_ELSE>false</TMPL_IF></m:validity>
+ <m:warnings>
+ <m:warningcount><TMPL_VAR NAME="valid_warnings_num"></m:warningcount>
+ <m:warninglist>
+ <TMPL_IF NAME="is_html5"> <m:warning>
+ <m:message>This interface to HTML5 document checking is obsolete. Use an interface to <TMPL_VAR NAME="htmlchecker_url"> instead.</m:message>
+ <m:messageid>obsolete-interface</m:messageid>
+ <m:explanation> <![CDATA[<TMPL_VAR NAME="expl">
+ <div class="ve obsolete-interface">
+ <p>
+ The method you used to check this document relies on an obsolete interface
+ that will become permanently unavailable in the near future.
+ The currently-supported method is to instead use the W3C Nu Html Checker at
+ <a href="<TMPL_VAR NAME='htmlchecker_url'>"><TMPL_VAR NAME="htmlchecker_url"></a>.
+ See the documentation on the W3C Nu Html Checker's
+ <a href="https://github.com/validator/validator/wiki/Service:-Input:-GET">GET interface</a>,
+ <a href="https://github.com/validator/validator/wiki/Service:-Input:-POST-body">POST interface</a>,
+ and
+ <a href="https://github.com/validator/validator/wiki/Service:-Common-parameters">the parameters</a>
+ that both interfaces provide, such as the
+ <a href="https://github.com/validator/validator/wiki/Output%3A-JSON">out=json</a>,
+ <a href="https://github.com/validator/validator/wiki/Output:-XML">out=xml</a>,
+ and
+ <a href="https://github.com/validator/validator/wiki/Output:-GNU">out=gnu</a>
+ parameters/output-formats.
+ </p>
+ <p>
+ For comments or questions about this message, send mail to
+ <a href="mailto:www-validator@w3.org">www-validator@w3.org</a>
+ or to
+ <a href="https://twitter.com/w3c">@w3c</a> on twitter.
+ </p>
+ </div>
+ ]]>
+ </m:explanation>
+ <m:source></m:source>
+ </m:warning></TMPL_IF><TMPL_IF NAME="have_warnings"><TMPL_INCLUDE NAME="soap_warnings.tmpl"></TMPL_IF>
+ <TMPL_LOOP NAME="file_errors"><TMPL_IF NAME="err_type_warn">
+ <m:warning>
+ <m:line><TMPL_VAR NAME="line"></m:line>
+ <m:col><TMPL_VAR NAME="char" ESCAPE="HTML"></m:col>
+ <m:message><TMPL_VAR NAME="msg" ESCAPE="HTML"></m:message>
+ <m:messageid><TMPL_VAR NAME="num" ESCAPE="HTML"></m:messageid>
+ <m:explanation> <![CDATA[
+ <TMPL_VAR NAME="expl">
+ ]]>
+ </m:explanation>
+ <m:source><![CDATA[<TMPL_VAR NAME="src">]]></m:source>
+ </m:warning>
+ </TMPL_IF></TMPL_LOOP></m:warninglist>
+ </m:warnings>
<m:errors>
<m:errorcount><TMPL_VAR NAME="valid_errors_num"></m:errorcount>
<m:errorlist>
- <TMPL_LOOP NAME="file_errors"><TMPL_IF NAME="err_type_err">
+<TMPL_LOOP NAME="file_errors"><TMPL_IF NAME="err_type_err">
<m:error>
<m:line><TMPL_VAR NAME="line"></m:line>
<m:col><TMPL_VAR NAME="char" ESCAPE="HTML"></m:col>
@@ -34,25 +84,6 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
</TMPL_IF></TMPL_LOOP>
</m:errorlist>
</m:errors>
- <m:warnings>
- <m:warningcount><TMPL_VAR NAME="valid_warnings_num"></m:warningcount>
- <m:warninglist>
- <TMPL_IF NAME="have_warnings"><TMPL_INCLUDE NAME="soap_warnings.tmpl"></TMPL_IF>
- <TMPL_LOOP NAME="file_errors"><TMPL_IF NAME="err_type_warn">
- <m:warning>
- <m:line><TMPL_VAR NAME="line"></m:line>
- <m:col><TMPL_VAR NAME="char" ESCAPE="HTML"></m:col>
- <m:message><TMPL_VAR NAME="msg" ESCAPE="HTML"></m:message>
- <m:messageid><TMPL_VAR NAME="num" ESCAPE="HTML"></m:messageid>
- <m:explanation> <![CDATA[
- <TMPL_VAR NAME="expl">
- ]]>
- </m:explanation>
- <m:source><![CDATA[<TMPL_VAR NAME="src">]]></m:source>
- </m:warning>
- </TMPL_IF></TMPL_LOOP>
- </m:warninglist>
- </m:warnings>
</m:markupvalidationresponse>
</env:Body>
</env:Envelope>
diff --git a/share/templates/en_US/table.tmpl b/share/templates/en_US/table.tmpl
index 05b3d21..1825be0 100644
--- a/share/templates/en_US/table.tmpl
+++ b/share/templates/en_US/table.tmpl
@@ -1,9 +1,3 @@
-<TMPL_IF NAME="is_html5">
- <p class="html5_warning">Consider using the
- <a href="http://validator.w3.org/nu/">W3C&#160;Nu&#160;Html&#160;Checker</a>
- to validate HTML5 documents.</p>
-</TMPL_IF>
-
<TMPL_IF NAME="VALID">
<TMPL_IF NAME="is_tentative">
<h2 class="tentative_valid">This document was <em>Tentatively</em> checked as
diff --git a/share/templates/en_US/ucn_output.tmpl b/share/templates/en_US/ucn_output.tmpl
index 9e9265a..b1f2a52 100644
--- a/share/templates/en_US/ucn_output.tmpl
+++ b/share/templates/en_US/ucn_output.tmpl
@@ -8,7 +8,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
<?xml version="1.0" encoding="UTF-8"?>
<observationresponse xmlns="http://www.w3.org/2009/10/unicorn/observationresponse" ref="<TMPL_VAR NAME="file_uri" ESCAPE="HTML">" xml:lang="en">
-<TMPL_IF NAME="VALID">
+<TMPL_IF NAME="is_html5"><TMPL_ELSE><TMPL_IF NAME="VALID">
<status value="passed"/>
<message type="info" id="valid">
@@ -102,7 +102,37 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF>
</TMPL_UNLESS>
</description>
</message>
-</TMPL_IF>
+</TMPL_IF></TMPL_IF>
+
+<TMPL_IF NAME="is_html5"><message type="warning" id="obsolete-interface">
+ <context/>
+ <title>This interface to HTML5 document checking is obsolete. Use an interface to <TMPL_VAR NAME="htmlchecker_url"> instead.</title>
+ <description>
+ <p>
+ The method you used to check this document relies on an obsolete interface
+ that will become permanently unavailable in the near future.
+ The currently-supported method is to instead use the W3C Nu Html Checker at
+ <a href="<TMPL_VAR NAME='htmlchecker_url'>"><TMPL_VAR NAME="htmlchecker_url"></a>.
+ See the documentation on the W3C Nu Html Checker's
+ <a href="https://github.com/validator/validator/wiki/Service:-Input:-GET">GET interface</a>,
+ <a href="https://github.com/validator/validator/wiki/Service:-Input:-POST-body">POST interface</a>,
+ and
+ <a href="https://github.com/validator/validator/wiki/Service:-Common-parameters">the parameters</a>
+ that both interfaces provide, such as the
+ <a href="https://github.com/validator/validator/wiki/Output%3A-JSON">out=json</a>,
+ <a href="https://github.com/validator/validator/wiki/Output:-XML">out=xml</a>,
+ and
+ <a href="https://github.com/validator/validator/wiki/Output:-GNU">out=gnu</a>
+ parameters/output-formats.
+ </p>
+ <p>
+ For comments or questions about this message, send mail to
+ <a href="mailto:www-validator@w3.org">www-validator@w3.org</a>
+ or to
+ <a href="https://twitter.com/w3c">@w3c</a> on twitter.
+ </p>
+ </description>
+</message></TMPL_IF>
<TMPL_IF NAME="have_warnings">
<TMPL_INCLUDE NAME="ucn_warnings.tmpl">
generated by cgit v1.1 at 2025-05-17 04:43:14 +0000