Index: trunk/phase3/includes/User.php |
— | — | @@ -3682,7 +3682,7 @@ |
3683 | 3683 | } |
3684 | 3684 | |
3685 | 3685 | /** |
3686 | | - * Provide an array of HTML 5 attributes to put on an input element |
| 3686 | + * Provide an array of HTML5 attributes to put on an input element |
3687 | 3687 | * intended for the user to enter a new password. This may include |
3688 | 3688 | * required, title, and/or pattern, depending on $wgMinimalPasswordLength. |
3689 | 3689 | * |
Index: trunk/phase3/includes/HTMLForm.php |
— | — | @@ -66,7 +66,7 @@ |
67 | 67 | 'edittools' => 'HTMLEditTools', |
68 | 68 | |
69 | 69 | # HTMLTextField will output the correct type="" attribute automagically. |
70 | | - # There are about four zillion other HTML 5 input types, like url, but |
| 70 | + # There are about four zillion other HTML5 input types, like url, but |
71 | 71 | # we don't use those at the moment, so no point in adding all of them. |
72 | 72 | 'email' => 'HTMLTextField', |
73 | 73 | 'password' => 'HTMLTextField', |
Index: trunk/phase3/includes/Html.php |
— | — | @@ -20,7 +20,7 @@ |
21 | 21 | /** |
22 | 22 | * This class is a collection of static functions that serve two purposes: |
23 | 23 | * |
24 | | - * 1) Implement any algorithms specified by HTML 5, or other HTML |
| 24 | + * 1) Implement any algorithms specified by HTML5, or other HTML |
25 | 25 | * specifications, in a convenient and self-contained way. |
26 | 26 | * |
27 | 27 | * 2) Allow HTML elements to be conveniently and safely generated, like the |
— | — | @@ -40,7 +40,7 @@ |
41 | 41 | * <a> elements. |
42 | 42 | */ |
43 | 43 | class Html { |
44 | | - # List of void elements from HTML 5, section 9.1.2 as of 2009-08-10 |
| 44 | + # List of void elements from HTML5, section 9.1.2 as of 2009-08-10 |
45 | 45 | private static $voidElements = array( |
46 | 46 | 'area', |
47 | 47 | 'base', |
— | — | @@ -59,7 +59,7 @@ |
60 | 60 | ); |
61 | 61 | |
62 | 62 | # Boolean attributes, which may have the value omitted entirely. Manually |
63 | | - # collected from the HTML 5 spec as of 2009-08-10. |
| 63 | + # collected from the HTML5 spec as of 2009-08-10. |
64 | 64 | private static $boolAttribs = array( |
65 | 65 | 'async', |
66 | 66 | 'autobuffer', |
— | — | @@ -108,7 +108,7 @@ |
109 | 109 | public static function rawElement( $element, $attribs = array(), $contents = '' ) { |
110 | 110 | global $wgHtml5, $wgWellFormedXml; |
111 | 111 | $attribs = (array)$attribs; |
112 | | - # This is not required in HTML 5, but let's do it anyway, for |
| 112 | + # This is not required in HTML5, but let's do it anyway, for |
113 | 113 | # consistency and better compression. |
114 | 114 | $element = strtolower( $element ); |
115 | 115 | |
— | — | @@ -231,7 +231,7 @@ |
232 | 232 | 'link' => array( 'media' => 'all' ), |
233 | 233 | 'menu' => array( 'type' => 'list' ), |
234 | 234 | # Note: the use of text/javascript here instead of other JavaScript |
235 | | - # MIME types follows the HTML 5 spec. |
| 235 | + # MIME types follows the HTML5 spec. |
236 | 236 | 'script' => array( 'type' => 'text/javascript' ), |
237 | 237 | 'style' => array( |
238 | 238 | 'media' => 'all', |
— | — | @@ -315,11 +315,11 @@ |
316 | 316 | $key = $value; |
317 | 317 | } |
318 | 318 | |
319 | | - # Not technically required in HTML 5, but required in XHTML 1.0, |
| 319 | + # Not technically required in HTML5, but required in XHTML 1.0, |
320 | 320 | # and we'd like consistency and better compression anyway. |
321 | 321 | $key = strtolower( $key ); |
322 | 322 | |
323 | | - # See the "Attributes" section in the HTML syntax part of HTML 5, |
| 323 | + # See the "Attributes" section in the HTML syntax part of HTML5, |
324 | 324 | # 9.1.2.3 as of 2009-08-10. Most attributes can have quotation |
325 | 325 | # marks omitted, but not all. (Although a literal " is not |
326 | 326 | # permitted, we don't check for that, since it will be escaped |
— | — | @@ -339,7 +339,7 @@ |
340 | 340 | |
341 | 341 | if ( in_array( $key, self::$boolAttribs ) ) { |
342 | 342 | # In XHTML 1.0 Transitional, the value needs to be equal to the |
343 | | - # key. In HTML 5, we can leave the value empty instead. If we |
| 343 | + # key. In HTML5, we can leave the value empty instead. If we |
344 | 344 | # don't need well-formed XML, we can omit the = entirely. |
345 | 345 | if ( !$wgWellFormedXml ) { |
346 | 346 | $ret .= " $key"; |
— | — | @@ -454,7 +454,7 @@ |
455 | 455 | |
456 | 456 | /** |
457 | 457 | * Convenience function to produce an <input> element. This supports the |
458 | | - * new HTML 5 input types and attributes, and will silently strip them if |
| 458 | + * new HTML5 input types and attributes, and will silently strip them if |
459 | 459 | * $wgHtml5 is false. |
460 | 460 | * |
461 | 461 | * @param $name string name attribute |
Index: trunk/phase3/includes/DefaultSettings.php |
— | — | @@ -907,7 +907,7 @@ |
908 | 908 | $wgXhtmlDefaultNamespace = 'http://www.w3.org/1999/xhtml'; |
909 | 909 | |
910 | 910 | /** |
911 | | - * Should we output an HTML 5 doctype? This mode is still experimental, but |
| 911 | + * Should we output an HTML5 doctype? This mode is still experimental, but |
912 | 912 | * all indications are that it should be usable, so it's enabled by default. |
913 | 913 | * If all goes well, it will be removed and become always true before the 1.16 |
914 | 914 | * release. |
— | — | @@ -927,7 +927,7 @@ |
928 | 928 | $wgAllowRdfaAttributes = true; |
929 | 929 | |
930 | 930 | /** |
931 | | - * Enabled HTML 5 microdata attributes for use in wikitext, if $wgHtml5 is also true. |
| 931 | + * Enabled HTML5 microdata attributes for use in wikitext, if $wgHtml5 is also true. |
932 | 932 | */ |
933 | 933 | $wgAllowMicrodataAttributes = true; |
934 | 934 | |
— | — | @@ -939,7 +939,7 @@ |
940 | 940 | * |
941 | 941 | * Setting this to false may omit quotation marks on some attributes, omit |
942 | 942 | * slashes from some self-closing tags, omit some ending tags, etc., where |
943 | | - * permitted by HTML 5. Setting it to true will not guarantee that all pages |
| 943 | + * permitted by HTML5. Setting it to true will not guarantee that all pages |
944 | 944 | * will be well-formed, although non-well-formed pages should be rare and it's |
945 | 945 | * a bug if you find one. Conversely, setting it to false doesn't mean that |
946 | 946 | * all XML-y constructs will be omitted, just that they might be. |
Index: trunk/extensions/Configure/settings/Settings.i18n.php |
— | — | @@ -485,7 +485,7 @@ |
486 | 486 | 'configure-setting-wgXMLMimeTypes' => 'Detectable XML MIME types', |
487 | 487 | 'configure-setting-wgXMLMimeTypes-key' => 'MIME type', |
488 | 488 | 'configure-setting-wgEnableTooltipsAndAccesskeys' => 'Enable application of access keys and tooltips', |
489 | | - 'configure-setting-wgHtml5' => 'Output an HTML 5 doctype', |
| 489 | + 'configure-setting-wgHtml5' => 'Output an HTML5 doctype', |
490 | 490 | 'configure-setting-wgHtml5Version' => 'Value of the version attribute in the <code><nowiki><html></nowiki></code> tag', |
491 | 491 | 'configure-setting-wgWellFormedXml' => 'Try to make the HTML output well-formed XML', |
492 | 492 | 'configure-setting-wgDocType' => 'Document type to use in the DOCTYPE declaration', |
— | — | @@ -494,7 +494,7 @@ |
495 | 495 | 'configure-setting-wgXhtmlDefaultNamespace' => 'Default XHTML namespace', |
496 | 496 | 'configure-setting-wgXhtmlNamespaces' => 'Other XHTML namespaces', |
497 | 497 | 'configure-setting-wgXhtmlNamespaces-key' => 'Namespace', |
498 | | - 'configure-setting-wgAllowMicrodataAttributes' => 'Enable HTML 5 microdata attributes for use in wikitext', |
| 498 | + 'configure-setting-wgAllowMicrodataAttributes' => 'Enable HTML5 microdata attributes for use in wikitext', |
499 | 499 | 'configure-setting-wgAllowRdfaAttributes' => 'Enable RDFa attributes for use in wikitext', |
500 | 500 | 'configure-setting-wgUseZhdaemon' => 'Use ZhDaemon to perform Chinese text processing', |
501 | 501 | 'configure-setting-wgZhdaemonHost' => 'ZhDaemon host', |
— | — | @@ -5023,7 +5023,7 @@ |
5024 | 5024 | 'configure-setting-wgXMLMimeTypes' => 'Tableau de types MIME détectables dans XML', |
5025 | 5025 | 'configure-setting-wgXMLMimeTypes-key' => 'Type MIME', |
5026 | 5026 | 'configure-setting-wgEnableTooltipsAndAccesskeys' => "Activer l'application des touches d'accès et des info-bulles", |
5027 | | - 'configure-setting-wgHtml5' => 'Utiliser HTML 5', |
| 5027 | + 'configure-setting-wgHtml5' => 'Utiliser HTML5', |
5028 | 5028 | 'configure-setting-wgHtml5Version' => "Valeur de l'attribut « version » dans la balise <code><nowiki><html></nowiki></code>", |
5029 | 5029 | 'configure-setting-wgWellFormedXml' => "Essayer de faire en sorte que l'HTML produit soit du XML valide", |
5030 | 5030 | 'configure-setting-wgDocType' => 'Type de document à utiliser dans la déclaration DOCTYPE', |
— | — | @@ -5032,7 +5032,7 @@ |
5033 | 5033 | 'configure-setting-wgXhtmlDefaultNamespace' => 'Espace de noms XHTML par défaut', |
5034 | 5034 | 'configure-setting-wgXhtmlNamespaces' => 'Autres espaces de noms XHTML', |
5035 | 5035 | 'configure-setting-wgXhtmlNamespaces-key' => 'Espace de noms', |
5036 | | - 'configure-setting-wgAllowMicrodataAttributes' => 'Activer les attributs de microdonnées HTML 5 dans le wikitexte', |
| 5036 | + 'configure-setting-wgAllowMicrodataAttributes' => 'Activer les attributs de microdonnées HTML5 dans le wikitexte', |
5037 | 5037 | 'configure-setting-wgAllowRdfaAttributes' => 'Activer les attributs RDFa dans le wikitexte', |
5038 | 5038 | 'configure-setting-wgUseZhdaemon' => 'Utiliser ZhDaemon pour le traitement de texte en chinois', |
5039 | 5039 | 'configure-setting-wgZhdaemonHost' => 'Hôte de ZhDaemon', |
— | — | @@ -6505,7 +6505,7 @@ |
6506 | 6506 | 'configure-setting-wgMathCheckFiles' => 'יש לבדוק האם התיקייה והקובץ קיימים בעת ייצור תמונות מתמטיות', |
6507 | 6507 | 'configure-setting-wgXMLMimeTypes' => 'טיפוסי MIME XML מזוהים', |
6508 | 6508 | 'configure-setting-wgXMLMimeTypes-key' => 'סוג MIME', |
6509 | | - 'configure-setting-wgHtml5' => 'פלט במסמך מסוג HTML 5', |
| 6509 | + 'configure-setting-wgHtml5' => 'פלט במסמך מסוג HTML5', |
6510 | 6510 | 'configure-setting-wgDocType' => 'סוג המסמך לשימוש בהצהרת ה־DOCTYPE', |
6511 | 6511 | 'configure-setting-wgMimeType' => 'טיפוס ה־MIME של דפי ויקי', |
6512 | 6512 | 'configure-setting-wgXhtmlDefaultNamespace' => 'מרחב השם כברירת המחדל של XHTML', |
— | — | @@ -10636,7 +10636,7 @@ |
10637 | 10637 | 'configure-setting-wgXMLMimeTypes' => 'Array met te herkennen XML MIME-typen', |
10638 | 10638 | 'configure-setting-wgXMLMimeTypes-key' => 'MIME-type', |
10639 | 10639 | 'configure-setting-wgEnableTooltipsAndAccesskeys' => 'Het toevoegen van sneltoetsen en hulpteksten inschakelen', |
10640 | | - 'configure-setting-wgHtml5' => 'HTML 5 doctype als uitvoer geven', |
| 10640 | + 'configure-setting-wgHtml5' => 'HTML5 doctype als uitvoer geven', |
10641 | 10641 | 'configure-setting-wgHtml5Version' => 'Waarde voor het versieattribuut in de tag <code><nowiki><html></nowiki></code>', |
10642 | 10642 | 'configure-setting-wgWellFormedXml' => 'Probeer de HTML-uitvoer als correct gevormde XML te maken', |
10643 | 10643 | 'configure-setting-wgDocType' => 'Documenttype dat gebruikt wordt in de DOCTYPE-declaratie', |
— | — | @@ -10645,7 +10645,7 @@ |
10646 | 10646 | 'configure-setting-wgXhtmlDefaultNamespace' => 'Standaard XHTML-naamruimte', |
10647 | 10647 | 'configure-setting-wgXhtmlNamespaces' => 'Andere XHTML-naamruimten', |
10648 | 10648 | 'configure-setting-wgXhtmlNamespaces-key' => 'Naamruimte', |
10649 | | - 'configure-setting-wgAllowMicrodataAttributes' => 'HTML 5 microdataattributen voor gebruik in wikitekst inschakelen', |
| 10649 | + 'configure-setting-wgAllowMicrodataAttributes' => 'HTML5 microdataattributen voor gebruik in wikitekst inschakelen', |
10650 | 10650 | 'configure-setting-wgAllowRdfaAttributes' => 'RDFa-attributen voor gebruik in wikitekst inschakelen', |
10651 | 10651 | 'configure-setting-wgUseZhdaemon' => 'ZhDaemon gebruiken voor het verwerken van Chinese tekst', |
10652 | 10652 | 'configure-setting-wgZhdaemonHost' => 'Host voor ZhDaemon', |