Merge "user: Allow "CAS update failed" exceptions to be normalised"

[lhc/web/wiklou.git] / resources / src / mediawiki.widgets.visibleLengthLimit / mediawiki.widgets.visibleLengthLimit.js

diff --git a/resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js b/resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js
index 52ebe74..63da95a 100644 (file)
--- a/resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js
+++ b/resources/src/mediawiki.widgets.visibleLengthLimit/mediawiki.widgets.visibleLengthLimit.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
 
        var byteLength = require( 'mediawiki.String' ).byteLength,
                codePointLength = require( 'mediawiki.String' ).codePointLength;
@@ -19,7 +19,13 @@
                limit = limit || +textInputWidget.$input.attr( 'maxlength' );
 
                function updateCount() {
-                       textInputWidget.setLabel( ( limit - byteLength( textInputWidget.getValue() ) ).toString() );
+                       var remaining = limit - byteLength( textInputWidget.getValue() );
+                       if ( remaining > 99 ) {
+                               remaining = '';
+                       } else {
+                               remaining = mw.language.convertNumber( remaining );
+                       }
+                       textInputWidget.setLabel( remaining );
                }
                textInputWidget.on( 'change', updateCount );
                // Initialise value
@@ -41,7 +47,13 @@
                limit = limit || +textInputWidget.$input.attr( 'maxlength' );
 
                function updateCount() {
-                       textInputWidget.setLabel( ( limit - codePointLength( textInputWidget.getValue() ) ).toString() );
+                       var remaining = limit - codePointLength( textInputWidget.getValue() );
+                       if ( remaining > 99 ) {
+                               remaining = '';
+                       } else {
+                               remaining = mw.language.convertNumber( remaining );
+                       }
+                       textInputWidget.setLabel( remaining );
                }
                textInputWidget.on( 'change', updateCount );
                // Initialise value
@@ -51,4 +63,4 @@
                textInputWidget.$input.codePointLimit( limit );
        };
 
-}( mediaWiki ) );
+}() );