From 18ed54d077ba7638811361fbbc2958ebd0dd7b3d Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Wed, 30 Dec 2009 07:08:52 +0000 Subject: [PATCH] Tweak 'HMTL 5' -> 'HTML5' per suggestion on translatewiki: http://translatewiki.net/wiki/Thread:Support/HTML5 See http://en.wikipedia.org/wiki/HTML5 too. --- includes/DefaultSettings.php | 6 +++--- includes/HTMLForm.php | 2 +- includes/Html.php | 18 +++++++++--------- includes/User.php | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 3735f3c12c..2e239d3592 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -907,7 +907,7 @@ $wgDTD = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'; $wgXhtmlDefaultNamespace = 'http://www.w3.org/1999/xhtml'; /** - * Should we output an HTML 5 doctype? This mode is still experimental, but + * Should we output an HTML5 doctype? This mode is still experimental, but * all indications are that it should be usable, so it's enabled by default. * If all goes well, it will be removed and become always true before the 1.16 * release. @@ -927,7 +927,7 @@ $wgHtml5Version = null; $wgAllowRdfaAttributes = true; /** - * Enabled HTML 5 microdata attributes for use in wikitext, if $wgHtml5 is also true. + * Enabled HTML5 microdata attributes for use in wikitext, if $wgHtml5 is also true. */ $wgAllowMicrodataAttributes = true; @@ -939,7 +939,7 @@ $wgAllowMicrodataAttributes = true; * * Setting this to false may omit quotation marks on some attributes, omit * slashes from some self-closing tags, omit some ending tags, etc., where - * permitted by HTML 5. Setting it to true will not guarantee that all pages + * permitted by HTML5. Setting it to true will not guarantee that all pages * will be well-formed, although non-well-formed pages should be rare and it's * a bug if you find one. Conversely, setting it to false doesn't mean that * all XML-y constructs will be omitted, just that they might be. diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php index 10ac65d68b..a6c7946356 100644 --- a/includes/HTMLForm.php +++ b/includes/HTMLForm.php @@ -66,7 +66,7 @@ class HTMLForm { 'edittools' => 'HTMLEditTools', # HTMLTextField will output the correct type="" attribute automagically. - # There are about four zillion other HTML 5 input types, like url, but + # There are about four zillion other HTML5 input types, like url, but # we don't use those at the moment, so no point in adding all of them. 'email' => 'HTMLTextField', 'password' => 'HTMLTextField', diff --git a/includes/Html.php b/includes/Html.php index c7476f2252..667e58b675 100644 --- a/includes/Html.php +++ b/includes/Html.php @@ -20,7 +20,7 @@ /** * This class is a collection of static functions that serve two purposes: * - * 1) Implement any algorithms specified by HTML 5, or other HTML + * 1) Implement any algorithms specified by HTML5, or other HTML * specifications, in a convenient and self-contained way. * * 2) Allow HTML elements to be conveniently and safely generated, like the @@ -40,7 +40,7 @@ * elements. */ class Html { - # List of void elements from HTML 5, section 9.1.2 as of 2009-08-10 + # List of void elements from HTML5, section 9.1.2 as of 2009-08-10 private static $voidElements = array( 'area', 'base', @@ -59,7 +59,7 @@ class Html { ); # Boolean attributes, which may have the value omitted entirely. Manually - # collected from the HTML 5 spec as of 2009-08-10. + # collected from the HTML5 spec as of 2009-08-10. private static $boolAttribs = array( 'async', 'autobuffer', @@ -108,7 +108,7 @@ class Html { public static function rawElement( $element, $attribs = array(), $contents = '' ) { global $wgHtml5, $wgWellFormedXml; $attribs = (array)$attribs; - # This is not required in HTML 5, but let's do it anyway, for + # This is not required in HTML5, but let's do it anyway, for # consistency and better compression. $element = strtolower( $element ); @@ -231,7 +231,7 @@ class Html { 'link' => array( 'media' => 'all' ), 'menu' => array( 'type' => 'list' ), # Note: the use of text/javascript here instead of other JavaScript - # MIME types follows the HTML 5 spec. + # MIME types follows the HTML5 spec. 'script' => array( 'type' => 'text/javascript' ), 'style' => array( 'media' => 'all', @@ -315,11 +315,11 @@ class Html { $key = $value; } - # Not technically required in HTML 5, but required in XHTML 1.0, + # Not technically required in HTML5, but required in XHTML 1.0, # and we'd like consistency and better compression anyway. $key = strtolower( $key ); - # See the "Attributes" section in the HTML syntax part of HTML 5, + # See the "Attributes" section in the HTML syntax part of HTML5, # 9.1.2.3 as of 2009-08-10. Most attributes can have quotation # marks omitted, but not all. (Although a literal " is not # permitted, we don't check for that, since it will be escaped @@ -339,7 +339,7 @@ class Html { if ( in_array( $key, self::$boolAttribs ) ) { # In XHTML 1.0 Transitional, the value needs to be equal to the - # key. In HTML 5, we can leave the value empty instead. If we + # key. In HTML5, we can leave the value empty instead. If we # don't need well-formed XML, we can omit the = entirely. if ( !$wgWellFormedXml ) { $ret .= " $key"; @@ -454,7 +454,7 @@ class Html { /** * Convenience function to produce an element. This supports the - * new HTML 5 input types and attributes, and will silently strip them if + * new HTML5 input types and attributes, and will silently strip them if * $wgHtml5 is false. * * @param $name string name attribute diff --git a/includes/User.php b/includes/User.php index f9ab4f098d..20c0365f8b 100644 --- a/includes/User.php +++ b/includes/User.php @@ -3682,7 +3682,7 @@ class User { } /** - * Provide an array of HTML 5 attributes to put on an input element + * Provide an array of HTML5 attributes to put on an input element * intended for the user to enter a new password. This may include * required, title, and/or pattern, depending on $wgMinimalPasswordLength. * -- 2.20.1