Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/157301
Change subject: Provide a Language::listToText reimplementation in the
MediaWiki JS
......................................................................
Provide a Language::listToText reimplementation in the MediaWiki JS
For I35e55658 in VE
Change-Id: I5d894f8a1cba65a3d90dfbf3e43be4e515a327d1
---
M resources/Resources.php
M resources/src/mediawiki.language/mediawiki.language.js
2 files changed, 23 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/01/157301/1
diff --git a/resources/Resources.php b/resources/Resources.php
index 4a9827a..cbb8301 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1106,6 +1106,11 @@
'mediawiki.cldr',
),
'targets' => array( 'desktop', 'mobile' ),
+ 'messages' => array(
+ 'and',
+ 'comma-separator',
+ 'word-separator'
+ ),
),
'mediawiki.cldr' => array(
diff --git a/resources/src/mediawiki.language/mediawiki.language.js
b/resources/src/mediawiki.language/mediawiki.language.js
index a0b5569..be8cb11 100644
--- a/resources/src/mediawiki.language/mediawiki.language.js
+++ b/resources/src/mediawiki.language/mediawiki.language.js
@@ -144,8 +144,25 @@
return grammarForms[form][word] || word;
}
return word;
- }
+ },
+ /**
+ * See Language::listToText in the PHP.
+ * @param {string[]} list
+ * @return {string}
+ */
+ listToText: function ( list ) {
+ var text = '', i;
+ for ( i = 0; i < list.length; i++ ) {
+ text += list[i];
+ if ( list.length - 2 === i ) {
+ text += mw.msg( 'and' ) + mw.msg(
'word-separator' );
+ } else if ( list.length - 1 !== i ) {
+ text += mw.msg( 'comma-separator' );
+ }
+ }
+ return text;
+ }
} );
}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/157301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d894f8a1cba65a3d90dfbf3e43be4e515a327d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
