mw.Upload.BookletLayout: Correct some message parameters
authorBartosz Dziewoński <matma.rex@gmail.com>
Mon, 12 Oct 2015 18:48:54 +0000 (20:48 +0200)
committerJforrester <jforrester@wikimedia.org>
Mon, 12 Oct 2015 19:49:14 +0000 (19:49 +0000)
* 'fileexists', 'filepageexists': Requires prefixed page name.
* 'api-error-duplicate', 'api-error-duplicate-archive': Takes the
  number of duplicates, not name of duplicate. The list of duplicates
  is supposed to follow this message.

Change-Id: Idfa978469f4a99526100f6c24a67bf18abf7ec89

resources/src/mediawiki/mediawiki.Upload.BookletLayout.js

index 98abaf6..496904f 100644 (file)
                        } else if ( warnings.exists !== undefined ) {
                                return new OO.ui.Error(
                                        $( '<p>' ).html(
-                                               mw.message( 'fileexists', warnings.exists ).parse()
+                                               mw.message( 'fileexists', 'File:' + warnings.exists ).parse()
                                        ),
                                        { recoverable: false }
                                );
                        } else if ( warnings[ 'page-exists' ] !== undefined ) {
                                return new OO.ui.Error(
                                        $( '<p>' ).html(
-                                               mw.message( 'filepageexists', warnings[ 'page-exists' ] ).parse()
+                                               mw.message( 'filepageexists', 'File:' + warnings[ 'page-exists' ] ).parse()
                                        ),
                                        { recoverable: false }
                                );
                        } else if ( warnings.duplicate !== undefined ) {
                                return new OO.ui.Error(
                                        $( '<p>' ).html(
-                                               mw.message( 'api-error-duplicate', warnings.duplicate[ 0 ] ).parse()
+                                               mw.message( 'api-error-duplicate', warnings.duplicate.length ).parse()
                                        ),
                                        { recoverable: false }
                                );
                        } else if ( warnings[ 'duplicate-archive' ] !== undefined ) {
                                return new OO.ui.Error(
                                        $( '<p>' ).html(
-                                               mw.message( 'api-error-duplicate-archive', warnings[ 'duplicate-archive' ] ).parse()
+                                               mw.message( 'api-error-duplicate-archive', 1 ).parse()
                                        ),
                                        { recoverable: false }
                                );