* Add width parameter to Special:Filepath to allow getting the file path of a thumbnail.
* (bug 26870) Add size to {{filepath:}}
* Upload warnings now show a thumbnail of the uploaded file
+* Introduced the edittools-upload message, which will be inserted under the
+ upload form instead of edittools if available
=== Bug fixes in 1.18 ===
* (bug 23119) WikiError class and subclasses are now marked as deprecated
}
public function getTableRow( $value ) {
- return "<tr><td></td><td class=\"mw-input\">"
+ if ( empty( $this->mParams['message'] ) ) {
+ $msg = wfMessage( 'edittools' );
+ } else {
+ $msg = wfMessage( $this->mParams['message'] );
+ if ( $msg->isDisabled() ) {
+ $msg = wfMessage( 'edittools' );
+ }
+ }
+ $msg->inContentLanguage();
+
+
+ return '<tr><td></td><td class="mw-input">'
. '<div class="mw-editTools">'
- . wfMsgExt( empty( $this->mParams['message'] )
- ? 'edittools' : $this->mParams['message'],
- array( 'parse', 'content' ) )
+ . $msg->parseAsBlock()
. "</div></td></tr>\n";
}
}
'EditTools' => array(
'type' => 'edittools',
'section' => 'description',
+ 'message' => 'edittools-upload',
)
);
'template-semiprotected' => '(semi-protected)',
'hiddencategories' => 'This page is a member of {{PLURAL:$1|1 hidden category|$1 hidden categories}}:',
'edittools' => '<!-- Text here will be shown below edit and upload forms. -->', # only translate this message to other languages if you have to change it
+'edittools-upload' => '-',
'nocreatetitle' => 'Page creation limited',
'nocreatetext' => '{{SITENAME}} has restricted the ability to create new pages.
You can go back and edit an existing page, or [[Special:UserLogin|log in or create an account]].',
'template-semiprotected' => 'Used on [[Special:ProtectedPages]]. Appears in brackets after listed page titles which are semi-protected.',
'hiddencategories' => "This message is shown below the edit form, like you have a section ''\"Templates used on this page\"''.",
'edittools' => 'This text will be shown below edit and upload forms. It can be used to offer special characters not present on most keyboards for copying/pasting, and also often makes them clickable for insertion via a javascript. Since these are seen as specific to a wiki, however, this message should not contain anything but an html comment explaining how it should be used once the wiki has been installed.',
+'edittools' => 'This text will be shown below upload forms. It will default to the contents of edittools.',
'sectioneditnotsupported-title' => 'Page title of special page, which presumably appears when someone tries to edit a section, and section editing is disabled. Explanation of section editing on [http://meta.wikimedia.org/wiki/Help:Section_editing#Section_editing meta].',
'sectioneditnotsupported-text' => 'I think this is the text of an error message, which presumably appears when someone tries to edit a section, and section editing is disabled. Explanation of section editing on [http://meta.wikimedia.org/wiki/Help:Section_editing#Section_editing meta].',
'permissionserrorstext-withaction' => '* $1 is the number of reasons that were found why the action cannot be performed.
'pagetitle',
'filename-prefix-blacklist',
'edittools',
+ 'edittools-upload',
'size-bytes',
'size-kilobytes',
'size-megabytes',
'template-semiprotected',
'hiddencategories',
'edittools',
+ 'edittools-upload',
'nocreatetitle',
'nocreatetext',
'nocreate-loggedin',