Gerrit Patch Uploader has uploaded a new change for review. https://gerrit.wikimedia.org/r/188362
Change subject: Tablesorter: Replace wgContentLanguage by wgPageContentLanguage ...................................................................... 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 --- M resources/src/jquery/jquery.tablesorter.js M tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/62/188362/1 diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery/jquery.tablesorter.js index 8e1c3f0..5875f93 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) @@ -1102,7 +1102,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.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js index 5464d22..ea2f64b 100644 --- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js @@ -162,7 +162,7 @@ wgDefaultDateFormat: 'dmy', wgSeparatorTransformTable: ['', ''], wgDigitTransformTable: ['', ''], - wgContentLanguage: 'en' + wgPageContentLanguage: 'en' } } ) ); @@ -572,7 +572,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(); -- To view, visit https://gerrit.wikimedia.org/r/188362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e51d96c838a3a4f4562c1f27c360d515e4d8ca6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
