Merge "mw.widgets.visibleLengthLimit: Apply number conversion to the limit"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 18 Apr 2018 11:43:22 +0000 (11:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 18 Apr 2018 11:43:22 +0000 (11:43 +0000)
resources/Resources.php
resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js

index 0595bb0..2f230f2 100644 (file)
@@ -2536,6 +2536,7 @@ return [
                'dependencies' => [
                        'oojs-ui-core',
                        'jquery.lengthLimit',
+                       'mediawiki.language',
                        'mediawiki.String',
                ],
                'targets' => [ 'desktop', 'mobile' ]
index 52ebe74..c92c5e5 100644 (file)
@@ -19,7 +19,9 @@
                limit = limit || +textInputWidget.$input.attr( 'maxlength' );
 
                function updateCount() {
-                       textInputWidget.setLabel( ( limit - byteLength( textInputWidget.getValue() ) ).toString() );
+                       var remaining = limit - byteLength( textInputWidget.getValue() );
+                       remaining = mw.language.convertNumber( remaining );
+                       textInputWidget.setLabel( remaining );
                }
                textInputWidget.on( 'change', updateCount );
                // Initialise value
@@ -41,7 +43,9 @@
                limit = limit || +textInputWidget.$input.attr( 'maxlength' );
 
                function updateCount() {
-                       textInputWidget.setLabel( ( limit - codePointLength( textInputWidget.getValue() ) ).toString() );
+                       var remaining = limit - codePointLength( textInputWidget.getValue() );
+                       remaining = mw.language.convertNumber( remaining );
+                       textInputWidget.setLabel( remaining );
                }
                textInputWidget.on( 'change', updateCount );
                // Initialise value