| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -768,10 +768,6 @@ |
| 769 | 769 | 'revdelete-unsuppress', |
| 770 | 770 | 'revdelete-log', |
| 771 | 771 | 'revdelete-submit', |
| 772 | | - 'revdelete-logentry', |
| 773 | | - 'logdelete-logentry', |
| 774 | | - 'revdelete-logaction', |
| 775 | | - 'logdelete-logaction', |
| 776 | 772 | 'revdelete-success', |
| 777 | 773 | 'revdelete-failure', |
| 778 | 774 | 'logdelete-success', |
| — | — | @@ -781,15 +777,6 @@ |
| 782 | 778 | 'revdel-restore-visible', |
| 783 | 779 | 'pagehist', |
| 784 | 780 | 'deletedhist', |
| 785 | | - 'revdelete-content', |
| 786 | | - 'revdelete-summary', |
| 787 | | - 'revdelete-uname', |
| 788 | | - 'revdelete-restricted', |
| 789 | | - 'revdelete-unrestricted', |
| 790 | | - 'revdelete-hid', |
| 791 | | - 'revdelete-unhid', |
| 792 | | - 'revdelete-log-message', |
| 793 | | - 'logdelete-log-message', |
| 794 | 781 | 'revdelete-hide-current', |
| 795 | 782 | 'revdelete-show-no-access', |
| 796 | 783 | 'revdelete-modify-no-access', |
| — | — | @@ -1870,8 +1857,6 @@ |
| 1871 | 1858 | 'actioncomplete', |
| 1872 | 1859 | 'actionfailed', |
| 1873 | 1860 | 'deletedtext', |
| 1874 | | - 'deletedarticle', |
| 1875 | | - 'suppressedarticle', |
| 1876 | 1861 | 'dellogpage', |
| 1877 | 1862 | 'dellogpagetext', |
| 1878 | 1863 | 'deletionlog', |
| — | — | @@ -1977,7 +1962,6 @@ |
| 1978 | 1963 | 'undeletereset', |
| 1979 | 1964 | 'undeleteinvert', |
| 1980 | 1965 | 'undeletecomment', |
| 1981 | | - 'undeletedarticle', |
| 1982 | 1966 | 'undeletedrevisions', |
| 1983 | 1967 | 'undeletedrevisions-files', |
| 1984 | 1968 | 'undeletedfiles', |
| — | — | @@ -3513,6 +3497,25 @@ |
| 3514 | 3498 | 'confirm-unwatch-button', |
| 3515 | 3499 | ), |
| 3516 | 3500 | 'logging' => array( |
| | 3501 | + 'logentry-delete-delete', |
| | 3502 | + 'logentry-delete-restore', |
| | 3503 | + 'logentry-delete-event', |
| | 3504 | + 'logentry-delete-revision', |
| | 3505 | + 'logentry-delete-event-legacy', |
| | 3506 | + 'logentry-delete-revision-legacy', |
| | 3507 | + 'logentry-suppress-delete', |
| | 3508 | + 'logentry-suppress-event', |
| | 3509 | + 'logentry-suppress-revision', |
| | 3510 | + 'logentry-suppress-event-legacy', |
| | 3511 | + 'logentry-suppress-revision-legacy', |
| | 3512 | + 'revdelete-content-hid', |
| | 3513 | + 'revdelete-summary-hid', |
| | 3514 | + 'revdelete-uname-hid', |
| | 3515 | + 'revdelete-content-unhid', |
| | 3516 | + 'revdelete-summary-unhid', |
| | 3517 | + 'revdelete-uname-unhid', |
| | 3518 | + 'revdelete-restricted', |
| | 3519 | + 'revdelete-unrestricted', |
| 3517 | 3520 | 'logentry-move-move', |
| 3518 | 3521 | 'logentry-move-move-noredirect', |
| 3519 | 3522 | 'logentry-move-move_redir', |
| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -61,6 +61,8 @@ |
| 62 | 62 | to stop it from replace an already existing default sort, and suppress error. |
| 63 | 63 | * (bug 30364) LanguageConverter now depends on the page content language |
| 64 | 64 | instead of the wiki content language |
| | 65 | +* (bug 18578) Rewrote revision delete related messages to allow better |
| | 66 | + localisation |
| 65 | 67 | |
| 66 | 68 | === Bug fixes in 1.19 === |
| 67 | 69 | * $wgUploadNavigationUrl should be used for file redlinks if |
| Index: trunk/phase3/includes/revisiondelete/RevisionDeleter.php |
| — | — | @@ -30,16 +30,17 @@ |
| 31 | 31 | /** |
| 32 | 32 | * Gets an array of message keys describing the changes made to the visibility |
| 33 | 33 | * of the revision. If the resulting array is $arr, then $arr[0] will contain an |
| 34 | | - * array of strings describing the items that were hidden, $arr[2] will contain |
| 35 | | - * an array of strings describing the items that were unhidden, and $arr[3] will |
| | 34 | + * array of strings describing the items that were hidden, $arr[1] will contain |
| | 35 | + * an array of strings describing the items that were unhidden, and $arr[2] will |
| 36 | 36 | * contain an array with a single string, which can be one of "applied |
| 37 | 37 | * restrictions to sysops", "removed restrictions from sysops", or null. |
| 38 | 38 | * |
| 39 | 39 | * @param $n Integer: the new bitfield. |
| 40 | 40 | * @param $o Integer: the old bitfield. |
| 41 | 41 | * @return An array as described above. |
| | 42 | + * @since 1.19 public |
| 42 | 43 | */ |
| 43 | | - protected static function getChanges( $n, $o ) { |
| | 44 | + public static function getChanges( $n, $o ) { |
| 44 | 45 | $diff = $n ^ $o; |
| 45 | 46 | $ret = array( 0 => array(), 1 => array(), 2 => array() ); |
| 46 | 47 | // Build bitfield changes in language |
| — | — | @@ -59,47 +60,6 @@ |
| 60 | 61 | return $ret; |
| 61 | 62 | } |
| 62 | 63 | |
| 63 | | - /** |
| 64 | | - * Gets a log message to describe the given revision visibility change. This |
| 65 | | - * message will be of the form "[hid {content, edit summary, username}]; |
| 66 | | - * [unhid {...}][applied restrictions to sysops] for $count revisions: $comment". |
| 67 | | - * |
| 68 | | - * @param $count Integer: The number of effected revisions. |
| 69 | | - * @param $nbitfield Integer: The new bitfield for the revision. |
| 70 | | - * @param $obitfield Integer: The old bitfield for the revision. |
| 71 | | - * @param $language Language object to use |
| 72 | | - * @param $isForLog Boolean |
| 73 | | - */ |
| 74 | | - public static function getLogMessage( $count, $nbitfield, $obitfield, $language, $isForLog = false ) { |
| 75 | | - $changes = self::getChanges( $nbitfield, $obitfield ); |
| 76 | | - array_walk( $changes, array( __CLASS__, 'expandMessageArray' ), $language ); |
| 77 | | - |
| 78 | | - $changesText = array(); |
| 79 | | - |
| 80 | | - if( count( $changes[0] ) ) { |
| 81 | | - $changesText[] = wfMsgExt( 'revdelete-hid', array( 'parsemag', 'language' => $language ), $language->commaList( $changes[0] ) ); |
| 82 | | - } |
| 83 | | - if( count( $changes[1] ) ) { |
| 84 | | - $changesText[] = wfMsgExt( 'revdelete-unhid', array( 'parsemag', 'language' => $language ), $language->commaList( $changes[1] ) ); |
| 85 | | - } |
| 86 | | - |
| 87 | | - $s = $language->semicolonList( $changesText ); |
| 88 | | - if( count( $changes[2] ) ) { |
| 89 | | - $s .= $s ? ' (' . $changes[2][0] . ')' : ' ' . $changes[2][0]; |
| 90 | | - } |
| 91 | | - |
| 92 | | - $msg = $isForLog ? 'logdelete-log-message' : 'revdelete-log-message'; |
| 93 | | - return wfMsgExt( $msg, array( 'parsemag', 'language' => $language ), $s, $language->formatNum($count) ); |
| 94 | | - } |
| 95 | | - |
| 96 | | - private static function expandMessageArray( &$msg, $key, $language ) { |
| 97 | | - if ( is_array ( $msg ) ) { |
| 98 | | - array_walk( $msg, array( __CLASS__, 'expandMessageArray' ), $language ); |
| 99 | | - } else { |
| 100 | | - $msg = wfMsgExt( $msg, array( 'parsemag', 'language' => $language ) ); |
| 101 | | - } |
| 102 | | - } |
| 103 | | - |
| 104 | 64 | // Get DB field name for URL param... |
| 105 | 65 | // Future code for other things may also track |
| 106 | 66 | // other types of revision-specific changes. |
| Index: trunk/phase3/includes/logging/LogFormatter.php |
| — | — | @@ -133,7 +133,7 @@ |
| 134 | 134 | * @return Message|pre-escaped html |
| 135 | 135 | */ |
| 136 | 136 | protected function getActionMessage() { |
| 137 | | - $message = $this->msg( $this->getMessageKey() ); |
| | 137 | + $message = $this->msg( $this->getMessageKey() ); |
| 138 | 138 | $message->params( $this->getMessageParameters() ); |
| 139 | 139 | return $message; |
| 140 | 140 | } |
| — | — | @@ -162,6 +162,10 @@ |
| 163 | 163 | * @return array |
| 164 | 164 | */ |
| 165 | 165 | protected function getMessageParameters() { |
| | 166 | + if ( isset( $this->parsedParameters ) ) { |
| | 167 | + return $this->parsedParameters; |
| | 168 | + } |
| | 169 | + |
| 166 | 170 | $entry = $this->entry; |
| 167 | 171 | |
| 168 | 172 | $params = array(); |
| — | — | @@ -193,7 +197,7 @@ |
| 194 | 198 | } |
| 195 | 199 | } |
| 196 | 200 | |
| 197 | | - return $params; |
| | 201 | + return $this->parsedParameters = $params; |
| 198 | 202 | } |
| 199 | 203 | |
| 200 | 204 | /** |
| — | — | @@ -341,3 +345,69 @@ |
| 342 | 346 | return $params; |
| 343 | 347 | } |
| 344 | 348 | } |
| | 349 | + |
| | 350 | +/** |
| | 351 | + * This class formats delete log entries. |
| | 352 | + * @since 1.19 |
| | 353 | + */ |
| | 354 | +class DeleteLogFormatter extends LogFormatter { |
| | 355 | + protected function getMessageKey() { |
| | 356 | + $key = parent::getMessageKey(); |
| | 357 | + if ( in_array( $this->entry->getSubtype(), array( 'event', 'revision' ) ) ) { |
| | 358 | + if ( count( $this->getMessageParameters() ) < 5 ) { |
| | 359 | + return "$key-legacy"; |
| | 360 | + } |
| | 361 | + } |
| | 362 | + return $key; |
| | 363 | + } |
| | 364 | + |
| | 365 | + protected function getMessageParameters() { |
| | 366 | + if ( isset( $this->parsedParametersDeleteLog ) ) { |
| | 367 | + return $this->parsedParametersDeleteLog; |
| | 368 | + } |
| | 369 | + |
| | 370 | + $params = parent::getMessageParameters(); |
| | 371 | + $subtype = $this->entry->getSubtype(); |
| | 372 | + if ( in_array( $subtype, array( 'event', 'revision' ) ) ) { |
| | 373 | + if ( count( $params ) > 5 ) { |
| | 374 | + $paramStart = $subtype === 'revision' ? 4 : 3; |
| | 375 | + |
| | 376 | + $old = $this->parseBitField( $params[$paramStart+1] ); |
| | 377 | + $new = $this->parseBitField( $params[$paramStart+2] ); |
| | 378 | + list( $hid, $unhid, $extra ) = RevisionDeleter::getChanges( $new, $old ); |
| | 379 | + $changes = array(); |
| | 380 | + foreach ( $hid as $v ) { |
| | 381 | + $changes[] = $this->msg( "$v-hid" )->plain(); |
| | 382 | + } |
| | 383 | + foreach ( $unhid as $v ) { |
| | 384 | + $changes[] = $this->msg( "$v-unhid" )->plain(); |
| | 385 | + } |
| | 386 | + foreach ( $extra as $v ) { |
| | 387 | + $changes[] = $this->msg( $v )->plain(); |
| | 388 | + } |
| | 389 | + $changeText = $this->context->getLang()->listToText( $changes ); |
| | 390 | + |
| | 391 | + |
| | 392 | + $newParams = array_slice( $params, 0, 3 ); |
| | 393 | + $newParams[3] = $changeText; |
| | 394 | + $count = count( explode( ',', $params[$paramStart] ) ); |
| | 395 | + $newParams[4] = $this->context->getLang()->formatNum( $count ); |
| | 396 | + return $this->parsedParametersDeleteLog = $newParams; |
| | 397 | + } else { |
| | 398 | + return $this->parsedParametersDeleteLog = array_slice( $params, 0, 3 ); |
| | 399 | + } |
| | 400 | + } |
| | 401 | + |
| | 402 | + return $this->parsedParametersDeleteLog = $params; |
| | 403 | + } |
| | 404 | + |
| | 405 | + protected function parseBitField( $string ) { |
| | 406 | + // Input is like ofield=2134 or just the number |
| | 407 | + if ( strpos( $string, 'field=' ) === 1 ) { |
| | 408 | + list( , $field ) = explode( '=', $string ); |
| | 409 | + return (int) $field; |
| | 410 | + } else { |
| | 411 | + return (int) $string; |
| | 412 | + } |
| | 413 | + } |
| | 414 | +} |
| Index: trunk/phase3/includes/AutoLoader.php |
| — | — | @@ -542,6 +542,7 @@ |
| 543 | 543 | 'ManualLogEntry' => 'includes/logging/LogEntry.php', |
| 544 | 544 | 'LogFormatter' => 'includes/logging/LogFormatter.php', |
| 545 | 545 | 'LegacyLogFormatter' => 'includes/logging/LogFormatter.php', |
| | 546 | + 'DeleteLogFormatter' => 'includes/logging/LogFormatter.php', |
| 546 | 547 | 'MoveLogFormatter' => 'includes/logging/LogFormatter.php', |
| 547 | 548 | |
| 548 | 549 | # includes/media |
| Index: trunk/phase3/includes/WikiPage.php |
| — | — | @@ -1741,10 +1741,13 @@ |
| 1742 | 1742 | |
| 1743 | 1743 | # Log the deletion, if the page was suppressed, log it at Oversight instead |
| 1744 | 1744 | $logtype = $suppress ? 'suppress' : 'delete'; |
| 1745 | | - $log = new LogPage( $logtype ); |
| 1746 | 1745 | |
| 1747 | | - # Make sure logging got through |
| 1748 | | - $log->addEntry( 'delete', $this->mTitle, $reason, array() ); |
| | 1746 | + $logEntry = new ManualLogEntry( $logtype, 'delete' ); |
| | 1747 | + $logEntry->setPerformer( $user ); |
| | 1748 | + $logEntry->setTarget( $this->mTitle ); |
| | 1749 | + $logEntry->setComment( $reason ); |
| | 1750 | + $logid = $logEntry->insert(); |
| | 1751 | + $logEntry->publish( $logid ); |
| 1749 | 1752 | |
| 1750 | 1753 | if ( $commit ) { |
| 1751 | 1754 | $dbw->commit(); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -5028,20 +5028,12 @@ |
| 5029 | 5029 | 'protect/move_prot' => 'movedarticleprotection', |
| 5030 | 5030 | 'rights/rights' => 'rightslogentry', |
| 5031 | 5031 | 'rights/autopromote' => 'rightslogentry-autopromote', |
| 5032 | | - 'delete/delete' => 'deletedarticle', |
| 5033 | | - 'delete/restore' => 'undeletedarticle', |
| 5034 | | - 'delete/revision' => 'revdelete-logentry', |
| 5035 | | - 'delete/event' => 'logdelete-logentry', |
| 5036 | 5032 | 'upload/upload' => 'uploadedimage', |
| 5037 | 5033 | 'upload/overwrite' => 'overwroteimage', |
| 5038 | 5034 | 'upload/revert' => 'uploadedimage', |
| 5039 | 5035 | 'import/upload' => 'import-logentry-upload', |
| 5040 | 5036 | 'import/interwiki' => 'import-logentry-interwiki', |
| 5041 | 5037 | 'merge/merge' => 'pagemerge-logentry', |
| 5042 | | - 'suppress/revision' => 'revdelete-logentry', |
| 5043 | | - 'suppress/file' => 'revdelete-logentry', |
| 5044 | | - 'suppress/event' => 'logdelete-logentry', |
| 5045 | | - 'suppress/delete' => 'suppressedarticle', |
| 5046 | 5038 | 'suppress/block' => 'blocklogentry', |
| 5047 | 5039 | 'suppress/reblock' => 'reblock-logentry', |
| 5048 | 5040 | 'patrol/patrol' => 'patrol-log-line', |
| — | — | @@ -5055,7 +5047,12 @@ |
| 5056 | 5048 | */ |
| 5057 | 5049 | $wgLogActionsHandlers = array( |
| 5058 | 5050 | // move, move_redir |
| 5059 | | - 'move/*' => 'MoveLogFormatter', |
| | 5051 | + 'move/*' => 'MoveLogFormatter', |
| | 5052 | + // delete, restore, revision, event |
| | 5053 | + 'delete/*' => 'DeleteLogFormatter', |
| | 5054 | + 'suppress/revision' => 'DeleteLogFormatter', |
| | 5055 | + 'suppress/event' => 'DeleteLogFormatter', |
| | 5056 | + 'suppress/delete' => 'DeleteLogFormatter', |
| 5060 | 5057 | ); |
| 5061 | 5058 | |
| 5062 | 5059 | /** |
| Index: trunk/phase3/includes/LogPage.php |
| — | — | @@ -286,23 +286,6 @@ |
| 287 | 287 | if( $params[2] ) { |
| 288 | 288 | $details .= ' [' . wfMsgExt( 'protect-summary-cascade', array( 'parsemag', 'language' => $langObj ) ) . ']'; |
| 289 | 289 | } |
| 290 | | - // Page moves |
| 291 | | - } elseif ( $type == 'move' && count( $params ) == 3 ) { |
| 292 | | - if( $params[2] ) { |
| 293 | | - $details .= ' [' . wfMsgExt( 'move-redirect-suppressed', array( 'parsemag', 'language' => $langObj ) ) . ']'; |
| 294 | | - } |
| 295 | | - // Revision deletion |
| 296 | | - } elseif ( preg_match( '/^(delete|suppress)\/revision$/', $key ) && count( $params ) == 5 ) { |
| 297 | | - $count = substr_count( $params[2], ',' ) + 1; // revisions |
| 298 | | - $ofield = intval( substr( $params[3], 7 ) ); // <ofield=x> |
| 299 | | - $nfield = intval( substr( $params[4], 7 ) ); // <nfield=x> |
| 300 | | - $details .= ': ' . RevisionDeleter::getLogMessage( $count, $nfield, $ofield, $langObj, false ); |
| 301 | | - // Log deletion |
| 302 | | - } elseif ( preg_match( '/^(delete|suppress)\/event$/', $key ) && count( $params ) == 4 ) { |
| 303 | | - $count = substr_count( $params[1], ',' ) + 1; // log items |
| 304 | | - $ofield = intval( substr( $params[2], 7 ) ); // <ofield=x> |
| 305 | | - $nfield = intval( substr( $params[3], 7 ) ); // <nfield=x> |
| 306 | | - $details .= ': ' . RevisionDeleter::getLogMessage( $count, $nfield, $ofield, $langObj, true ); |
| 307 | 290 | } |
| 308 | 291 | |
| 309 | 292 | $rv = wfMsgExt( $wgLogActions[$key], array( 'parsemag', 'escape', 'replaceafter', 'language' => $langObj ), $params ) . $details; |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1572,8 +1572,6 @@ |
| 1573 | 1573 | 'revdelete-unsuppress' => 'Remove restrictions on restored revisions', |
| 1574 | 1574 | 'revdelete-log' => 'Reason:', |
| 1575 | 1575 | 'revdelete-submit' => 'Apply to selected {{PLURAL:$1|revision|revisions}}', |
| 1576 | | -'revdelete-logentry' => 'changed revision visibility of "[[$1]]"', |
| 1577 | | -'logdelete-logentry' => 'changed event visibility of "[[$1]]"', |
| 1578 | 1576 | 'revdelete-success' => "'''Revision visibility successfully updated.'''", |
| 1579 | 1577 | 'revdelete-failure' => "'''Revision visibility could not be updated:''' |
| 1580 | 1578 | $1", |
| — | — | @@ -1585,15 +1583,6 @@ |
| 1586 | 1584 | 'revdel-restore-visible' => 'visible revisions', |
| 1587 | 1585 | 'pagehist' => 'Page history', |
| 1588 | 1586 | 'deletedhist' => 'Deleted history', |
| 1589 | | -'revdelete-content' => 'content', |
| 1590 | | -'revdelete-summary' => 'edit summary', |
| 1591 | | -'revdelete-uname' => 'username', |
| 1592 | | -'revdelete-restricted' => 'applied restrictions to administrators', |
| 1593 | | -'revdelete-unrestricted' => 'removed restrictions for administrators', |
| 1594 | | -'revdelete-hid' => 'hid $1', |
| 1595 | | -'revdelete-unhid' => 'unhid $1', |
| 1596 | | -'revdelete-log-message' => '$1 for $2 {{PLURAL:$2|revision|revisions}}', |
| 1597 | | -'logdelete-log-message' => '$1 for $2 {{PLURAL:$2|event|events}}', |
| 1598 | 1587 | 'revdelete-hide-current' => 'Error hiding the item dated $2, $1: this is the current revision. |
| 1599 | 1588 | It cannot be hidden.', |
| 1600 | 1589 | 'revdelete-show-no-access' => 'Error showing the item dated $2, $1: this item has been marked "restricted". |
| — | — | @@ -2810,8 +2799,6 @@ |
| 2811 | 2800 | 'actionfailed' => 'Action failed', |
| 2812 | 2801 | 'deletedtext' => '"$1" has been deleted. |
| 2813 | 2802 | See $2 for a record of recent deletions.', |
| 2814 | | -'deletedarticle' => 'deleted "[[$1]]"', |
| 2815 | | -'suppressedarticle' => 'suppressed "[[$1]]"', |
| 2816 | 2803 | 'dellogpage' => 'Deletion log', |
| 2817 | 2804 | 'dellogpagetext' => 'Below is a list of the most recent deletions.', |
| 2818 | 2805 | 'deletionlog' => 'deletion log', |
| — | — | @@ -2946,7 +2933,6 @@ |
| 2947 | 2934 | 'undeletereset' => 'Reset', |
| 2948 | 2935 | 'undeleteinvert' => 'Invert selection', |
| 2949 | 2936 | 'undeletecomment' => 'Reason:', |
| 2950 | | -'undeletedarticle' => 'restored "[[$1]]"', |
| 2951 | 2937 | 'undeletedrevisions' => '{{PLURAL:$1|1 revision|$1 revisions}} restored', |
| 2952 | 2938 | 'undeletedrevisions-files' => '{{PLURAL:$1|1 revision|$1 revisions}} and {{PLURAL:$2|1 file|$2 files}} restored', |
| 2953 | 2939 | 'undeletedfiles' => '{{PLURAL:$1|1 file|$1 files}} restored', |
| — | — | @@ -4647,6 +4633,25 @@ |
| 4648 | 4634 | 'sqlite-no-fts' => '$1 without full-text search support', |
| 4649 | 4635 | |
| 4650 | 4636 | # New logging system |
| | 4637 | +'logentry-delete-delete' => '$1 {{GENDER:$2|deleted}} page $3', |
| | 4638 | +'logentry-delete-restore' => '$1 {{GENDER:$2|restored}} page $3', |
| | 4639 | +'logentry-delete-event' => '$1 {{GENDER:$2|changed}} visibility of {{PLURAL:$5|a log event|$5 log events}} on $3: $4', |
| | 4640 | +'logentry-delete-revision' => '$1 {{GENDER:$2|changed}} visibility of {{PLURAL:$5|a revision|$5 revisions}} on page $3: $4', |
| | 4641 | +'logentry-delete-event-legacy' => '$1 {{GENDER:$2|changed}} visibility of log events on $3', |
| | 4642 | +'logentry-delete-revision-legacy' => '$1 {{GENDER:$2|changed}} visibility of revisions on page $3', |
| | 4643 | +'logentry-suppress-delete' => '$1 {{GENDER:$2|supressed}} page $3', |
| | 4644 | +'logentry-suppress-event' => '$1 secretly {{GENDER:$2|changed}} visibility of {{PLURAL:$5|a log event|$5 log events}} on $3: $4', |
| | 4645 | +'logentry-suppress-revision' => '$1 secretly {{GENDER:$2|changed}} visibility of {{PLURAL:$5|a revision|$5 revisions}} on page $3: $4', |
| | 4646 | +'logentry-suppress-event-legacy' => '$1 secretly {{GENDER:$2|changed}} visibility of log events on $3', |
| | 4647 | +'logentry-suppress-revision-legacy' => '$1 secretly {{GENDER:$2|changed}} visibility of revisions on page $3', |
| | 4648 | +'revdelete-content-hid' => 'content hidden', |
| | 4649 | +'revdelete-summary-hid' => 'edit summary hidden', |
| | 4650 | +'revdelete-uname-hid' => 'username hidden', |
| | 4651 | +'revdelete-content-unhid' => 'content unhidden', |
| | 4652 | +'revdelete-summary-unhid' => 'edit summary unhidden', |
| | 4653 | +'revdelete-uname-unhid' => 'username unhidden', |
| | 4654 | +'revdelete-restricted' => 'applied restrictions to administrators', |
| | 4655 | +'revdelete-unrestricted' => 'removed restrictions for administrators', |
| 4651 | 4656 | 'logentry-move-move' => '$1 {{GENDER:$2|moved}} page $3 to $4', |
| 4652 | 4657 | 'logentry-move-move-noredirect' => '$1 {{GENDER:$2|moved}} page $3 to $4 without leaving a redirect', |
| 4653 | 4658 | 'logentry-move-move_redir' => '$1 {{GENDER:$2|moved}} page $3 to $4 over redirect', |
| Index: trunk/phase3/languages/messages/MessagesFi.php |
| — | — | @@ -1136,8 +1136,6 @@ |
| 1137 | 1137 | 'revdelete-unsuppress' => 'Poista rajoitukset palautetuilta versiolta', |
| 1138 | 1138 | 'revdelete-log' => 'Syy', |
| 1139 | 1139 | 'revdelete-submit' => 'Toteuta {{PLURAL:$1|valittuun versioon|valittuihin versioihin}}', |
| 1140 | | -'revdelete-logentry' => 'muutti sivun [[$1]] version näkyvyyttä', |
| 1141 | | -'logdelete-logentry' => 'muutti sivun [[$1]] näkyvyyttä', |
| 1142 | 1140 | 'revdelete-success' => "'''Version näkyvyys päivitetty.'''", |
| 1143 | 1141 | 'revdelete-failure' => "'''Version näkyvyyttä ei voitu päivittää:''' |
| 1144 | 1142 | $1", |
| — | — | @@ -1149,15 +1147,6 @@ |
| 1150 | 1148 | 'revdel-restore-visible' => 'näkyvät muutokset', |
| 1151 | 1149 | 'pagehist' => 'Sivun muutoshistoria', |
| 1152 | 1150 | 'deletedhist' => 'Poistettujen versioiden historia', |
| 1153 | | -'revdelete-content' => 'sisällön', |
| 1154 | | -'revdelete-summary' => 'yhteenvedon', |
| 1155 | | -'revdelete-uname' => 'käyttäjänimen', |
| 1156 | | -'revdelete-restricted' => 'asetti rajoitukset ylläpitäjille', |
| 1157 | | -'revdelete-unrestricted' => 'poisti rajoitukset ylläpitäjiltä', |
| 1158 | | -'revdelete-hid' => 'piilotti $1', |
| 1159 | | -'revdelete-unhid' => 'palautti näkyviin $1', |
| 1160 | | -'revdelete-log-message' => '$1 koskien $2 {{PLURAL:$2|versiota}}', |
| 1161 | | -'logdelete-log-message' => '$1 koskien $2 {{PLURAL:$2|tapahtumaa}}', |
| 1162 | 1151 | 'revdelete-hide-current' => 'Virhe tapahtui $2, $1 päivätyn kohteen piilottamisessa: tämä on nykyinen versio. Sitä ei voi piilottaa.', |
| 1163 | 1152 | 'revdelete-show-no-access' => 'Virhe näyttäessä kohtaa $2 kello $1: kohta on merkitty ”rajoitetuksi”. |
| 1164 | 1153 | Sinulla ei ole oikeutta siihen.', |
| — | — | @@ -2226,8 +2215,6 @@ |
| 2227 | 2216 | 'actionfailed' => 'Toiminto epäonnistui', |
| 2228 | 2217 | 'deletedtext' => '”$1” on poistettu. |
| 2229 | 2218 | Sivulla $2 on lista viimeaikaisista poistoista.', |
| 2230 | | -'deletedarticle' => 'poisti sivun [[$1]]', |
| 2231 | | -'suppressedarticle' => 'häivytti sivun [[$1]]', |
| 2232 | 2219 | 'dellogpage' => 'Poistoloki', |
| 2233 | 2220 | 'dellogpagetext' => 'Alla on loki viimeisimmistä poistoista.', |
| 2234 | 2221 | 'deletionlog' => 'poistoloki', |
| — | — | @@ -2342,7 +2329,6 @@ |
| 2343 | 2330 | 'undeletereset' => 'Tyhjennä', |
| 2344 | 2331 | 'undeleteinvert' => 'Käänteinen valinta', |
| 2345 | 2332 | 'undeletecomment' => 'Syy', |
| 2346 | | -'undeletedarticle' => 'palautti sivun [[$1]]', |
| 2347 | 2333 | 'undeletedrevisions' => '{{PLURAL:$1|Yksi versio|$1 versiota}} palautettiin', |
| 2348 | 2334 | 'undeletedrevisions-files' => '{{PLURAL:$1|Yksi versio|$1 versiota}} ja {{PLURAL:$2|yksi tiedosto|$2 tiedostoa}} palautettiin', |
| 2349 | 2335 | 'undeletedfiles' => '{{PLURAL:$1|1 tiedosto|$1 tiedostoa}} palautettiin', |
| — | — | @@ -3671,4 +3657,20 @@ |
| 3672 | 3658 | 'sqlite-has-fts' => '$1, jossa on tuki kokotekstihaulle', |
| 3673 | 3659 | 'sqlite-no-fts' => '$1, jossa ei ole tukea kokotekstihaulle', |
| 3674 | 3660 | |
| | 3661 | +# New logging system |
| | 3662 | +'logentry-delete-delete' => '$1 poisti sivun $3', |
| | 3663 | +'logentry-delete-restore' => '$1 palautti sivun $3', |
| | 3664 | +'logentry-delete-event' => '$1 muutti {{PLURAL:$5||$5}} lokitapahtuman näkyvyyttä $3: $4', |
| | 3665 | +'logentry-delete-revision' => '$1 muutti {{PLURAL:$5||$5}} muutoksen näkyvyyttä sivulla $3: $4', |
| | 3666 | +'logentry-delete-event-legacy' => '$1 muutti lokitapahtumien näkyvyyttä $3', |
| | 3667 | +'logentry-delete-revision-legacy' => '$1 muutti sivun $3 muutosten näkyvyyttä', |
| | 3668 | +'revdelete-content-hid' => 'sisältö piilotettu', |
| | 3669 | +'revdelete-summary-hid' => 'muokkausyhteenveto piilotettu', |
| | 3670 | +'revdelete-uname-hid' => 'käyttäjätunnus piilotettu', |
| | 3671 | +'revdelete-content-unhid' => 'sisältö palautettu näkyviin', |
| | 3672 | +'revdelete-summary-unhid' => 'muokkausyhteenveto palautettu näkyviin', |
| | 3673 | +'revdelete-uname-unhid' => 'käyttäjätunnus palautettu näkyviin', |
| | 3674 | +'revdelete-restricted' => 'asetti rajoitukset ylläpitäjille', |
| | 3675 | +'revdelete-unrestricted' => 'poisti rajoitukset ylläpitäjiltä', |
| | 3676 | + |
| 3675 | 3677 | ); |