jenkins-bot has submitted this change and it was merged.
Change subject: jquery.tablesorter: Support genitive month names
......................................................................
jquery.tablesorter: Support genitive month names
Also use months names from mediawiki.language.months instead of from
wgMonthNames and wgMonthNamesShort. Genitive months names are not
available in that way.
Bug: 46496
Change-Id: If758499fb2d2c2dd02013beaa9cee7b7b8827132
---
M resources/Resources.php
M resources/jquery/jquery.tablesorter.js
2 files changed, 15 insertions(+), 8 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/Resources.php b/resources/Resources.php
index b760b68..4c428f3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -261,7 +261,10 @@
'scripts' => 'resources/jquery/jquery.tablesorter.js',
'styles' => 'resources/jquery/jquery.tablesorter.css',
'messages' => array( 'sort-descending', 'sort-ascending' ),
- 'dependencies' => 'jquery.mwExtension',
+ 'dependencies' => array(
+ 'jquery.mwExtension',
+ 'mediawiki.language.months',
+ ),
),
'jquery.textSelection' => array(
'scripts' => 'resources/jquery/jquery.textSelection.js',
diff --git a/resources/jquery/jquery.tablesorter.js
b/resources/jquery/jquery.tablesorter.js
index b71ef83..bdc6675 100644
--- a/resources/jquery/jquery.tablesorter.js
+++ b/resources/jquery/jquery.tablesorter.js
@@ -8,8 +8,9 @@
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html
*
- * Depends on mw.config (wgDigitTransformTable, wgMonthNames,
wgMonthNamesShort,
- * wgDefaultDateFormat, wgContentLanguage)
+ * Depends on mw.config (wgDigitTransformTable, wgDefaultDateFormat,
wgContentLanguage)
+ * and mw.language.months.
+ *
* Uses 'tableSorterCollation' in mw.config (if available)
*/
/**
@@ -476,12 +477,15 @@
var regex = [];
ts.monthNames = {};
- for ( var i = 1; i < 13; i++ ) {
- var name = mw.config.get( 'wgMonthNames'
)[i].toLowerCase();
- ts.monthNames[name] = i;
+ for ( var i = 0; i < 12; i++ ) {
+ var name = mw.language.months.names[i].toLowerCase();
+ ts.monthNames[name] = i + 1;
regex.push( $.escapeRE( name ) );
- name = mw.config.get( 'wgMonthNamesShort'
)[i].toLowerCase().replace( '.', '' );
- ts.monthNames[name] = i;
+ name =
mw.language.months.genitive[i].toLowerCase().replace( '.', '' );
+ ts.monthNames[name] = i + 1;
+ regex.push( $.escapeRE( name ) );
+ name = mw.language.months.abbrev[i].toLowerCase();
+ ts.monthNames[name] = i + 1;
regex.push( $.escapeRE( name ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/55496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If758499fb2d2c2dd02013beaa9cee7b7b8827132
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: TheDJ <[email protected]>
Gerrit-Reviewer: Wizardist <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
