Merge "Localisation updates from https://translatewiki.net."

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index de34ffc..3693898 100644 (file)
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -23,6 +23,7 @@ production.
 * Update es5-shim from v4.0.0 to v4.1.5.
 * Update json2 from revision 2014-02-04 to 2015-05-03.
 * Update Sinon.JS from 1.10.3 to 1.15.0.
+* Upgrade jQuery Client from v1.0.0 to v2.0.0.
 * Added mediawiki/at-ease 1.0.0
 
 === Bug fixes in 1.26 ===

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 64a6f72..8259718 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1529,7 +1529,6 @@ class LoginForm extends SpecialPage {
         */
        public static function getCreateaccountToken() {
                global $wgRequest;
-
                return $wgRequest->getSessionData( 'wsCreateaccountToken' );
        }
 
@@ -1604,22 +1603,21 @@ class LoginForm extends SpecialPage {
         */
        function makeLanguageSelector() {
                $msg = $this->msg( 'loginlanguagelinks' )->inContentLanguage();
-               if ( !$msg->isBlank() ) {
-                       $langs = explode( "\n", $msg->text() );
-                       $links = array();
-                       foreach ( $langs as $lang ) {
-                               $lang = trim( $lang, '* ' );
-                               $parts = explode( '|', $lang );
-                               if ( count( $parts ) >= 2 ) {
-                                       $links[] = $this->makeLanguageSelectorLink( $parts[0], trim( $parts[1] ) );
-                               }
-                       }
-
-                       return count( $links ) > 0 ? $this->msg( 'loginlanguagelabel' )->rawParams(
-                               $this->getLanguage()->pipeList( $links ) )->escaped() : '';
-               } else {
+               if ( $msg->isBlank() ) {
                        return '';
                }
+               $langs = explode( "\n", $msg->text() );
+               $links = array();
+               foreach ( $langs as $lang ) {
+                       $lang = trim( $lang, '* ' );
+                       $parts = explode( '|', $lang );
+                       if ( count( $parts ) >= 2 ) {
+                               $links[] = $this->makeLanguageSelectorLink( $parts[0], trim( $parts[1] ) );
+                       }
+               }
+
+               return count( $links ) > 0 ? $this->msg( 'loginlanguagelabel' )->rawParams(
+                       $this->getLanguage()->pipeList( $links ) )->escaped() : '';
        }
 
        /**

diff --git a/languages/Names.php b/languages/Names.php
index d667b18..a2a0ee6 100644 (file)
--- a/languages/Names.php
+++ b/languages/Names.php
@@ -158,7 +158,9 @@
        'gl' => 'galego',               # Galician
        'glk' => 'گیلکی',  # Gilaki
        'gn' => 'Avañe\'ẽ',  # Guaraní, Paraguayan
-       'gom-latn' => 'Konknni',        # Goan Konkani (Latin script)
+       'gom' => 'गोवा कोंकणी / Gova Konknni',      # Goan Konkani
+       'gom-deva' => 'गोवा कोंकणी',        # Goan Konkani (Devanagari script)
+       'gom-latn' => 'Gova Konknni',   # Goan Konkani (Latin script)
        'got' => '𐌲𐌿𐍄𐌹𐍃𐌺',    # Gothic
        'grc' => 'Ἀρχαία ἑλληνικὴ', # Ancient Greek
        'gsw' => 'Alemannisch', # Alemannic

diff --git a/languages/messages/MessagesGom.php b/languages/messages/MessagesGom.php
new file mode 100644 (file)
index 0000000..d684ed5
--- /dev/null
+++ b/languages/messages/MessagesGom.php
@@ -0,0 +1,11 @@
+<?php
+/** Goan Konkani (गोवा कोंकणी / Gova Konknni)
+ *
+ * To improve a translation please visit https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$fallback = 'gom-deva';
\ No newline at end of file

diff --git a/languages/messages/MessagesGom_deva.php b/languages/messages/MessagesGom_deva.php
new file mode 100644 (file)
index 0000000..58fc505
--- /dev/null
+++ b/languages/messages/MessagesGom_deva.php
@@ -0,0 +1,31 @@
+<?php
+/** Goan Konkani - Devanagari script (गोवा कोंकणी)
+ *
+ * To improve a translation please visit https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ * @author Darshan kandolkar
+ */
+
+$fallback = 'hi';
+
+$namespaceNames = array(
+       NS_MEDIA            => 'मिडिया',
+       NS_SPECIAL          => 'विशेश',
+       NS_TALK             => 'चर्चा',
+       NS_USER             => 'उपेगकर्तो',
+       NS_USER_TALK        => 'उपेगकर्तो_चर्चा',
+       NS_PROJECT_TALK     => '$1_चर्चा',
+       NS_FILE             => 'फायल',
+       NS_FILE_TALK        => 'फायल_चर्चा',
+       NS_MEDIAWIKI        => 'मिडियाविकी',
+       NS_MEDIAWIKI_TALK   => 'मिडियाविकी_चर्चा',
+       NS_TEMPLATE         => 'प्रारूप',
+       NS_TEMPLATE_TALK    => 'प्रारूप_चर्चा',
+       NS_HELP             => 'मजत',
+       NS_HELP_TALK        => 'मजत_चर्चा',
+       NS_CATEGORY         => 'श्रेणी',
+       NS_CATEGORY_TALK    => 'श्रेणी_चर्चा',
+);
\ No newline at end of file

diff --git a/resources/lib/jquery.client/jquery.client.js b/resources/lib/jquery.client/jquery.client.js
index 1560c7d..8257d85 100644 (file)
--- a/resources/lib/jquery.client/jquery.client.js
+++ b/resources/lib/jquery.client/jquery.client.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery Client v1.0.0
+ * jQuery Client v2.0.0
  * https://www.mediawiki.org/wiki/JQuery_Client
  *
  * Copyright 2010-2015 jquery-client maintainers and other contributors.
@@ -182,9 +182,12 @@
                                        version = match[1];
                                }
                        }
-                       // And IE 12's different lies about not being IE
+                       // And MS Edge's lies about being Chrome
+                       //
+                       // It's different enough from classic IE Trident engine that they do this
+                       // to avoid getting caught by MSIE-specific browser sniffing.
                        if ( name === 'chrome' && ( match = ua.match( /\bedge\/([0-9\.]*)/ ) ) ) {
-                               name = 'msie';
+                               name = 'edge';
                                version = match[1];
                                layout = 'edge';
                                layoutversion = parseInt( match[1], 10 );