Merge "search: Use self::class instead of __CLASS__ in SearchResultSet"

diff --git a/docs/export-demo.xml b/docs/export-demo.xml
index 93b237f..2e2e459 100644 (file)
--- a/docs/export-demo.xml
+++ b/docs/export-demo.xml
@@ -27,7 +27,7 @@
       <namespace key="2" case="first-letter">User</namespace>
       <namespace key="3" case="first-letter">User talk</namespace>
       <namespace key="4" case="first-letter">DemoWiki</namespace>
-      <namespace key="5" case="first-letter">DemoWIki talk</namespace>
+      <namespace key="5" case="first-letter">DemoWiki talk</namespace>
       <namespace key="6" case="first-letter">File</namespace>
       <namespace key="7" case="first-letter">File talk</namespace>
       <namespace key="8" case="first-letter">MediaWiki</namespace>

diff --git a/includes/htmlform/fields/HTMLButtonField.php b/includes/htmlform/fields/HTMLButtonField.php
index 7f7f718..84719a7 100644 (file)
--- a/includes/htmlform/fields/HTMLButtonField.php
+++ b/includes/htmlform/fields/HTMLButtonField.php
@@ -34,6 +34,11 @@ class HTMLButtonField extends HTMLFormField {
 
        public function __construct( $info ) {
                $info['nodata'] = true;
+
+               $this->setShowEmptyLabel( false );
+
+               parent::__construct( $info );
+
                if ( isset( $info['flags'] ) ) {
                        $this->mFlags = $info['flags'];
                }
@@ -55,10 +60,6 @@ class HTMLButtonField extends HTMLFormField {
                } elseif ( isset( $info['buttonlabel-raw'] ) ) {
                        $this->buttonLabel = $info['buttonlabel-raw'];
                }
-
-               $this->setShowEmptyLabel( false );
-
-               parent::__construct( $info );
        }
 
        public function getInputHTML( $value ) {

diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index 17b3201..7491f86 100644 (file)
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -634,7 +634,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
                if ( $title->getNamespace() == NS_USER && !$title->isSubpage() ) {
                        $tools['contributions'] = $linkRenderer->makeKnownLink(
                                SpecialPage::getTitleFor( 'Contributions', $title->getText() ),
-                               $this->msg( 'contributions' )->text()
+                               $this->msg( 'contribslink' )->text()
                        );
                }
 

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index 5a6bbc4..3ef64f8 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -79,7 +79,7 @@ class SpecialImport extends SpecialPage {
                }
 
                # @todo Allow Title::getUserPermissionsErrors() to take an array
-               # @todo FIXME: Title::checkSpecialsAndNSPermissions() has a very wierd expectation of what
+               # @todo FIXME: Title::checkSpecialsAndNSPermissions() has a very weird expectation of what
                # getUserPermissionsErrors() might actually be used for, hence the 'ns-specialprotected'
                $errors = wfMergeErrorArrays(
                        $this->getPageTitle()->getUserPermissionsErrors(

diff --git a/includes/utils/AutoloadGenerator.php b/includes/utils/AutoloadGenerator.php
index b437653..511b673 100644 (file)
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -258,7 +258,7 @@ EOD;
         * @return string
         */
        public function getAutoload( $commandName = 'AutoloadGenerator' ) {
-               // We need to check whether an extenson.json or skin.json exists or not, and
+               // We need to check whether an extension.json or skin.json exists or not, and
                // incase it doesn't, update the autoload.php file.
 
                $fileinfo = $this->getTargetFileinfo();

diff --git a/languages/messages/MessagesSkr_arab.php b/languages/messages/MessagesSkr_arab.php
index 901e2aa..27276aa 100644 (file)
--- a/languages/messages/MessagesSkr_arab.php
+++ b/languages/messages/MessagesSkr_arab.php
@@ -11,3 +11,17 @@
 $fallback = 'ur, pnb';
 
 $rtl = true;
+
+$digitTransformTable = [
+       '0' => '۰', # ۰
+       '1' => '۱', # ۱
+       '2' => '۲', # ۲
+       '3' => '۳', # ۳
+       '4' => '۴', # ۴
+       '5' => '۵', # ۵
+       '6' => '۶', # ۶
+       '7' => '۷', # ۷
+       '8' => '۸', # ۸
+       '9' => '۹', # ۹
+       '%' => '٪', # ٪
+];

diff --git a/languages/messages/MessagesTg_cyrl.php b/languages/messages/MessagesTg_cyrl.php
index bd107f5..59706d5 100644 (file)
--- a/languages/messages/MessagesTg_cyrl.php
+++ b/languages/messages/MessagesTg_cyrl.php
@@ -55,11 +55,11 @@ $datePreferenceMigrationMap = [
 $dateFormats = [
        'dmy time' => 'H:i',
        'dmy date' => 'j xg Y',
-       'dmy both' => 'H:i، j xg Y',
+       'dmy both' => 'H:i, j xg Y',
 
        'persian time' => 'H:i',
        'persian date' => 'xij xiF xiY',
-       'persian both' => 'H:i، xij xiF xiY',
+       'persian both' => 'H:i, xij xiF xiY',
 
        'ISO 8601 time' => 'xnH:xni:xns',
        'ISO 8601 date' => 'xnY-xnm-xnd',

diff --git a/resources/lib/jquery.client/jquery.client.js b/resources/lib/jquery.client/jquery.client.js
index 8257d85..bcd9c5c 100644 (file)
--- a/resources/lib/jquery.client/jquery.client.js
+++ b/resources/lib/jquery.client/jquery.client.js
@@ -93,7 +93,7 @@
                                        'camino', 'chrome', 'firefox', 'iceweasel', 'netscape', 'konqueror', 'lynx', 'msie', 'opera',
                                        'safari', 'ipod', 'iphone', 'blackberry', 'ps3', 'rekonq', 'android'
                                ],
-                               // Tanslations for conforming browser names
+                               // Translations for conforming browser names
                                nameTranslations = [],
                                // Names of known layout engines
                                layouts = ['gecko', 'konqueror', 'msie', 'trident', 'edge', 'opera', 'webkit'],