| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -623,6 +623,7 @@ |
| 624 | 624 | 'template-semiprotected', |
| 625 | 625 | 'hiddencategories', |
| 626 | 626 | 'edittools', |
| | 627 | + 'edittools-upload', |
| 627 | 628 | 'nocreatetitle', |
| 628 | 629 | 'nocreatetext', |
| 629 | 630 | 'nocreate-loggedin', |
| Index: trunk/phase3/maintenance/language/messageTypes.inc |
| — | — | @@ -296,6 +296,7 @@ |
| 297 | 297 | 'pagetitle', |
| 298 | 298 | 'filename-prefix-blacklist', |
| 299 | 299 | 'edittools', |
| | 300 | + 'edittools-upload', |
| 300 | 301 | 'size-bytes', |
| 301 | 302 | 'size-kilobytes', |
| 302 | 303 | 'size-megabytes', |
| Index: trunk/phase3/includes/HTMLForm.php |
| — | — | @@ -1616,11 +1616,20 @@ |
| 1617 | 1617 | } |
| 1618 | 1618 | |
| 1619 | 1619 | public function getTableRow( $value ) { |
| 1620 | | - return "<tr><td></td><td class=\"mw-input\">" |
| | 1620 | + if ( empty( $this->mParams['message'] ) ) { |
| | 1621 | + $msg = wfMessage( 'edittools' ); |
| | 1622 | + } else { |
| | 1623 | + $msg = wfMessage( $this->mParams['message'] ); |
| | 1624 | + if ( $msg->isDisabled() ) { |
| | 1625 | + $msg = wfMessage( 'edittools' ); |
| | 1626 | + } |
| | 1627 | + } |
| | 1628 | + $msg->inContentLanguage(); |
| | 1629 | + |
| | 1630 | + |
| | 1631 | + return '<tr><td></td><td class="mw-input">' |
| 1621 | 1632 | . '<div class="mw-editTools">' |
| 1622 | | - . wfMsgExt( empty( $this->mParams['message'] ) |
| 1623 | | - ? 'edittools' : $this->mParams['message'], |
| 1624 | | - array( 'parse', 'content' ) ) |
| | 1633 | + . $msg->parseAsBlock() |
| 1625 | 1634 | . "</div></td></tr>\n"; |
| 1626 | 1635 | } |
| 1627 | 1636 | } |
| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -994,6 +994,7 @@ |
| 995 | 995 | 'EditTools' => array( |
| 996 | 996 | 'type' => 'edittools', |
| 997 | 997 | 'section' => 'description', |
| | 998 | + 'message' => 'edittools-upload', |
| 998 | 999 | ) |
| 999 | 1000 | ); |
| 1000 | 1001 | |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -876,6 +876,7 @@ |
| 877 | 877 | 'template-semiprotected' => 'Used on [[Special:ProtectedPages]]. Appears in brackets after listed page titles which are semi-protected.', |
| 878 | 878 | 'hiddencategories' => "This message is shown below the edit form, like you have a section ''\"Templates used on this page\"''.", |
| 879 | 879 | '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.', |
| | 880 | +'edittools' => 'This text will be shown below upload forms. It will default to the contents of edittools.', |
| 880 | 881 | '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].', |
| 881 | 882 | '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].', |
| 882 | 883 | 'permissionserrorstext-withaction' => '* $1 is the number of reasons that were found why the action cannot be performed. |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1377,6 +1377,7 @@ |
| 1378 | 1378 | 'template-semiprotected' => '(semi-protected)', |
| 1379 | 1379 | 'hiddencategories' => 'This page is a member of {{PLURAL:$1|1 hidden category|$1 hidden categories}}:', |
| 1380 | 1380 | 'edittools' => '<!-- Text here will be shown below edit and upload forms. -->', # only translate this message to other languages if you have to change it |
| | 1381 | +'edittools-upload' => '-', |
| 1381 | 1382 | 'nocreatetitle' => 'Page creation limited', |
| 1382 | 1383 | 'nocreatetext' => '{{SITENAME}} has restricted the ability to create new pages. |
| 1383 | 1384 | You can go back and edit an existing page, or [[Special:UserLogin|log in or create an account]].', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -53,6 +53,8 @@ |
| 54 | 54 | * Add width parameter to Special:Filepath to allow getting the file path of a thumbnail. |
| 55 | 55 | * (bug 26870) Add size to {{filepath:}} |
| 56 | 56 | * Upload warnings now show a thumbnail of the uploaded file |
| | 57 | +* Introduced the edittools-upload message, which will be inserted under the |
| | 58 | + upload form instead of edittools if available |
| 57 | 59 | |
| 58 | 60 | === Bug fixes in 1.18 === |
| 59 | 61 | * (bug 23119) WikiError class and subclasses are now marked as deprecated |