From 26028647120c5844cdd459e09aa63581fbd07555 Mon Sep 17 00:00:00 2001 From: Fomafix Date: Tue, 3 Feb 2015 13:51:32 +0000 Subject: [PATCH] Tablesorter: Replace wgContentLanguage by wgPageContentLanguage wgContentLanguage contains the language code of whole project. wgPageContentLanguage contains the language code of the content of the page. For example https://translatewiki.net/wiki/Project:About/de?uselang=eo has * wgContentLanguage en * wgPageContentLanguage de * wgUserLanguage eo The tablesorter works on the content of the page. Change-Id: I3e51d96c838a3a4f4562c1f27c360d515e4d8ca6 --- resources/src/jquery/jquery.tablesorter.js | 4 ++-- .../resources/jquery/jquery.tablesorter.parsers.test.js | 4 ++-- .../qunit/suites/resources/jquery/jquery.tablesorter.test.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery/jquery.tablesorter.js index 94fdca594f..3278ad5352 100644 --- a/resources/src/jquery/jquery.tablesorter.js +++ b/resources/src/jquery/jquery.tablesorter.js @@ -8,7 +8,7 @@ * http://www.opensource.org/licenses/mit-license.php * http://www.gnu.org/licenses/gpl.html * - * Depends on mw.config (wgDigitTransformTable, wgDefaultDateFormat, wgContentLanguage) + * Depends on mw.config (wgDigitTransformTable, wgDefaultDateFormat, wgPageContentLanguage) * and mw.language.months. * * Uses 'tableSorterCollation' in mw.config (if available) @@ -1110,7 +1110,7 @@ s = $.trim( s.toLowerCase() ); if ( ( match = s.match( ts.dateRegex[0] ) ) !== null ) { - if ( mw.config.get( 'wgDefaultDateFormat' ) === 'mdy' || mw.config.get( 'wgContentLanguage' ) === 'en' ) { + if ( mw.config.get( 'wgDefaultDateFormat' ) === 'mdy' || mw.config.get( 'wgPageContentLanguage' ) === 'en' ) { s = [ match[3], match[1], match[2] ]; } else if ( mw.config.get( 'wgDefaultDateFormat' ) === 'dmy' ) { s = [ match[3], match[2], match[1] ]; diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js index 97a3ae123b..00d4a08ed0 100644 --- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js @@ -32,7 +32,7 @@ mw.language.months = this.liveMonths; }, config: { - wgContentLanguage: 'en', + wgPageContentLanguage: 'en', /* default date format of the content language */ wgDefaultDateFormat: 'dmy', /* These two are important for numeric interpretations */ @@ -117,7 +117,7 @@ parserTest( 'MDY Dates using dmy content language', 'date', simpleMDYDatesInDMY, function () { mw.config.set( { 'wgDefaultDateFormat': 'dmy', - 'wgContentLanguage': 'de' + 'wgPageContentLanguage': 'de' } ); } ); diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js index f63aa27ae5..acd98a66b4 100644 --- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js @@ -182,7 +182,7 @@ wgDefaultDateFormat: 'dmy', wgSeparatorTransformTable: ['', ''], wgDigitTransformTable: ['', ''], - wgContentLanguage: 'en' + wgPageContentLanguage: 'en' } } ) ); @@ -592,7 +592,7 @@ ], function ( $table ) { mw.config.set( 'wgDefaultDateFormat', 'dmy' ); - mw.config.set( 'wgContentLanguage', 'de' ); + mw.config.set( 'wgPageContentLanguage', 'de' ); $table.tablesorter(); $table.find( '.headerSort:eq(0)' ).click(); -- 2.20.1