https://www.mediawiki.org/wiki/Special:Code/MediaWiki/105441
Revision: 105441
Author: jeroendedauw
Date: 2011-12-07 17:03:10 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
fix off by one error from bug 31341 and error message tweaks
Modified Paths:
--------------
trunk/extensions/UploadWizard/UploadWizard.i18n.php
trunk/extensions/UploadWizard/resources/mw.UploadWizardUpload.js
Modified: trunk/extensions/UploadWizard/UploadWizard.i18n.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-12-07 16:54:25 UTC
(rev 105440)
+++ trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-12-07 17:03:10 UTC
(rev 105441)
@@ -215,7 +215,7 @@
'mwe-upwiz-error-license-wikitext-invalid' => 'This does not seem to be
valid wikitext, or does not contain a license.',
'mwe-upwiz-details-error-count' => 'There {{PLURAL:$1|is one error|are
$1 errors}} with the {{PLURAL:$2|form|forms}} above. Correct the errors, and
try submitting again.',
'mwe-upwiz-too-many-files-ok' => 'OK',
- 'mwe-upwiz-too-many-files-text' => 'You can only upload $1
{{PLURAL:$1|file|files}} at once. You tried to add $2 {{PLURAL:$2|file|files}},
so $3 {{PLURAL:$3|file|files}} have been removed.',
+ 'mwe-upwiz-too-many-files-text' => 'You can only upload $1
{{PLURAL:$1|file|files}} at once. You tried to upload $2
{{PLURAL:$2|file|files}} in total, so $3 {{PLURAL:$3|file has|files have}} been
removed.',
'mwe-upwiz-too-many-files' => 'Too many files.',
/* LICENSES & combinations of licenses */
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardUpload.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardUpload.js
2011-12-07 16:54:25 UTC (rev 105440)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardUpload.js
2011-12-07 17:03:10 UTC (rev 105441)
@@ -339,7 +339,7 @@
if ( tooManyFiles ) {
var remainingFiles =
mw.UploadWizard.config[ 'maxUploads' ] - _this.wizard.uploads.length;
_this.showTooManyFilesWarning(
files.length - remainingFiles );
- var files = remainingFiles > 1
? files.slice( 1, remainingFiles - 1 ) : [];
+ var files = remainingFiles > 1
? files.slice( 1, remainingFiles ) : [];
}
else {
var files = files.slice( 1 );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
