From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 1 Aug 2017 21:52:04 +0000 (+0000)
Subject: Merge "jsduck: Explcitly name library files so we don't pull in CSS files"
X-Git-Tag: 1.31.0-rc.0~2514
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=b7bc168a55aac8801ae5b2bdfe47b7717d58a714;hp=d666212a47df18efb18e9a08e8582e2c1bb68577

Merge "jsduck: Explcitly name library files so we don't pull in CSS files"
---

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 8c295b289d..d9bbf9a675 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1354,7 +1354,7 @@
 	"rcfilters-activefilters": "Active filters",
 	"rcfilters-advancedfilters": "Advanced filters",
 	"rcfilters-limit-title": "Changes to show",
-	"rcfilters-limit-shownum": "Show last $1 changes",
+	"rcfilters-limit-shownum": "Show last {{PLURAL:$1|change|$1 changes}}",
 	"rcfilters-days-title": "Recent days",
 	"rcfilters-hours-title": "Recent hours",
 	"rcfilters-days-show-days": "$1 {{PLURAL:$1|day|days}}",
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js b/resources/src/mediawiki.action/mediawiki.action.edit.js
index 5b810174bf..35b1b80863 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -17,7 +17,9 @@
 	 */
 
 	$( function () {
-		var editBox, scrollTop, $editForm;
+		var editBox, scrollTop, $editForm,
+			// TODO T6714: Once this can be adjusted, read this from config.
+			summaryByteLimit = 255;
 
 		if ( $( '#editform' ).hasClass( 'mw-editform-ooui' ) ) {
 			mw.loader.using( 'oojs-ui-core' ).then( function () {
@@ -30,11 +32,11 @@
 				// Show a byte-counter to users with how many bytes are left for their edit summary.
 				// TODO: This looks a bit weird, as there is no unit in the UI, just numbers; showing
 				// 'bytes' confused users in testing, and showing 'chars' would be a lie. See T42035.
-				mw.widgets.visibleByteLimit( wpSummary, 255 );
+				mw.widgets.visibleByteLimit( wpSummary, summaryByteLimit );
 			} );
 		} else {
 			// Make sure edit summary does not exceed byte limit
-			$( '#wpSummary' ).byteLimit( 255 );
+			$( '#wpSummary' ).byteLimit( summaryByteLimit );
 		}
 
 		// Restore the edit box scroll state following a preview operation,