| Index: branches/phase3_rev_deleted/languages/messages/MessagesEn.php |
| — | — | @@ -114,14 +114,13 @@ |
| 115 | 115 | * Skin names. If any key is not specified, the English one will be used. |
| 116 | 116 | */ |
| 117 | 117 | $skinNames = array( |
| 118 | | - 'standard' => 'Classic', |
| 119 | | - 'nostalgia' => 'Nostalgia', |
| | 118 | + 'standard' => 'Classic', |
| | 119 | + 'nostalgia' => 'Nostalgia', |
| 120 | 120 | 'cologneblue' => 'Cologne Blue', |
| 121 | | - 'davinci' => 'DaVinci', |
| 122 | | - 'mono' => 'Mono', |
| 123 | | - 'monobook' => 'MonoBook', |
| 124 | | - 'myskin' => 'MySkin', |
| 125 | | - 'chick' => 'Chick' |
| | 121 | + 'monobook' => 'MonoBook', |
| | 122 | + 'myskin' => 'MySkin', |
| | 123 | + 'chick' => 'Chick', |
| | 124 | + 'simple' => 'Simple' |
| 126 | 125 | ); |
| 127 | 126 | |
| 128 | 127 | /** |
| — | — | @@ -281,6 +280,7 @@ |
| 282 | 281 | 'img_width' => array( 1, '$1px' ), |
| 283 | 282 | 'img_center' => array( 1, 'center', 'centre' ), |
| 284 | 283 | 'img_framed' => array( 1, 'framed', 'enframed', 'frame' ), |
| | 284 | + 'img_frameless' => array( 1, 'frameless' ), |
| 285 | 285 | 'img_page' => array( 1, 'page=$1', 'page $1' ), |
| 286 | 286 | 'img_upright' => array( 1, 'upright', 'upright=$1', 'upright $1' ), |
| 287 | 287 | 'img_border' => array( 1, 'border' ), |
| — | — | @@ -338,7 +338,7 @@ |
| 339 | 339 | 'padleft' => array( 0, 'PADLEFT' ), |
| 340 | 340 | 'padright' => array( 0, 'PADRIGHT' ), |
| 341 | 341 | 'special' => array( 0, 'special', ), |
| 342 | | - 'defaultsort' => array( 1, 'DEFAULTSORT:' ), |
| | 342 | + 'defaultsort' => array( 1, 'DEFAULTSORT:', 'DEFAULTSORTKEY:', 'DEFAULTCATEGORYSORT:' ), |
| 343 | 343 | ); |
| 344 | 344 | |
| 345 | 345 | /** |
| — | — | @@ -368,12 +368,14 @@ |
| 369 | 369 | 'Uncategorizedpages' => array( 'Uncategorizedpages' ), |
| 370 | 370 | 'Uncategorizedcategories' => array( 'Uncategorizedcategories' ), |
| 371 | 371 | 'Uncategorizedimages' => array( 'Uncategorizedimages' ), |
| | 372 | + 'Uncategorizedtemplates' => array( 'Uncategorizedtemplates' ), |
| 372 | 373 | 'Unusedcategories' => array( 'Unusedcategories' ), |
| 373 | 374 | 'Unusedimages' => array( 'Unusedimages' ), |
| 374 | | - 'Wantedpages' => array( 'Wantedpages' ), |
| | 375 | + 'Wantedpages' => array( 'Wantedpages', 'Brokenlinks' ), |
| 375 | 376 | 'Wantedcategories' => array( 'Wantedcategories' ), |
| 376 | 377 | 'Mostlinked' => array( 'Mostlinked' ), |
| 377 | 378 | 'Mostlinkedcategories' => array( 'Mostlinkedcategories' ), |
| | 379 | + 'Mostlinkedtemplates' => array( 'Mostlinkedtemplates' ), |
| 378 | 380 | 'Mostcategories' => array( 'Mostcategories' ), |
| 379 | 381 | 'Mostimages' => array( 'Mostimages' ), |
| 380 | 382 | 'Mostrevisions' => array( 'Mostrevisions' ), |
| — | — | @@ -456,119 +458,117 @@ |
| 457 | 459 | ** recentchanges-url|recentchanges |
| 458 | 460 | ** randompage-url|randompage |
| 459 | 461 | ** helppage|help |
| 460 | | -** sitesupport-url|sitesupport', |
| | 462 | +** sitesupport-url|sitesupport', # don't translate or duplicate this message to other languages |
| 461 | 463 | |
| 462 | 464 | # User preference toggles |
| 463 | | -'tog-underline' => 'Underline links:', |
| 464 | | -'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>).', |
| 465 | | -'tog-justify' => 'Justify paragraphs', |
| 466 | | -'tog-hideminor' => 'Hide minor edits in recent changes', |
| 467 | | -'tog-extendwatchlist' => 'Expand watchlist to show all applicable changes', |
| 468 | | -'tog-usenewrc' => 'Enhanced recent changes (JavaScript)', |
| 469 | | -'tog-numberheadings' => 'Auto-number headings', |
| 470 | | -'tog-showtoolbar' => 'Show edit toolbar (JavaScript)', |
| 471 | | -'tog-editondblclick' => 'Edit pages on double click (JavaScript)', |
| 472 | | -'tog-editsection' => 'Enable section editing via [edit] links', |
| 473 | | -'tog-editsectiononrightclick' => 'Enable section editing by right clicking<br /> on section titles (JavaScript)', |
| 474 | | -'tog-showtoc' => 'Show table of contents (for pages with more than 3 headings)', |
| 475 | | -'tog-rememberpassword' => 'Remember my login on this computer', |
| 476 | | -'tog-editwidth' => 'Edit box has full width', |
| 477 | | -'tog-watchcreations' => 'Add pages I create to my watchlist', |
| 478 | | -'tog-watchdefault' => 'Add pages I edit to my watchlist', |
| 479 | | -'tog-watchmoves' => 'Add pages I move to my watchlist', |
| 480 | | -'tog-watchdeletion' => 'Add pages I delete to my watchlist', |
| 481 | | -'tog-minordefault' => 'Mark all edits minor by default', |
| 482 | | -'tog-previewontop' => 'Show preview before edit box', |
| 483 | | -'tog-previewonfirst' => 'Show preview on first edit', |
| 484 | | -'tog-nocache' => 'Disable page caching', |
| 485 | | -'tog-enotifwatchlistpages' => 'E-mail me when a page I\'m watching is changed', |
| 486 | | -'tog-enotifusertalkpages' => 'E-mail me when my user talk page is changed', |
| 487 | | -'tog-enotifminoredits' => 'E-mail me also for minor edits of pages', |
| 488 | | -'tog-enotifrevealaddr' => 'Reveal my e-mail address in notification mails', |
| 489 | | -'tog-shownumberswatching' => 'Show the number of watching users', |
| 490 | | -'tog-fancysig' => 'Raw signatures (without automatic link)', |
| 491 | | -'tog-externaleditor' => 'Use external editor by default', |
| 492 | | -'tog-externaldiff' => 'Use external diff by default', |
| 493 | | -'tog-showjumplinks' => 'Enable "jump to" accessibility links', |
| 494 | | -'tog-uselivepreview' => 'Use live preview (JavaScript) (Experimental)', |
| 495 | | -'tog-forceeditsummary' => 'Prompt me when entering a blank edit summary', |
| 496 | | -'tog-watchlisthideown' => 'Hide my edits from the watchlist', |
| 497 | | -'tog-watchlisthidebots' => 'Hide bot edits from the watchlist', |
| 498 | | -'tog-watchlisthideminor' => 'Hide minor edits from the watchlist', |
| 499 | | -'tog-nolangconversion' => 'Disable variants conversion', |
| 500 | | -'tog-ccmeonemails' => 'Send me copies of emails I send to other users', |
| 501 | | -'tog-diffonly' => "Don't show page content below diffs", |
| | 465 | +'tog-underline' => 'Underline links:', |
| | 466 | +'tog-highlightbroken' => 'Format broken links <a href="" class="new">like this</a> (alternative: like this<a href="" class="internal">?</a>).', |
| | 467 | +'tog-justify' => 'Justify paragraphs', |
| | 468 | +'tog-hideminor' => 'Hide minor edits in recent changes', |
| | 469 | +'tog-extendwatchlist' => 'Expand watchlist to show all applicable changes', |
| | 470 | +'tog-usenewrc' => 'Enhanced recent changes (JavaScript)', |
| | 471 | +'tog-numberheadings' => 'Auto-number headings', |
| | 472 | +'tog-showtoolbar' => 'Show edit toolbar (JavaScript)', |
| | 473 | +'tog-editondblclick' => 'Edit pages on double click (JavaScript)', |
| | 474 | +'tog-editsection' => 'Enable section editing via [edit] links', |
| | 475 | +'tog-editsectiononrightclick' => 'Enable section editing by right clicking<br /> on section titles (JavaScript)', |
| | 476 | +'tog-showtoc' => 'Show table of contents (for pages with more than 3 headings)', |
| | 477 | +'tog-rememberpassword' => 'Remember my login on this computer', |
| | 478 | +'tog-editwidth' => 'Edit box has full width', |
| | 479 | +'tog-watchcreations' => 'Add pages I create to my watchlist', |
| | 480 | +'tog-watchdefault' => 'Add pages I edit to my watchlist', |
| | 481 | +'tog-watchmoves' => 'Add pages I move to my watchlist', |
| | 482 | +'tog-watchdeletion' => 'Add pages I delete to my watchlist', |
| | 483 | +'tog-minordefault' => 'Mark all edits minor by default', |
| | 484 | +'tog-previewontop' => 'Show preview before edit box', |
| | 485 | +'tog-previewonfirst' => 'Show preview on first edit', |
| | 486 | +'tog-nocache' => 'Disable page caching', |
| | 487 | +'tog-enotifwatchlistpages' => "E-mail me when a page I'm watching is changed", |
| | 488 | +'tog-enotifusertalkpages' => 'E-mail me when my user talk page is changed', |
| | 489 | +'tog-enotifminoredits' => 'E-mail me also for minor edits of pages', |
| | 490 | +'tog-enotifrevealaddr' => 'Reveal my e-mail address in notification mails', |
| | 491 | +'tog-shownumberswatching' => 'Show the number of watching users', |
| | 492 | +'tog-fancysig' => 'Raw signatures (without automatic link)', |
| | 493 | +'tog-externaleditor' => 'Use external editor by default', |
| | 494 | +'tog-externaldiff' => 'Use external diff by default', |
| | 495 | +'tog-showjumplinks' => 'Enable "jump to" accessibility links', |
| | 496 | +'tog-uselivepreview' => 'Use live preview (JavaScript) (Experimental)', |
| | 497 | +'tog-forceeditsummary' => 'Prompt me when entering a blank edit summary', |
| | 498 | +'tog-watchlisthideown' => 'Hide my edits from the watchlist', |
| | 499 | +'tog-watchlisthidebots' => 'Hide bot edits from the watchlist', |
| | 500 | +'tog-watchlisthideminor' => 'Hide minor edits from the watchlist', |
| | 501 | +'tog-nolangconversion' => 'Disable variants conversion', |
| | 502 | +'tog-ccmeonemails' => 'Send me copies of emails I send to other users', |
| | 503 | +'tog-diffonly' => "Don't show page content below diffs", |
| 502 | 504 | |
| 503 | | -'underline-always' => 'Always', |
| 504 | | -'underline-never' => 'Never', |
| | 505 | +'underline-always' => 'Always', |
| | 506 | +'underline-never' => 'Never', |
| 505 | 507 | 'underline-default' => 'Browser default', |
| 506 | 508 | |
| 507 | 509 | 'skinpreview' => '(Preview)', |
| 508 | 510 | |
| 509 | | -# dates |
| 510 | | -'sunday' => 'Sunday', |
| 511 | | -'monday' => 'Monday', |
| 512 | | -'tuesday' => 'Tuesday', |
| 513 | | -'wednesday' => 'Wednesday', |
| 514 | | -'thursday' => 'Thursday', |
| 515 | | -'friday' => 'Friday', |
| 516 | | -'saturday' => 'Saturday', |
| 517 | | -'sun' => 'Sun', |
| 518 | | -'mon' => 'Mon', |
| 519 | | -'tue' => 'Tue', |
| 520 | | -'wed' => 'Wed', |
| 521 | | -'thu' => 'Thu', |
| 522 | | -'fri' => 'Fri', |
| 523 | | -'sat' => 'Sat', |
| 524 | | -'january' => 'January', |
| 525 | | -'february' => 'February', |
| 526 | | -'march' => 'March', |
| 527 | | -'april' => 'April', |
| 528 | | -'may_long' => 'May', |
| 529 | | -'june' => 'June', |
| 530 | | -'july' => 'July', |
| 531 | | -'august' => 'August', |
| 532 | | -'september' => 'September', |
| 533 | | -'october' => 'October', |
| 534 | | -'november' => 'November', |
| 535 | | -'december' => 'December', |
| 536 | | -'january-gen' => 'January', |
| 537 | | -'february-gen' => 'February', |
| 538 | | -'march-gen' => 'March', |
| 539 | | -'april-gen' => 'April', |
| 540 | | -'may-gen' => 'May', |
| 541 | | -'june-gen' => 'June', |
| 542 | | -'july-gen' => 'July', |
| 543 | | -'august-gen' => 'August', |
| | 511 | +# Dates |
| | 512 | +'sunday' => 'Sunday', |
| | 513 | +'monday' => 'Monday', |
| | 514 | +'tuesday' => 'Tuesday', |
| | 515 | +'wednesday' => 'Wednesday', |
| | 516 | +'thursday' => 'Thursday', |
| | 517 | +'friday' => 'Friday', |
| | 518 | +'saturday' => 'Saturday', |
| | 519 | +'sun' => 'Sun', |
| | 520 | +'mon' => 'Mon', |
| | 521 | +'tue' => 'Tue', |
| | 522 | +'wed' => 'Wed', |
| | 523 | +'thu' => 'Thu', |
| | 524 | +'fri' => 'Fri', |
| | 525 | +'sat' => 'Sat', |
| | 526 | +'january' => 'January', |
| | 527 | +'february' => 'February', |
| | 528 | +'march' => 'March', |
| | 529 | +'april' => 'April', |
| | 530 | +'may_long' => 'May', |
| | 531 | +'june' => 'June', |
| | 532 | +'july' => 'July', |
| | 533 | +'august' => 'August', |
| | 534 | +'september' => 'September', |
| | 535 | +'october' => 'October', |
| | 536 | +'november' => 'November', |
| | 537 | +'december' => 'December', |
| | 538 | +'january-gen' => 'January', |
| | 539 | +'february-gen' => 'February', |
| | 540 | +'march-gen' => 'March', |
| | 541 | +'april-gen' => 'April', |
| | 542 | +'may-gen' => 'May', |
| | 543 | +'june-gen' => 'June', |
| | 544 | +'july-gen' => 'July', |
| | 545 | +'august-gen' => 'August', |
| 544 | 546 | 'september-gen' => 'September', |
| 545 | | -'october-gen' => 'October', |
| 546 | | -'november-gen' => 'November', |
| 547 | | -'december-gen' => 'December', |
| 548 | | -'jan' => 'Jan', |
| 549 | | -'feb' => 'Feb', |
| 550 | | -'mar' => 'Mar', |
| 551 | | -'apr' => 'Apr', |
| 552 | | -'may' => 'May', |
| 553 | | -'jun' => 'Jun', |
| 554 | | -'jul' => 'Jul', |
| 555 | | -'aug' => 'Aug', |
| 556 | | -'sep' => 'Sep', |
| 557 | | -'oct' => 'Oct', |
| 558 | | -'nov' => 'Nov', |
| 559 | | -'dec' => 'Dec', |
| 560 | | -# Bits of text used by many pages: |
| 561 | | -# |
| 562 | | -'categories' => 'Categories', |
| 563 | | -'pagecategories' => '{{PLURAL:$1|Category|Categories}}', |
| 564 | | -'pagecategorieslink' => 'Special:Categories', |
| 565 | | -'category_header' => 'Articles in category "$1"', |
| 566 | | -'subcategories' => 'Subcategories', |
| | 547 | +'october-gen' => 'October', |
| | 548 | +'november-gen' => 'November', |
| | 549 | +'december-gen' => 'December', |
| | 550 | +'jan' => 'Jan', |
| | 551 | +'feb' => 'Feb', |
| | 552 | +'mar' => 'Mar', |
| | 553 | +'apr' => 'Apr', |
| | 554 | +'may' => 'May', |
| | 555 | +'jun' => 'Jun', |
| | 556 | +'jul' => 'Jul', |
| | 557 | +'aug' => 'Aug', |
| | 558 | +'sep' => 'Sep', |
| | 559 | +'oct' => 'Oct', |
| | 560 | +'nov' => 'Nov', |
| | 561 | +'dec' => 'Dec', |
| | 562 | + |
| | 563 | +# Bits of text used by many pages |
| | 564 | +'categories' => 'Categories', |
| | 565 | +'pagecategories' => '{{PLURAL:$1|Category|Categories}}', |
| | 566 | +'pagecategorieslink' => 'Special:Categories', # don't translate or duplicate this message to other languages |
| | 567 | +'category_header' => 'Articles in category "$1"', |
| | 568 | +'subcategories' => 'Subcategories', |
| 567 | 569 | 'category-media-header' => 'Media in category "$1"', |
| 568 | 570 | |
| 569 | | - |
| 570 | | -'linkprefix' => '/^(.*?)([a-zA-Z\x80-\xff]+)$/sD', |
| 571 | | -'mainpage' => 'Main Page', |
| 572 | | -'mainpagetext' => "<big>'''MediaWiki has been successfully installed.'''</big>", |
| | 571 | +'linkprefix' => '/^(.*?)([a-zA-Z\x80-\xff]+)$/sD', # only translate this message to other languages if you have to change it |
| | 572 | +'mainpagetext' => "<big>'''MediaWiki has been successfully installed.'''</big>", |
| 573 | 573 | 'mainpagedocfooter' => "Consult the [http://meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using the wiki software. |
| 574 | 574 | |
| 575 | 575 | == Getting started == |
| — | — | @@ -577,280 +577,277 @@ |
| 578 | 578 | * [http://www.mediawiki.org/wiki/Help:FAQ MediaWiki FAQ] |
| 579 | 579 | * [http://mail.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki release mailing list]", |
| 580 | 580 | |
| 581 | | -'portal' => 'Community portal', |
| 582 | | -'portal-url' => 'Project:Community Portal', |
| 583 | | -'about' => 'About', |
| 584 | | -'aboutsite' => 'About {{SITENAME}}', |
| 585 | | -'aboutpage' => 'Project:About', |
| 586 | | -'article' => 'Content page', |
| 587 | | -'help' => 'Help', |
| 588 | | -'helppage' => 'Help:Contents', |
| 589 | | -'bugreports' => 'Bug reports', |
| 590 | | -'bugreportspage' => 'Project:Bug reports', |
| 591 | | -'sitesupport' => 'Donations', |
| 592 | | -'sitesupport-url' => 'Project:Site support', |
| 593 | | -'faq' => 'FAQ', |
| 594 | | -'faqpage' => 'Project:FAQ', |
| 595 | | -'edithelp' => 'Editing help', |
| 596 | | -'newwindow' => '(opens in new window)', |
| 597 | | -'edithelppage' => 'Help:Editing', |
| 598 | | -'cancel' => 'Cancel', |
| 599 | | -'qbfind' => 'Find', |
| 600 | | -'qbbrowse' => 'Browse', |
| 601 | | -'qbedit' => 'Edit', |
| 602 | | -'qbpageoptions' => 'This page', |
| 603 | | -'qbpageinfo' => 'Context', |
| 604 | | -'qbmyoptions' => 'My pages', |
| 605 | | -'qbspecialpages' => 'Special pages', |
| 606 | | -'moredotdotdot' => 'More...', |
| 607 | | -'mypage' => 'My page', |
| 608 | | -'mytalk' => 'My talk', |
| 609 | | -'anontalk' => 'Talk for this IP', |
| 610 | | -'navigation' => 'Navigation', |
| | 581 | +'about' => 'About', |
| | 582 | +'article' => 'Content page', |
| | 583 | +'newwindow' => '(opens in new window)', |
| | 584 | +'cancel' => 'Cancel', |
| | 585 | +'qbfind' => 'Find', |
| | 586 | +'qbbrowse' => 'Browse', |
| | 587 | +'qbedit' => 'Edit', |
| | 588 | +'qbpageoptions' => 'This page', |
| | 589 | +'qbpageinfo' => 'Context', |
| | 590 | +'qbmyoptions' => 'My pages', |
| | 591 | +'qbspecialpages' => 'Special pages', |
| | 592 | +'moredotdotdot' => 'More...', |
| | 593 | +'mypage' => 'My page', |
| | 594 | +'mytalk' => 'My talk', |
| | 595 | +'anontalk' => 'Talk for this IP', |
| | 596 | +'navigation' => 'Navigation', |
| 611 | 597 | |
| 612 | 598 | # Metadata in edit box |
| 613 | 599 | 'metadata_help' => 'Metadata:', |
| 614 | 600 | |
| 615 | | -'currentevents' => 'Current events', |
| 616 | | -'currentevents-url' => 'Current events', |
| 617 | | - |
| 618 | | -'disclaimers' => 'Disclaimers', |
| 619 | | -'disclaimerpage' => 'Project:General disclaimer', |
| 620 | | -'privacy' => 'Privacy policy', |
| 621 | | -'privacypage' => 'Project:Privacy policy', |
| 622 | | -'errorpagetitle' => 'Error', |
| 623 | | -'returnto' => 'Return to $1.', |
| 624 | | -'tagline' => 'From {{SITENAME}}', |
| 625 | | -'search' => 'Search', |
| 626 | | -'searchbutton' => 'Search', |
| 627 | | -'go' => 'Go', |
| 628 | | -'searcharticle' => 'Go', |
| 629 | | -'history' => 'Page history', |
| 630 | | -'history_short' => 'History', |
| 631 | | -'updatedmarker' => 'updated since my last visit', |
| 632 | | -'info_short' => 'Information', |
| 633 | | -'printableversion' => 'Printable version', |
| 634 | | -'permalink' => 'Permanent link', |
| 635 | | -'print' => 'Print', |
| 636 | | -'edit' => 'Edit', |
| 637 | | -'editthispage' => 'Edit this page', |
| 638 | | -'delete' => 'Delete', |
| 639 | | -'deletethispage' => 'Delete this page', |
| 640 | | -'undelete_short' => 'Undelete {{PLURAL:$1|one edit|$1 edits}}', |
| 641 | | -'protect' => 'Protect', |
| 642 | | -'protect_change' => 'change protection', |
| 643 | | -'protectthispage' => 'Protect this page', |
| 644 | | -'unprotect' => 'unprotect', |
| | 601 | +'errorpagetitle' => 'Error', |
| | 602 | +'returnto' => 'Return to $1.', |
| | 603 | +'tagline' => 'From {{SITENAME}}', |
| | 604 | +'help' => 'Help', |
| | 605 | +'search' => 'Search', |
| | 606 | +'searchbutton' => 'Search', |
| | 607 | +'go' => 'Go', |
| | 608 | +'searcharticle' => 'Go', |
| | 609 | +'history' => 'Page history', |
| | 610 | +'history_short' => 'History', |
| | 611 | +'updatedmarker' => 'updated since my last visit', |
| | 612 | +'info_short' => 'Information', |
| | 613 | +'printableversion' => 'Printable version', |
| | 614 | +'permalink' => 'Permanent link', |
| | 615 | +'print' => 'Print', |
| | 616 | +'edit' => 'Edit', |
| | 617 | +'editthispage' => 'Edit this page', |
| | 618 | +'delete' => 'Delete', |
| | 619 | +'deletethispage' => 'Delete this page', |
| | 620 | +'undelete_short' => 'Undelete {{PLURAL:$1|one edit|$1 edits}}', |
| | 621 | +'protect' => 'Protect', |
| | 622 | +'protect_change' => 'change protection', |
| | 623 | +'protectthispage' => 'Protect this page', |
| | 624 | +'unprotect' => 'unprotect', |
| 645 | 625 | 'unprotectthispage' => 'Unprotect this page', |
| 646 | | -'newpage' => 'New page', |
| 647 | | -'talkpage' => 'Discuss this page', |
| 648 | | -'talkpagelinktext' => 'Talk', |
| 649 | | -'specialpage' => 'Special Page', |
| 650 | | -'personaltools' => 'Personal tools', |
| 651 | | -'postcomment' => 'Post a comment', |
| 652 | | -'addsection' => '+', |
| 653 | | -'articlepage' => 'View content page', |
| 654 | | -'talk' => 'Discussion', |
| 655 | | -'views' => 'Views', |
| 656 | | -'toolbox' => 'Toolbox', |
| 657 | | -'userpage' => 'View user page', |
| 658 | | -'projectpage' => 'View project page', |
| 659 | | -'imagepage' => 'View image page', |
| 660 | | -'mediawikipage' => 'View message page', |
| 661 | | -'templatepage' => 'View template page', |
| 662 | | -'viewhelppage' => 'View help page', |
| 663 | | -'categorypage' => 'View category page', |
| 664 | | -'viewtalkpage' => 'View discussion', |
| 665 | | -'otherlanguages' => 'In other languages', |
| 666 | | -'redirectedfrom' => '(Redirected from $1)', |
| 667 | | -'redirectpagesub' => 'Redirect page', |
| 668 | | -'lastmodifiedat' => 'This page was last modified $2, $1.', //$1 date, $2 time |
| 669 | | -'viewcount' => 'This page has been accessed {{PLURAL:$1|one time|$1 times}}.', |
| 670 | | -'copyright' => 'Content is available under $1.', |
| 671 | | -'protectedpage' => 'Protected page', |
| 672 | | -'jumpto' => 'Jump to:', |
| 673 | | -'jumptonavigation' => 'navigation', |
| 674 | | -'jumptosearch' => 'search', |
| | 626 | +'newpage' => 'New page', |
| | 627 | +'talkpage' => 'Discuss this page', |
| | 628 | +'talkpagelinktext' => 'Talk', |
| | 629 | +'specialpage' => 'Special Page', |
| | 630 | +'personaltools' => 'Personal tools', |
| | 631 | +'postcomment' => 'Post a comment', |
| | 632 | +'addsection' => '+', # don't translate or duplicate this message to other languages |
| | 633 | +'articlepage' => 'View content page', |
| | 634 | +'talk' => 'Discussion', |
| | 635 | +'views' => 'Views', |
| | 636 | +'toolbox' => 'Toolbox', |
| | 637 | +'userpage' => 'View user page', |
| | 638 | +'projectpage' => 'View project page', |
| | 639 | +'imagepage' => 'View image page', |
| | 640 | +'mediawikipage' => 'View message page', |
| | 641 | +'templatepage' => 'View template page', |
| | 642 | +'viewhelppage' => 'View help page', |
| | 643 | +'categorypage' => 'View category page', |
| | 644 | +'viewtalkpage' => 'View discussion', |
| | 645 | +'otherlanguages' => 'In other languages', |
| | 646 | +'redirectedfrom' => '(Redirected from $1)', |
| | 647 | +'redirectpagesub' => 'Redirect page', |
| | 648 | +'lastmodifiedat' => 'This page was last modified $2, $1.', # $1 date, $2 time |
| | 649 | +'viewcount' => 'This page has been accessed {{PLURAL:$1|one time|$1 times}}.', |
| | 650 | +'protectedpage' => 'Protected page', |
| | 651 | +'jumpto' => 'Jump to:', |
| | 652 | +'jumptonavigation' => 'navigation', |
| | 653 | +'jumptosearch' => 'search', |
| 675 | 654 | |
| | 655 | +# All link text and link target definitions of links into project namespace that get used by other message strings, with the exception of user group pages (see grouppage) and the disambiguation template definition (see disambiguations). |
| | 656 | +'aboutsite' => 'About {{SITENAME}}', |
| | 657 | +'aboutpage' => 'Project:About', |
| | 658 | +'bugreports' => 'Bug reports', |
| | 659 | +'bugreportspage' => 'Project:Bug reports', |
| | 660 | +'copyright' => 'Content is available under $1.', |
| | 661 | +'copyrightpagename' => '{{SITENAME}} copyright', |
| | 662 | +'copyrightpage' => 'Project:Copyrights', |
| | 663 | +'currentevents' => 'Current events', |
| | 664 | +'currentevents-url' => 'Current events', |
| | 665 | +'disclaimers' => 'Disclaimers', |
| | 666 | +'disclaimerpage' => 'Project:General disclaimer', |
| | 667 | +'edithelp' => 'Editing help', |
| | 668 | +'edithelppage' => 'Help:Editing', |
| | 669 | +'faq' => 'FAQ', |
| | 670 | +'faqpage' => 'Project:FAQ', |
| | 671 | +'helppage' => 'Help:Contents', |
| | 672 | +'mainpage' => 'Main Page', |
| | 673 | +'policy-url' => 'Project:Policy', |
| | 674 | +'portal' => 'Community portal', |
| | 675 | +'portal-url' => 'Project:Community Portal', |
| | 676 | +'privacy' => 'Privacy policy', |
| | 677 | +'privacypage' => 'Project:Privacy policy', |
| | 678 | +'sitesupport' => 'Donations', |
| | 679 | +'sitesupport-url' => 'Project:Site support', |
| | 680 | + |
| 676 | 681 | 'badaccess' => 'Permission error', |
| 677 | 682 | 'badaccess-group0' => 'You are not allowed to execute the action you have requested.', |
| 678 | 683 | 'badaccess-group1' => 'The action you have requested is limited to users in the group $1.', |
| 679 | 684 | 'badaccess-group2' => 'The action you have requested is limited to users in one of the groups $1.', |
| 680 | 685 | 'badaccess-groups' => 'The action you have requested is limited to users in one of the groups $1.', |
| 681 | 686 | |
| 682 | | -'versionrequired' => 'Version $1 of MediaWiki required', |
| | 687 | +'versionrequired' => 'Version $1 of MediaWiki required', |
| 683 | 688 | 'versionrequiredtext' => 'Version $1 of MediaWiki is required to use this page. See [[Special:Version|version page]].', |
| 684 | 689 | |
| 685 | | -'ok' => 'OK', |
| 686 | | -'sitetitle' => '{{SITENAME}}', |
| 687 | | -'pagetitle' => '$1 - {{SITENAME}}', |
| 688 | | -'sitesubtitle' => '', |
| 689 | | -'retrievedfrom' => 'Retrieved from "$1"', |
| 690 | | -'youhavenewmessages' => 'You have $1 ($2).', |
| 691 | | -'newmessageslink' => 'new messages', |
| | 690 | +'ok' => 'OK', |
| | 691 | +'sitetitle' => '{{SITENAME}}', # don't translate or duplicate this message to other languages |
| | 692 | +'pagetitle' => '$1 - {{SITENAME}}', |
| | 693 | +'sitesubtitle' => '', # don't translate or duplicate this message to other languages |
| | 694 | +'retrievedfrom' => 'Retrieved from "$1"', |
| | 695 | +'youhavenewmessages' => 'You have $1 ($2).', |
| | 696 | +'newmessageslink' => 'new messages', |
| 692 | 697 | 'newmessagesdifflink' => 'last change', |
| 693 | | -'editsection'=>'edit', |
| 694 | | -'editold'=>'edit', |
| 695 | | -'editsectionhint' => 'Edit section: $1', |
| 696 | | -'toc' => 'Contents', |
| 697 | | -'showtoc' => 'show', |
| 698 | | -'hidetoc' => 'hide', |
| 699 | | -'thisisdeleted' => 'View or restore $1?', |
| 700 | | -'viewdeleted' => 'View $1?', |
| 701 | | -'restorelink' => '{{PLURAL:$1|one deleted edit|$1 deleted edits}}', |
| 702 | | -'feedlinks' => 'Feed:', |
| 703 | | -'feed-invalid' => 'Invalid subscription feed type.', |
| 704 | | -'feed-atom' => 'Atom', |
| 705 | | -'feed-rss' => 'RSS', |
| 706 | | -'sitenotice' => '-', # the equivalent to wgSiteNotice |
| 707 | | -'anonnotice' => '-', |
| | 698 | +'editsection' => 'edit', |
| | 699 | +'editold' => 'edit', |
| | 700 | +'editsectionhint' => 'Edit section: $1', |
| | 701 | +'toc' => 'Contents', |
| | 702 | +'showtoc' => 'show', |
| | 703 | +'hidetoc' => 'hide', |
| | 704 | +'thisisdeleted' => 'View or restore $1?', |
| | 705 | +'viewdeleted' => 'View $1?', |
| | 706 | +'restorelink' => '{{PLURAL:$1|one deleted edit|$1 deleted edits}}', |
| | 707 | +'feedlinks' => 'Feed:', |
| | 708 | +'feed-invalid' => 'Invalid subscription feed type.', |
| | 709 | +'feed-atom' => 'Atom', # only translate this message to other languages if you have to change it |
| | 710 | +'feed-rss' => 'RSS', # only translate this message to other languages if you have to change it |
| | 711 | +'sitenotice' => '-', # the equivalent to wgSiteNotice; don't translate or duplicate this message to other languages |
| | 712 | +'anonnotice' => '-', # don't translate or duplicate this message to other languages |
| 708 | 713 | |
| 709 | 714 | # Short words for each namespace, by default used in the 'article' tab in monobook |
| 710 | | -'nstab-main' => 'Article', |
| 711 | | -'nstab-user' => 'User page', |
| 712 | | -'nstab-media' => 'Media page', |
| 713 | | -'nstab-special' => 'Special', |
| 714 | | -'nstab-project' => 'Project page', |
| 715 | | -'nstab-image' => 'File', |
| | 715 | +'nstab-main' => 'Article', |
| | 716 | +'nstab-user' => 'User page', |
| | 717 | +'nstab-media' => 'Media page', |
| | 718 | +'nstab-special' => 'Special', |
| | 719 | +'nstab-project' => 'Project page', |
| | 720 | +'nstab-image' => 'File', |
| 716 | 721 | 'nstab-mediawiki' => 'Message', |
| 717 | | -'nstab-template' => 'Template', |
| 718 | | -'nstab-help' => 'Help page', |
| 719 | | -'nstab-category' => 'Category', |
| | 722 | +'nstab-template' => 'Template', |
| | 723 | +'nstab-help' => 'Help page', |
| | 724 | +'nstab-category' => 'Category', |
| 720 | 725 | |
| 721 | 726 | # Main script and global functions |
| 722 | | -# |
| 723 | | -'nosuchaction' => 'No such action', |
| 724 | | -'nosuchactiontext' => 'The action specified by the URL is not |
| | 727 | +'nosuchaction' => 'No such action', |
| | 728 | +'nosuchactiontext' => 'The action specified by the URL is not |
| 725 | 729 | recognized by the wiki', |
| 726 | 730 | 'nosuchspecialpage' => 'No such special page', |
| 727 | 731 | 'nospecialpagetext' => 'You have requested an invalid special page, a list of valid special pages may be found at [[Special:Specialpages|special pages list]].', |
| 728 | 732 | |
| 729 | 733 | # General errors |
| 730 | | -# |
| 731 | | -'error' => 'Error', |
| 732 | | -'databaseerror' => 'Database error', |
| 733 | | -'dberrortext' => 'A database query syntax error has occurred. |
| | 734 | +'error' => 'Error', |
| | 735 | +'databaseerror' => 'Database error', |
| | 736 | +'dberrortext' => 'A database query syntax error has occurred. |
| 734 | 737 | This may indicate a bug in the software. |
| 735 | 738 | The last attempted database query was: |
| 736 | 739 | <blockquote><tt>$1</tt></blockquote> |
| 737 | 740 | from within function "<tt>$2</tt>". |
| 738 | 741 | MySQL returned error "<tt>$3: $4</tt>".', |
| 739 | | -'dberrortextcl' => 'A database query syntax error has occurred. |
| | 742 | +'dberrortextcl' => 'A database query syntax error has occurred. |
| 740 | 743 | The last attempted database query was: |
| 741 | 744 | "$1" |
| 742 | 745 | from within function "$2". |
| 743 | 746 | MySQL returned error "$3: $4"', |
| 744 | | -'noconnect' => 'Sorry! The wiki is experiencing some technical difficulties, and cannot contact the database server. <br /> |
| | 747 | +'noconnect' => 'Sorry! The wiki is experiencing some technical difficulties, and cannot contact the database server. <br /> |
| 745 | 748 | $1', |
| 746 | | -'nodb' => 'Could not select database $1', |
| 747 | | -'cachederror' => 'The following is a cached copy of the requested page, and may not be up to date.', |
| 748 | | -'laggedslavemode' => 'Warning: Page may not contain recent updates.', |
| 749 | | -'readonly' => 'Database locked', |
| 750 | | -'enterlockreason' => 'Enter a reason for the lock, including an estimate |
| | 749 | +'nodb' => 'Could not select database $1', |
| | 750 | +'cachederror' => 'The following is a cached copy of the requested page, and may not be up to date.', |
| | 751 | +'laggedslavemode' => 'Warning: Page may not contain recent updates.', |
| | 752 | +'readonly' => 'Database locked', |
| | 753 | +'enterlockreason' => 'Enter a reason for the lock, including an estimate |
| 751 | 754 | of when the lock will be released', |
| 752 | | -'readonlytext' => 'The database is currently locked to new entries and other modifications, probably for routine database maintenance, after which it will be back to normal. |
| | 755 | +'readonlytext' => 'The database is currently locked to new entries and other modifications, probably for routine database maintenance, after which it will be back to normal. |
| 753 | 756 | |
| 754 | 757 | The administrator who locked it offered this explanation: $1', |
| 755 | | -'missingarticle' => 'The database did not find the text of a page that it should have found, named "$1". |
| | 758 | +'missingarticle' => 'The database did not find the text of a page that it should have found, named "$1". |
| 756 | 759 | |
| 757 | 760 | This is usually caused by following an outdated diff or history link to a |
| 758 | 761 | page that has been deleted. |
| 759 | 762 | |
| 760 | 763 | If this is not the case, you may have found a bug in the software. |
| 761 | 764 | Please report this to an administrator, making note of the URL.', |
| 762 | | -'readonly_lag' => 'The database has been automatically locked while the slave database servers catch up to the master', |
| 763 | | -'internalerror' => 'Internal error', |
| 764 | | -'filecopyerror' => 'Could not copy file "$1" to "$2".', |
| 765 | | -'filerenameerror' => 'Could not rename file "$1" to "$2".', |
| 766 | | -'filedeleteerror' => 'Could not delete file "$1".', |
| 767 | | -'filenotfound' => 'Could not find file "$1".', |
| 768 | | -'unexpected' => 'Unexpected value: "$1"="$2".', |
| 769 | | -'formerror' => 'Error: could not submit form', |
| 770 | | -'badarticleerror' => 'This action cannot be performed on this page.', |
| 771 | | -'cannotdelete' => 'Could not delete the page or file specified. It may have already been deleted by someone else.<br/> |
| 772 | | -Pages will not be deleted if it will result in an alternating archive history between these and any archived |
| 773 | | -revisions for this page. If such is the case, please move this page to another location and delete it there.', |
| 774 | | -'badtitle' => 'Bad title', |
| 775 | | -'badtitletext' => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title. It may contain one or more characters which cannot be used in titles.', |
| 776 | | -'perfdisabled' => 'Sorry! This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.', |
| 777 | | -'perfdisabledsub' => 'Here is a saved copy from $1:', # obsolete? |
| 778 | | -'perfcached' => 'The following data is cached and may not be up to date.', |
| 779 | | -'perfcachedts' => 'The following data is cached, and was last updated $1.', |
| | 765 | +'readonly_lag' => 'The database has been automatically locked while the slave database servers catch up to the master', |
| | 766 | +'internalerror' => 'Internal error', |
| | 767 | +'filecopyerror' => 'Could not copy file "$1" to "$2".', |
| | 768 | +'filerenameerror' => 'Could not rename file "$1" to "$2".', |
| | 769 | +'filedeleteerror' => 'Could not delete file "$1".', |
| | 770 | +'filenotfound' => 'Could not find file "$1".', |
| | 771 | +'unexpected' => 'Unexpected value: "$1"="$2".', |
| | 772 | +'formerror' => 'Error: could not submit form', |
| | 773 | +'badarticleerror' => 'This action cannot be performed on this page.', |
| | 774 | +'cannotdelete' => 'Could not delete the page or file specified. (It may have already been deleted by someone else.)', |
| | 775 | +'badtitle' => 'Bad title', |
| | 776 | +'badtitletext' => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title. It may contain one or more characters which cannot be used in titles.', |
| | 777 | +'perfdisabled' => 'Sorry! This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.', |
| | 778 | +'perfcached' => 'The following data is cached and may not be up to date.', |
| | 779 | +'perfcachedts' => 'The following data is cached, and was last updated $1.', |
| 780 | 780 | 'querypage-no-updates' => 'Updates for this page are currently disabled. Data here will not presently be refreshed.', |
| 781 | 781 | 'wrong_wfQuery_params' => 'Incorrect parameters to wfQuery()<br /> |
| 782 | 782 | Function: $1<br /> |
| 783 | 783 | Query: $2', |
| 784 | | -'viewsource' => 'View source', |
| 785 | | -'viewsourcefor' => 'for $1', |
| 786 | | -'protectedpagetext' => 'This page has been locked to prevent editing.', |
| 787 | | -'viewsourcetext' => 'You can view and copy the source of this page:', |
| 788 | | -'protectedinterface' => 'This page provides interface text for the software, and is locked to prevent abuse.', |
| 789 | | -'editinginterface' => "'''Warning:''' You are editing a page which is used to provide interface text for the software. Changes to this page will affect the appearance of the user interface for other users.", |
| 790 | | -'sqlhidden' => '(SQL query hidden)', |
| 791 | | -'cascadeprotected' => 'This page has been protected from editing, because it is included in the following {{PLURAL:$1|page|pages}}, which are protected with the "cascading" option turned on:', |
| | 784 | +'viewsource' => 'View source', |
| | 785 | +'viewsourcefor' => 'for $1', |
| | 786 | +'protectedpagetext' => 'This page has been locked to prevent editing.', |
| | 787 | +'viewsourcetext' => 'You can view and copy the source of this page:', |
| | 788 | +'protectedinterface' => 'This page provides interface text for the software, and is locked to prevent abuse.', |
| | 789 | +'editinginterface' => "'''Warning:''' You are editing a page which is used to provide interface text for the software. Changes to this page will affect the appearance of the user interface for other users.", |
| | 790 | +'sqlhidden' => '(SQL query hidden)', |
| | 791 | +'cascadeprotected' => 'This page has been protected from editing, because it is included in the following {{PLURAL:$1|page|pages}}, which are protected with the "cascading" option turned on:', |
| 792 | 792 | |
| 793 | 793 | # Login and logout pages |
| 794 | | -# |
| 795 | | -'logouttitle' => 'User logout', |
| 796 | | -'logouttext' => '<strong>You are now logged out.</strong><br /> |
| | 794 | +'logouttitle' => 'User logout', |
| | 795 | +'logouttext' => '<strong>You are now logged out.</strong><br /> |
| 797 | 796 | You can continue to use {{SITENAME}} anonymously, or you can log in |
| 798 | 797 | again as the same or as a different user. Note that some pages may |
| 799 | 798 | continue to be displayed as if you were still logged in, until you clear |
| 800 | 799 | your browser cache.', |
| | 800 | +'welcomecreation' => "== Welcome, $1! == |
| 801 | 801 | |
| 802 | | -'welcomecreation' => "== Welcome, $1! == |
| 803 | | - |
| 804 | 802 | Your account has been created. Don't forget to change your {{SITENAME}} preferences.", |
| 805 | | - |
| 806 | | -'loginpagetitle' => 'User login', |
| 807 | | -'yourname' => 'Username:', |
| 808 | | -'yourpassword' => 'Password:', |
| 809 | | -'yourpasswordagain' => 'Retype password:', |
| 810 | | -'remembermypassword' => 'Remember my login on this computer', |
| 811 | | -'yourdomainname' => 'Your domain:', |
| 812 | | -'externaldberror' => 'There was either an external authentication database error or you are not allowed to update your external account.', |
| 813 | | -'loginproblem' => '<b>There has been a problem with your login.</b><br />Try again!', |
| 814 | | -'alreadyloggedin' => "<strong>User $1, you are already logged in!</strong><br />", |
| 815 | | - |
| 816 | | -'login' => 'Log in', |
| 817 | | -'loginprompt' => 'You must have cookies enabled to log in to {{SITENAME}}.', |
| 818 | | -'userlogin' => 'Log in / create account', |
| 819 | | -'logout' => 'Log out', |
| 820 | | -'userlogout' => 'Log out', |
| 821 | | -'notloggedin' => 'Not logged in', |
| 822 | | -'nologin' => 'Don\'t have a login? $1.', |
| 823 | | -'nologinlink' => 'Create an account', |
| 824 | | -'createaccount' => 'Create account', |
| 825 | | -'gotaccount' => 'Already have an account? $1.', |
| 826 | | -'gotaccountlink' => 'Log in', |
| 827 | | -'createaccountmail' => 'by e-mail', |
| 828 | | -'badretype' => 'The passwords you entered do not match.', |
| 829 | | -'userexists' => 'Username entered already in use. Please choose a different name.', |
| 830 | | -'youremail' => 'E-mail:', |
| 831 | | -'username' => 'Username:', |
| 832 | | -'uid' => 'User ID:', |
| 833 | | -'yourrealname' => 'Real name:', |
| 834 | | -'yourlanguage' => 'Language:', |
| 835 | | -'yourvariant' => 'Variant', |
| 836 | | -'yournick' => 'Nickname:', |
| 837 | | -'badsig' => 'Invalid raw signature; check HTML tags.', |
| 838 | | -'email' => 'E-mail', |
| 839 | | -'prefs-help-realname' => 'Real name is optional and if you choose to provide it this will be used for giving you attribution for your work.', |
| 840 | | -'loginerror' => 'Login error', |
| 841 | | -'prefs-help-email' => 'E-mail address is optional, but it enables others to contact you through your user or user_talk page without needing to reveal your identity.', |
| 842 | | -'nocookiesnew' => 'The user account was created, but you are not logged in. {{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.', |
| 843 | | -'nocookieslogin' => '{{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them and try again.', |
| 844 | | -'noname' => 'You have not specified a valid user name.', |
| 845 | | -'loginsuccesstitle' => 'Login successful', |
| 846 | | -'loginsuccess' => "'''You are now logged in to {{SITENAME}} as \"$1\".'''", |
| 847 | | -'nosuchuser' => 'There is no user by the name "$1". Check your spelling, or create a new account.', |
| 848 | | -'nosuchusershort' => 'There is no user by the name "$1". Check your spelling.', |
| 849 | | -'nouserspecified' => 'You have to specify a username.', |
| 850 | | -'wrongpassword' => 'Incorrect password entered. Please try again.', |
| 851 | | -'wrongpasswordempty' => 'Password entered was blank. Please try again.', |
| 852 | | -'mailmypassword' => 'E-mail password', |
| 853 | | -'passwordremindertitle' => 'Password reminder from {{SITENAME}}', |
| 854 | | -'passwordremindertext' => 'Someone (probably you, from IP address $1) |
| | 803 | +'loginpagetitle' => 'User login', |
| | 804 | +'yourname' => 'Username:', |
| | 805 | +'yourpassword' => 'Password:', |
| | 806 | +'yourpasswordagain' => 'Retype password:', |
| | 807 | +'remembermypassword' => 'Remember my login on this computer', |
| | 808 | +'yourdomainname' => 'Your domain:', |
| | 809 | +'externaldberror' => 'There was either an external authentication database error or you are not allowed to update your external account.', |
| | 810 | +'loginproblem' => '<b>There has been a problem with your login.</b><br />Try again!', |
| | 811 | +'alreadyloggedin' => '<strong>User $1, you are already logged in!</strong><br />', |
| | 812 | +'login' => 'Log in', |
| | 813 | +'loginprompt' => 'You must have cookies enabled to log in to {{SITENAME}}.', |
| | 814 | +'userlogin' => 'Log in / create account', |
| | 815 | +'logout' => 'Log out', |
| | 816 | +'userlogout' => 'Log out', |
| | 817 | +'notloggedin' => 'Not logged in', |
| | 818 | +'nologin' => "Don't have a login? $1.", |
| | 819 | +'nologinlink' => 'Create an account', |
| | 820 | +'createaccount' => 'Create account', |
| | 821 | +'gotaccount' => 'Already have an account? $1.', |
| | 822 | +'gotaccountlink' => 'Log in', |
| | 823 | +'createaccountmail' => 'by e-mail', |
| | 824 | +'badretype' => 'The passwords you entered do not match.', |
| | 825 | +'userexists' => 'Username entered already in use. Please choose a different name.', |
| | 826 | +'youremail' => 'E-mail:', |
| | 827 | +'username' => 'Username:', |
| | 828 | +'uid' => 'User ID:', |
| | 829 | +'yourrealname' => 'Real name:', |
| | 830 | +'yourlanguage' => 'Language:', |
| | 831 | +'yourvariant' => 'Variant', |
| | 832 | +'yournick' => 'Nickname:', |
| | 833 | +'badsig' => 'Invalid raw signature; check HTML tags.', |
| | 834 | +'badsiglength' => 'Nickname too long; must be under $1 characters.', |
| | 835 | +'email' => 'E-mail', |
| | 836 | +'prefs-help-realname' => 'Real name is optional and if you choose to provide it this will be used for giving you attribution for your work.', |
| | 837 | +'loginerror' => 'Login error', |
| | 838 | +'prefs-help-email' => 'E-mail address is optional, but it enables others to contact you through your user or user_talk page without needing to reveal your identity.', |
| | 839 | +'nocookiesnew' => 'The user account was created, but you are not logged in. {{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.', |
| | 840 | +'nocookieslogin' => '{{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them and try again.', |
| | 841 | +'noname' => 'You have not specified a valid user name.', |
| | 842 | +'loginsuccesstitle' => 'Login successful', |
| | 843 | +'loginsuccess' => "'''You are now logged in to {{SITENAME}} as \"\$1\".'''", |
| | 844 | +'nosuchuser' => 'There is no user by the name "$1". Check your spelling, or create a new account.', |
| | 845 | +'nosuchusershort' => 'There is no user by the name "$1". Check your spelling.', |
| | 846 | +'nouserspecified' => 'You have to specify a username.', |
| | 847 | +'wrongpassword' => 'Incorrect password entered. Please try again.', |
| | 848 | +'wrongpasswordempty' => 'Password entered was blank. Please try again.', |
| | 849 | +'mailmypassword' => 'E-mail password', |
| | 850 | +'passwordremindertitle' => 'Password reminder from {{SITENAME}}', |
| | 851 | +'passwordremindertext' => 'Someone (probably you, from IP address $1) |
| 855 | 852 | requested that we send you a new password for {{SITENAME}} ($4). |
| 856 | 853 | The password for user "$2" is now "$3". |
| 857 | 854 | You should log in and change your password now. |
| — | — | @@ -858,94 +855,94 @@ |
| 859 | 856 | If someone else made this request or if you have remembered your password and |
| 860 | 857 | you no longer wish to change it, you may ignore this message and continue using |
| 861 | 858 | your old password.', |
| 862 | | -'noemail' => 'There is no e-mail address recorded for user "$1".', |
| 863 | | -'passwordsent' => 'A new password has been sent to the e-mail address |
| | 859 | +'noemail' => 'There is no e-mail address recorded for user "$1".', |
| | 860 | +'passwordsent' => 'A new password has been sent to the e-mail address |
| 864 | 861 | registered for "$1". |
| 865 | 862 | Please log in again after you receive it.', |
| 866 | | -'blocked-mailpassword' => 'Your IP address is blocked from editing, and so |
| | 863 | +'blocked-mailpassword' => 'Your IP address is blocked from editing, and so |
| 867 | 864 | is not allowed to use the password recovery function to prevent abuse.', |
| 868 | | -'eauthentsent' => 'A confirmation e-mail has been sent to the nominated e-mail address. |
| | 865 | +'eauthentsent' => 'A confirmation e-mail has been sent to the nominated e-mail address. |
| 869 | 866 | Before any other mail is sent to the account, you will have to follow the instructions in the e-mail, |
| 870 | 867 | to confirm that the account is actually yours.', |
| 871 | | -'throttled-mailpassword' => 'A password reminder has already been sent, within the |
| | 868 | +'throttled-mailpassword' => 'A password reminder has already been sent, within the |
| 872 | 869 | last $1 hours. To prevent abuse, only one password reminder will be sent per |
| 873 | 870 | $1 hours.', |
| 874 | | -'loginend' => '', |
| 875 | | -'signupend' => '{{int:loginend}}', |
| 876 | | -'mailerror' => 'Error sending mail: $1', |
| 877 | | -'acct_creation_throttle_hit' => 'Sorry, you have already created $1 accounts. You can\'t make any more.', |
| 878 | | -'emailauthenticated' => 'Your e-mail address was authenticated on $1.', |
| 879 | | -'emailnotauthenticated' => 'Your e-mail address is not yet authenticated. No e-mail |
| | 871 | +'loginend' => '', # don't translate or duplicate this message to other languages |
| | 872 | +'signupend' => '{{int:loginend}}', # don't translate or duplicate this message to other languages |
| | 873 | +'mailerror' => 'Error sending mail: $1', |
| | 874 | +'acct_creation_throttle_hit' => "Sorry, you have already created $1 accounts. You can't make any more.", |
| | 875 | +'emailauthenticated' => 'Your e-mail address was authenticated on $1.', |
| | 876 | +'emailnotauthenticated' => 'Your e-mail address is not yet authenticated. No e-mail |
| 880 | 877 | will be sent for any of the following features.', |
| 881 | | -'noemailprefs' => 'Specify an e-mail address for these features to work.', |
| 882 | | -'emailconfirmlink' => 'Confirm your e-mail address', |
| 883 | | -'invalidemailaddress' => 'The e-mail address cannot be accepted as it appears to have an invalid |
| | 878 | +'noemailprefs' => 'Specify an e-mail address for these features to work.', |
| | 879 | +'emailconfirmlink' => 'Confirm your e-mail address', |
| | 880 | +'invalidemailaddress' => 'The e-mail address cannot be accepted as it appears to have an invalid |
| 884 | 881 | format. Please enter a well-formatted address or empty that field.', |
| 885 | | -'accountcreated' => 'Account created', |
| 886 | | -'accountcreatedtext' => 'The user account for $1 has been created.', |
| | 882 | +'accountcreated' => 'Account created', |
| | 883 | +'accountcreatedtext' => 'The user account for $1 has been created.', |
| 887 | 884 | |
| 888 | 885 | # Password reset dialog |
| 889 | | -'resetpass' => 'Reset account password', |
| 890 | | -'resetpass_announce' => 'You logged in with a temporary e-mailed code. To finish logging in, you must set a new password here:', |
| 891 | | -'resetpass_text' => "<!-- Add text here -->", |
| 892 | | -'resetpass_header' => 'Reset password', |
| 893 | | -'resetpass_submit' => 'Set password and log in', |
| 894 | | -'resetpass_success' => 'Your password has been changed successfully! Now logging you in...', |
| | 886 | +'resetpass' => 'Reset account password', |
| | 887 | +'resetpass_announce' => 'You logged in with a temporary e-mailed code. To finish logging in, you must set a new password here:', |
| | 888 | +'resetpass_text' => '<!-- Add text here -->', # only translate this message to other languages if you have to change it |
| | 889 | +'resetpass_header' => 'Reset password', |
| | 890 | +'resetpass_submit' => 'Set password and log in', |
| | 891 | +'resetpass_success' => 'Your password has been changed successfully! Now logging you in...', |
| 895 | 892 | 'resetpass_bad_temporary' => 'Invalid temporary password. You may have already successfully changed your password or requested a new temporary password.', |
| 896 | | -'resetpass_forbidden' => 'Passwords cannot be changed on this wiki', |
| 897 | | -'resetpass_missing' => 'No form data.', |
| | 893 | +'resetpass_forbidden' => 'Passwords cannot be changed on this wiki', |
| | 894 | +'resetpass_missing' => 'No form data.', |
| 898 | 895 | |
| 899 | | - |
| 900 | 896 | # Edit page toolbar |
| 901 | | -'bold_sample'=>'Bold text', |
| 902 | | -'bold_tip'=>'Bold text', |
| 903 | | -'italic_sample'=>'Italic text', |
| 904 | | -'italic_tip'=>'Italic text', |
| 905 | | -'link_sample'=>'Link title', |
| 906 | | -'link_tip'=>'Internal link', |
| 907 | | -'extlink_sample'=>'http://www.example.com link title', |
| 908 | | -'extlink_tip'=>'External link (remember http:// prefix)', |
| 909 | | -'headline_sample'=>'Headline text', |
| 910 | | -'headline_tip'=>'Level 2 headline', |
| 911 | | -'math_sample'=>'Insert formula here', |
| 912 | | -'math_tip'=>'Mathematical formula (LaTeX)', |
| 913 | | -'nowiki_sample'=>'Insert non-formatted text here', |
| 914 | | -'nowiki_tip'=>'Ignore wiki formatting', |
| 915 | | -'image_sample'=>'Example.jpg', |
| 916 | | -'image_tip'=>'Embedded image', |
| 917 | | -'media_sample'=>'Example.ogg', |
| 918 | | -'media_tip'=>'Media file link', |
| 919 | | -'sig_tip'=>'Your signature with timestamp', |
| 920 | | -'hr_tip'=>'Horizontal line (use sparingly)', |
| | 897 | +'bold_sample' => 'Bold text', |
| | 898 | +'bold_tip' => 'Bold text', |
| | 899 | +'italic_sample' => 'Italic text', |
| | 900 | +'italic_tip' => 'Italic text', |
| | 901 | +'link_sample' => 'Link title', |
| | 902 | +'link_tip' => 'Internal link', |
| | 903 | +'extlink_sample' => 'http://www.example.com link title', |
| | 904 | +'extlink_tip' => 'External link (remember http:// prefix)', |
| | 905 | +'headline_sample' => 'Headline text', |
| | 906 | +'headline_tip' => 'Level 2 headline', |
| | 907 | +'math_sample' => 'Insert formula here', |
| | 908 | +'math_tip' => 'Mathematical formula (LaTeX)', |
| | 909 | +'nowiki_sample' => 'Insert non-formatted text here', |
| | 910 | +'nowiki_tip' => 'Ignore wiki formatting', |
| | 911 | +'image_sample' => 'Example.jpg', |
| | 912 | +'image_tip' => 'Embedded image', |
| | 913 | +'media_sample' => 'Example.ogg', |
| | 914 | +'media_tip' => 'Media file link', |
| | 915 | +'sig_tip' => 'Your signature with timestamp', |
| | 916 | +'hr_tip' => 'Horizontal line (use sparingly)', |
| 921 | 917 | |
| 922 | 918 | # Edit pages |
| 923 | | -# |
| 924 | | -'summary' => 'Summary', |
| 925 | | -'subject' => 'Subject/headline', |
| 926 | | -'minoredit' => 'This is a minor edit', |
| 927 | | -'watchthis' => 'Watch this page', |
| 928 | | -'savearticle' => 'Save page', |
| 929 | | -'preview' => 'Preview', |
| 930 | | -'showpreview' => 'Show preview', |
| 931 | | -'showlivepreview' => 'Live preview', |
| 932 | | -'showdiff' => 'Show changes', |
| 933 | | -'anoneditwarning' => "'''Warning:''' You are not logged in. Your IP address will be recorded in this page's edit history.", |
| 934 | | -'missingsummary' => "'''Reminder:''' You have not provided an edit summary. If you click Save again, your edit will be saved without one.", |
| 935 | | -'missingcommenttext' => 'Please enter a comment below.', |
| 936 | | -'missingcommentheader' => "'''Reminder:''' You have not provided a subject/headline for this comment. If you click Save again, your edit will be saved without one.", |
| 937 | | -'summary-preview' => 'Summary preview', |
| 938 | | -'subject-preview' => 'Subject/headline preview', |
| 939 | | -'blockedtitle' => 'User is blocked', |
| 940 | | -'blockedtext' => "<big>'''Your user name or IP address has been blocked.'''</big> |
| | 919 | +'summary' => 'Summary', |
| | 920 | +'subject' => 'Subject/headline', |
| | 921 | +'minoredit' => 'This is a minor edit', |
| | 922 | +'watchthis' => 'Watch this page', |
| | 923 | +'savearticle' => 'Save page', |
| | 924 | +'preview' => 'Preview', |
| | 925 | +'showpreview' => 'Show preview', |
| | 926 | +'showlivepreview' => 'Live preview', |
| | 927 | +'showdiff' => 'Show changes', |
| | 928 | +'anoneditwarning' => "'''Warning:''' You are not logged in. Your IP address will be recorded in this page's edit history.", |
| | 929 | +'missingsummary' => "'''Reminder:''' You have not provided an edit summary. If you click Save again, your edit will be saved without one.", |
| | 930 | +'missingcommenttext' => 'Please enter a comment below.', |
| | 931 | +'missingcommentheader' => "'''Reminder:''' You have not provided a subject/headline for this comment. If you click Save again, your edit will be saved without one.", |
| | 932 | +'summary-preview' => 'Summary preview', |
| | 933 | +'subject-preview' => 'Subject/headline preview', |
| | 934 | +'blockedtitle' => 'User is blocked', |
| | 935 | +'blockedtext' => "<big>'''Your user name or IP address has been blocked.'''</big> |
| 941 | 936 | |
| 942 | 937 | The block was made by $1. The reason given is ''$2''. |
| 943 | 938 | |
| 944 | | -Expiry of block: $6 |
| | 939 | +Expiry of block: $6<br /> |
| | 940 | +Intended blockee: $7 |
| 945 | 941 | |
| 946 | 942 | You can contact $1 or another [[{{MediaWiki:grouppage-sysop}}|administrator]] to discuss the block. |
| 947 | 943 | You cannot use the 'email this user' feature unless a valid email address is specified in your |
| 948 | | -[[Special:Preferences|account preferences]]. Your current IP address is $3, and the block ID is #$5. Please include either or both of these in any queries.", |
| 949 | | -'autoblockedtext' => 'Your IP address has been automatically blocked because it was used by another user, who was blocked by $1. |
| | 944 | +[[Special:Preferences|account preferences]] and you have not been blocked from using it. |
| | 945 | +Your current IP address is $3, and the block ID is #$5. Please include either or both of these in any queries.", |
| | 946 | +'autoblockedtext' => 'Your IP address has been automatically blocked because it was used by another user, who was blocked by $1. |
| 950 | 947 | The reason given is this: |
| 951 | 948 | |
| 952 | 949 | :\'\'$2\'\' |
| — | — | @@ -955,154 +952,155 @@ |
| 956 | 953 | You may contact $1 or one of the other |
| 957 | 954 | [[{{MediaWiki:grouppage-sysop}}|administrators]] to discuss the block. |
| 958 | 955 | |
| 959 | | -Note that you may not use the "e-mail this user" feature unless you have a valid e-mail address registered in your [[Special:Preferences|user preferences]]. |
| | 956 | +Note that you may not use the "e-mail this user" feature unless you have a valid e-mail address |
| | 957 | +registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it. |
| 960 | 958 | |
| 961 | 959 | Your block ID is $5. Please include this ID in any queries you make.', |
| 962 | | -'blockedoriginalsource' => "The source of '''$1''' is shown below:", |
| 963 | | -'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:", |
| 964 | | -'whitelistedittitle' => 'Login required to edit', |
| 965 | | -'whitelistedittext' => 'You have to $1 to edit pages.', |
| 966 | | -'whitelistreadtitle' => 'Login required to read', |
| 967 | | -'whitelistreadtext' => 'You have to [[Special:Userlogin|login]] to read pages.', |
| 968 | | -'whitelistacctitle' => 'You are not allowed to create an account', |
| 969 | | -'whitelistacctext' => 'To be allowed to create accounts in this wiki you have to [[Special:Userlogin|log]] in and have the appropriate permissions.', |
| 970 | | -'confirmedittitle' => 'E-mail confirmation required to edit', |
| 971 | | -'confirmedittext' => 'You must confirm your e-mail address before editing pages. Please set and validate your e-mail address through your [[Special:Preferences|user preferences]].', |
| 972 | | -'nosuchsectiontitle' => 'No such section', |
| 973 | | -'nosuchsectiontext' => "You tried to edit a section that doesn't exist. Since there is no section \$1, there's no place to save your edit.", |
| 974 | | -'loginreqtitle' => 'Login Required', |
| 975 | | -'loginreqlink' => 'log in', |
| 976 | | -'loginreqpagetext' => 'You must $1 to view other pages.', |
| 977 | | -'accmailtitle' => 'Password sent.', |
| 978 | | -'accmailtext' => 'The password for "$1" has been sent to $2.', |
| 979 | | -'newarticle' => '(New)', |
| 980 | | -'newarticletext' => |
| 981 | | -"You've followed a link to a page that doesn't exist yet. |
| | 960 | +'blockedoriginalsource' => "The source of '''$1''' is shown below:", |
| | 961 | +'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:", |
| | 962 | +'whitelistedittitle' => 'Login required to edit', |
| | 963 | +'whitelistedittext' => 'You have to $1 to edit pages.', |
| | 964 | +'whitelistreadtitle' => 'Login required to read', |
| | 965 | +'whitelistreadtext' => 'You have to [[Special:Userlogin|login]] to read pages.', |
| | 966 | +'whitelistacctitle' => 'You are not allowed to create an account', |
| | 967 | +'whitelistacctext' => 'To be allowed to create accounts in this wiki you have to [[Special:Userlogin|log]] in and have the appropriate permissions.', |
| | 968 | +'confirmedittitle' => 'E-mail confirmation required to edit', |
| | 969 | +'confirmedittext' => 'You must confirm your e-mail address before editing pages. Please set and validate your e-mail address through your [[Special:Preferences|user preferences]].', |
| | 970 | +'nosuchsectiontitle' => 'No such section', |
| | 971 | +'nosuchsectiontext' => "You tried to edit a section that doesn't exist. Since there is no section $1, there's no place to save your edit.", |
| | 972 | +'loginreqtitle' => 'Login Required', |
| | 973 | +'loginreqlink' => 'log in', |
| | 974 | +'loginreqpagetext' => 'You must $1 to view other pages.', |
| | 975 | +'accmailtitle' => 'Password sent.', |
| | 976 | +'accmailtext' => 'The password for "$1" has been sent to $2.', |
| | 977 | +'newarticle' => '(New)', |
| | 978 | +'newarticletext' => "You've followed a link to a page that doesn't exist yet. |
| 982 | 979 | To create the page, start typing in the box below |
| 983 | 980 | (see the [[{{MediaWiki:helppage}}|help page]] for more info). |
| 984 | 981 | If you are here by mistake, just click your browser's '''back''' button.", |
| 985 | | -'newarticletextanon' => '{{int:newarticletext}}', |
| 986 | | -'talkpagetext' => '<!-- MediaWiki:talkpagetext -->', |
| 987 | | -'anontalkpagetext' => "----''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical IP address to identify him/her. Such an IP address can be shared by several users. If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.''", |
| 988 | | -'noarticletext' => 'There is currently no text in this page, you can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page].', |
| 989 | | -'noarticletextanon' => '{{int:noarticletext}}', |
| 990 | | -'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. '''Mozilla / Firefox / Safari:''' hold down ''Shift'' while clicking ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''': simply click the ''Reload'' button, or press ''F5''; '''Opera''' users may need to completely clear their cache in ''Tools→Preferences''.", |
| 991 | | -'usercssjsyoucanpreview' => '<strong>Tip:</strong> Use the \'Show preview\' button to test your new CSS/JS before saving.', |
| 992 | | -'usercsspreview' => '\'\'\'Remember that you are only previewing your user CSS, it has not yet been saved!\'\'\'', |
| 993 | | -'userjspreview' => '\'\'\'Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!\'\'\'', |
| 994 | | -'userinvalidcssjstitle' => "'''Warning:''' There is no skin \"$1\". Remember that custom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/monobook.css as opposed to {{ns:user}}:Foo/Monobook.css.", |
| 995 | | -'updated' => '(Updated)', |
| 996 | | -'note' => '<strong>Note:</strong>', |
| 997 | | -'previewnote' => '<strong>This is only a preview; changes have not yet been saved!</strong>', |
| 998 | | -'session_fail_preview' => '<strong>Sorry! We could not process your edit due to a loss of session data. |
| 999 | | -Please try again. If it still doesn\'t work, try logging out and logging back in.</strong>', |
| 1000 | | -'previewconflict' => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.', |
| 1001 | | -'session_fail_preview_html' => '<strong>Sorry! We could not process your edit due to a loss of session data.</strong> |
| | 982 | +'newarticletextanon' => '{{int:newarticletext}}', # don't translate or duplicate this message to other languages |
| | 983 | +'talkpagetext' => '<!-- MediaWiki:talkpagetext -->', # don't translate or duplicate this message to other languages |
| | 984 | +'anontalkpagetext' => "----''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical IP address to identify him/her. Such an IP address can be shared by several users. If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.''", |
| | 985 | +'noarticletext' => 'There is currently no text in this page, you can [[Special:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page].', |
| | 986 | +'noarticletextanon' => '{{int:noarticletext}}', # don't translate or duplicate this message to other languages |
| | 987 | +'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. '''Mozilla / Firefox / Safari:''' hold down ''Shift'' while clicking ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''': simply click the ''Reload'' button, or press ''F5''; '''Opera''' users may need to completely clear their cache in ''Tools→Preferences''.", |
| | 988 | +'usercssjsyoucanpreview' => "<strong>Tip:</strong> Use the 'Show preview' button to test your new CSS/JS before saving.", |
| | 989 | +'usercsspreview' => "'''Remember that you are only previewing your user CSS, it has not yet been saved!'''", |
| | 990 | +'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!'''", |
| | 991 | +'userinvalidcssjstitle' => "'''Warning:''' There is no skin \"\$1\". Remember that custom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/monobook.css as opposed to {{ns:user}}:Foo/Monobook.css.", |
| | 992 | +'updated' => '(Updated)', |
| | 993 | +'note' => '<strong>Note:</strong>', |
| | 994 | +'previewnote' => '<strong>This is only a preview; changes have not yet been saved!</strong>', |
| | 995 | +'previewconflict' => 'This preview reflects the text in the upper text editing area as it will appear if you choose to save.', |
| | 996 | +'session_fail_preview' => "<strong>Sorry! We could not process your edit due to a loss of session data. |
| | 997 | +Please try again. If it still doesn't work, try logging out and logging back in.</strong>", |
| | 998 | +'session_fail_preview_html' => "<strong>Sorry! We could not process your edit due to a loss of session data.</strong> |
| 1002 | 999 | |
| 1003 | | -\'\'Because this wiki has raw HTML enabled, the preview is hidden as a precaution against JavaScript attacks.\'\' |
| | 1000 | +''Because this wiki has raw HTML enabled, the preview is hidden as a precaution against JavaScript attacks.'' |
| 1004 | 1001 | |
| 1005 | | -<strong>If this is a legitimate edit attempt, please try again. If it still doesn\'t work, try logging out and logging back in.</strong>', |
| 1006 | | -'importing' => 'Importing $1', |
| 1007 | | -'editing' => 'Editing $1', |
| 1008 | | -'editinguser' => 'Editing user <b>$1</b>', |
| 1009 | | -'editingsection' => 'Editing $1 (section)', |
| 1010 | | -'editingcomment' => 'Editing $1 (comment)', |
| 1011 | | -'editconflict' => 'Edit conflict: $1', |
| 1012 | | -'explainconflict' => 'Someone else has changed this page since you started editing it. |
| | 1002 | +<strong>If this is a legitimate edit attempt, please try again. If it still doesn't work, try logging out and logging back in.</strong>", |
| | 1003 | +'importing' => 'Importing $1', |
| | 1004 | +'editing' => 'Editing $1', |
| | 1005 | +'editinguser' => 'Editing user <b>$1</b>', |
| | 1006 | +'editingsection' => 'Editing $1 (section)', |
| | 1007 | +'editingcomment' => 'Editing $1 (comment)', |
| | 1008 | +'editconflict' => 'Edit conflict: $1', |
| | 1009 | +'explainconflict' => 'Someone else has changed this page since you started editing it. |
| 1013 | 1010 | The upper text area contains the page text as it currently exists. |
| 1014 | 1011 | Your changes are shown in the lower text area. |
| 1015 | 1012 | You will have to merge your changes into the existing text. |
| 1016 | 1013 | <b>Only</b> the text in the upper text area will be saved when you |
| 1017 | 1014 | press "Save page".<br />', |
| 1018 | | -'yourtext' => 'Your text', |
| 1019 | | -'storedversion' => 'Stored version', |
| 1020 | | -'nonunicodebrowser' => "<strong>WARNING: Your browser is not unicode compliant. A workaround is in place to allow you to safely edit articles: non-ASCII characters will appear in the edit box as hexadecimal codes.</strong>", |
| 1021 | | -'editingold' => "<strong>WARNING: You are editing an out-of-date |
| | 1015 | +'yourtext' => 'Your text', |
| | 1016 | +'storedversion' => 'Stored version', |
| | 1017 | +'nonunicodebrowser' => '<strong>WARNING: Your browser is not unicode compliant. A workaround is in place to allow you to safely edit articles: non-ASCII characters will appear in the edit box as hexadecimal codes.</strong>', |
| | 1018 | +'editingold' => '<strong>WARNING: You are editing an out-of-date |
| 1022 | 1019 | revision of this page. |
| 1023 | | -If you save it, any changes made since this revision will be lost.</strong>", |
| 1024 | | -'yourdiff' => 'Differences', |
| 1025 | | -'copyrightwarning' => 'Please note that all contributions to {{SITENAME}} are considered to be released under the $2 (see $1 for details). If you don\'t want your writing to be edited mercilessly and redistributed at will, then don\'t submit it here.<br /> |
| | 1020 | +If you save it, any changes made since this revision will be lost.</strong>', |
| | 1021 | +'yourdiff' => 'Differences', |
| | 1022 | +'copyrightwarning' => "Please note that all contributions to {{SITENAME}} are considered to be released under the $2 (see $1 for details). If you don't want your writing to be edited mercilessly and redistributed at will, then don't submit it here.<br /> |
| 1026 | 1023 | You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource. |
| 1027 | | -<strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>', |
| 1028 | | -'copyrightwarning2' => 'Please note that all contributions to {{SITENAME}} may be edited, altered, or removed by other contributors. If you don\'t want your writing to be edited mercilessly, then don\'t submit it here.<br /> |
| | 1024 | +<strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>", |
| | 1025 | +'copyrightwarning2' => "Please note that all contributions to {{SITENAME}} may be edited, altered, or removed by other contributors. If you don't want your writing to be edited mercilessly, then don't submit it here.<br /> |
| 1029 | 1026 | You are also promising us that you wrote this yourself, or copied it from a |
| 1030 | 1027 | public domain or similar free resource (see $1 for details). |
| 1031 | | -<strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>', |
| 1032 | | -'longpagewarning' => "<strong>WARNING: This page is $1 kilobytes long; some |
| | 1028 | +<strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>", |
| | 1029 | +'longpagewarning' => '<strong>WARNING: This page is $1 kilobytes long; some |
| 1033 | 1030 | browsers may have problems editing pages approaching or longer than 32kb. |
| 1034 | | -Please consider breaking the page into smaller sections.</strong>", |
| 1035 | | -'longpageerror' => "<strong>ERROR: The text you have submitted is $1 kilobytes |
| 1036 | | -long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</strong>", |
| 1037 | | -'readonlywarning' => '<strong>WARNING: The database has been locked for maintenance, |
| | 1031 | +Please consider breaking the page into smaller sections.</strong>', |
| | 1032 | +'longpageerror' => '<strong>ERROR: The text you have submitted is $1 kilobytes |
| | 1033 | +long, which is longer than the maximum of $2 kilobytes. It cannot be saved.</strong>', |
| | 1034 | +'readonlywarning' => '<strong>WARNING: The database has been locked for maintenance, |
| 1038 | 1035 | so you will not be able to save your edits right now. You may wish to cut-n-paste |
| 1039 | 1036 | the text into a text file and save it for later.</strong>', |
| 1040 | | -'protectedpagewarning' => "<strong>WARNING: This page has been locked so that only users with sysop privileges can edit it.</strong>", |
| 1041 | | -'semiprotectedpagewarning' => "'''Note:''' This page has been locked so that only registered users can edit it.", |
| 1042 | | -'cascadeprotectedwarning' => "'''Warning:''' This page has been locked so that only users with sysop privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:", |
| 1043 | | -'templatesused' => 'Templates used on this page:', |
| 1044 | | -'templatesusedpreview' => 'Templates used in this preview:', |
| 1045 | | -'templatesusedsection' => 'Templates used in this section:', |
| 1046 | | -'template-protected' => '(protected)', |
| 1047 | | -'template-semiprotected' => '(semi-protected)', |
| 1048 | | -'edittools' => '<!-- Text here will be shown below edit and upload forms. -->', |
| 1049 | | -'nocreatetitle' => 'Page creation limited', |
| 1050 | | -'nocreatetext' => 'This site has restricted the ability to create new pages. |
| | 1037 | +'protectedpagewarning' => '<strong>WARNING: This page has been locked so that only users with sysop privileges can edit it.</strong>', |
| | 1038 | +'semiprotectedpagewarning' => "'''Note:''' This page has been locked so that only registered users can edit it.", |
| | 1039 | +'cascadeprotectedwarning' => "'''Warning:''' This page has been locked so that only users with sysop privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:", |
| | 1040 | +'templatesused' => 'Templates used on this page:', |
| | 1041 | +'templatesusedpreview' => 'Templates used in this preview:', |
| | 1042 | +'templatesusedsection' => 'Templates used in this section:', |
| | 1043 | +'template-protected' => '(protected)', |
| | 1044 | +'template-semiprotected' => '(semi-protected)', |
| | 1045 | +'edittools' => '<!-- Text here will be shown below edit and upload forms. -->', |
| | 1046 | +'nocreatetitle' => 'Page creation limited', |
| | 1047 | +'nocreatetext' => 'This site has restricted the ability to create new pages. |
| 1051 | 1048 | You can go back and edit an existing page, or [[Special:Userlogin|log in or create an account]].', |
| | 1049 | +'recreate-deleted-warn' => "'''Warning: You are recreating a page that was previously deleted.''' |
| 1052 | 1050 | |
| | 1051 | +You should consider whether it is appropriate to continue editing this page. |
| | 1052 | +The deletion log for this page is provided here for convenience:", |
| | 1053 | + |
| 1053 | 1054 | # "Undo" feature |
| 1054 | 1055 | 'undo-success' => 'The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.', |
| 1055 | 1056 | 'undo-failure' => 'The edit could not be undone due to conflicting intermediate edits.', |
| 1056 | 1057 | 'undo-summary' => 'Undo revision $1 by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]])', |
| 1057 | 1058 | |
| 1058 | 1059 | # Account creation failure |
| 1059 | | -'cantcreateaccounttitle' => 'Can\'t create account', |
| 1060 | | -'cantcreateaccounttext' => 'Account creation from this IP address (<b>$1</b>) has been blocked. |
| | 1060 | +'cantcreateaccounttitle' => "Can't create account", |
| | 1061 | +'cantcreateaccounttext' => 'Account creation from this IP address (<b>$1</b>) has been blocked. |
| 1061 | 1062 | This is probably due to persistent vandalism from your school or Internet service |
| 1062 | 1063 | provider.', |
| 1063 | 1064 | |
| 1064 | 1065 | # History pages |
| 1065 | | -# |
| 1066 | | -'revhistory' => 'Revision history', |
| 1067 | | -'viewpagelogs' => 'View logs for this page', |
| 1068 | | -'nohistory' => 'There is no edit history for this page.', |
| 1069 | | -'revnotfound' => 'Revision not found', |
| 1070 | | -'revnotfoundtext' => "The old revision of the page you asked for could not be found. |
| 1071 | | -Please check the URL you used to access this page.", |
| 1072 | | -'loadhist' => 'Loading page history', |
| 1073 | | -'currentrev' => 'Current revision', |
| 1074 | | -'revisionasof' => 'Revision as of $1', |
| 1075 | | -'revision-info' => 'Revision as of $1 by $2', |
| 1076 | | -'revision-nav' => '($1) $2 | $3 ($4) | $5 ($6)', |
| 1077 | | -'previousrevision' => '←Older revision', |
| 1078 | | -'nextrevision' => 'Newer revision→', |
| 1079 | | -'currentrevisionlink' => 'Current revision', |
| 1080 | | -'cur' => 'cur', |
| 1081 | | -'next' => 'next', |
| 1082 | | -'last' => 'last', |
| 1083 | | -'orig' => 'orig', |
| 1084 | | -'page_first' => 'first', |
| 1085 | | -'page_last' => 'last', |
| 1086 | | -'histlegend' => 'Diff selection: mark the radio boxes of the versions to compare and hit enter or the button at the bottom.<br /> |
| | 1066 | +'revhistory' => 'Revision history', |
| | 1067 | +'viewpagelogs' => 'View logs for this page', |
| | 1068 | +'nohistory' => 'There is no edit history for this page.', |
| | 1069 | +'revnotfound' => 'Revision not found', |
| | 1070 | +'revnotfoundtext' => 'The old revision of the page you asked for could not be found. |
| | 1071 | +Please check the URL you used to access this page.', |
| | 1072 | +'loadhist' => 'Loading page history', |
| | 1073 | +'currentrev' => 'Current revision', |
| | 1074 | +'revisionasof' => 'Revision as of $1', |
| | 1075 | +'revision-info' => 'Revision as of $1 by $2', |
| | 1076 | +'revision-nav' => '($1) $2 | $3 ($4) | $5 ($6)', # don't translate or duplicate this message to other languages |
| | 1077 | +'previousrevision' => '←Older revision', |
| | 1078 | +'nextrevision' => 'Newer revision→', |
| | 1079 | +'currentrevisionlink' => 'Current revision', |
| | 1080 | +'cur' => 'cur', |
| | 1081 | +'next' => 'next', |
| | 1082 | +'last' => 'last', |
| | 1083 | +'orig' => 'orig', |
| | 1084 | +'page_first' => 'first', |
| | 1085 | +'page_last' => 'last', |
| | 1086 | +'histlegend' => 'Diff selection: mark the radio boxes of the versions to compare and hit enter or the button at the bottom.<br /> |
| 1087 | 1087 | Legend: (cur) = difference with current version, |
| 1088 | 1088 | (last) = difference with preceding version, M = minor edit.', |
| 1089 | | -'history_copyright' => '-', |
| 1090 | | -'deletedrev' => '[deleted]', |
| 1091 | | -'histfirst' => 'Earliest', |
| 1092 | | -'histlast' => 'Latest', |
| 1093 | | -'historysize' => '($1 bytes)', |
| 1094 | | -'historyempty' => '(empty)', |
| | 1089 | +'history_copyright' => '-', # don't translate or duplicate this message to other languages |
| | 1090 | +'deletedrev' => '[deleted]', |
| | 1091 | +'histfirst' => 'Earliest', |
| | 1092 | +'histlast' => 'Latest', |
| | 1093 | +'historysize' => '($1 bytes)', |
| | 1094 | +'historyempty' => '(empty)', |
| 1095 | 1095 | |
| 1096 | 1096 | # Revision feed |
| 1097 | | -# |
| 1098 | 1097 | 'history-feed-title' => 'Revision history', |
| 1099 | 1098 | 'history-feed-description' => 'Revision history for this page on the wiki', |
| 1100 | 1099 | 'history-feed-item-nocomment' => '$1 at $2', # user at time |
| 1101 | | -'history-feed-empty' => 'The requested page doesn\'t exist. |
| | 1100 | +'history-feed-empty' => "The requested page doesn't exist. |
| 1102 | 1101 | It may have been deleted from the wiki, or renamed. |
| 1103 | | -Try [[Special:Search|searching on the wiki]] for relevant new pages.', |
| | 1102 | +Try [[Special:Search|searching on the wiki]] for relevant new pages.", |
| 1104 | 1103 | |
| 1105 | 1104 | # Revision deletion |
| 1106 | | -# |
| 1107 | 1105 | 'rev-deleted-comment' => '(comment removed)', |
| 1108 | 1106 | 'rev-deleted-user' => '(username removed)', |
| 1109 | 1107 | 'rev-deleted-event' => '(entry removed)', |
| — | — | @@ -1119,19 +1117,19 @@ |
| 1120 | 1118 | 'revisiondelete' => 'Delete/undelete revisions', |
| 1121 | 1119 | 'revdelete-nooldid-title' => 'No target revision', |
| 1122 | 1120 | 'revdelete-nooldid-text' => 'You have either not specified a target revision(s) to perform this |
| 1123 | | -function on or the specified revision does not exist.', |
| 1124 | | -'revdelete-selected' => "{{PLURAL:$2|Selected revision|Selected revisions}} of '''$1:'''", |
| 1125 | | -'logdelete-selected' => "{{PLURAL:$2|Selected log event|Selected log events}} for '''$1:'''", |
| 1126 | | -'revdelete-text' => "Deleted revisions and events will still appear in the page history and logs, |
| | 1121 | +function, the specified revision does not exist, or you are attempting to hide the current revision.', |
| | 1122 | +'revdelete-selected' => "{{PLURAL:$2|Selected revision|Selected revisions}} of '''[[$1]]''':", |
| | 1123 | +'logdelete-selected' => "{{PLURAL:$2|Selected log event|Selected log events}} for '''$1''':", |
| | 1124 | +'revdelete-text' => 'Deleted revisions and events will still appear in the page history and logs, |
| 1127 | 1125 | but parts of their content will be inaccessible to the public. |
| 1128 | 1126 | |
| 1129 | 1127 | Other admins on this wiki will still be able to access the hidden content and can |
| 1130 | | -undelete it again through this same interface, unless additional restrictions are set.", |
| | 1128 | +undelete it again through this same interface, unless additional restrictions are set.', |
| 1131 | 1129 | 'revdelete-legend' => 'Set restrictions:', |
| 1132 | 1130 | 'revdelete-hide-text' => 'Hide revision text', |
| 1133 | 1131 | 'revdelete-hide-name' => 'Hide action and target', |
| 1134 | 1132 | 'revdelete-hide-comment' => 'Hide edit comment', |
| 1135 | | -'revdelete-hide-user' => 'Hide editor\'s username/IP', |
| | 1133 | +'revdelete-hide-user' => "Hide editor's username/IP", |
| 1136 | 1134 | 'revdelete-hide-restricted' => 'Apply these restrictions to Sysops and lock this interface', |
| 1137 | 1135 | 'revdelete-suppress' => 'Suppress data from sysops as well as others', |
| 1138 | 1136 | 'revdelete-hide-image' => 'Hide file content', |
| — | — | @@ -1142,12 +1140,11 @@ |
| 1143 | 1141 | 'logdelete-logentry' => 'changed event visibility of [[$1]]', |
| 1144 | 1142 | 'revdelete-logaction' => '$1 {{PLURAL:$1|revision|revisions}} set to mode $2', |
| 1145 | 1143 | 'logdelete-logaction' => '$1 {{PLURAL:$1|event|events}} to [[$3]] set to mode $2', |
| 1146 | | -'revdelete-success' => 'Revision visibility successfully set.', |
| 1147 | | -'logdelete-success' => 'Event visibility successfully set.', |
| | 1144 | +'revdelete-success' => "'''Revision visibility successfully set.'''", |
| | 1145 | +'logdelete-success' => "'''Event visibility successfully set.'''", |
| 1148 | 1146 | |
| 1149 | 1147 | # Oversight log |
| 1150 | | -# |
| 1151 | | -'oversightlog' => 'Oversight log', |
| | 1148 | +'oversightlog' => 'Oversight log', |
| 1152 | 1149 | 'overlogpagetext' => 'Below is a list of the most recent deletions and blocks involving items |
| 1153 | 1150 | hidden from Sysops. Automatically blocked IP addresses are not listed. See the [[Special:Ipblocklist|IP block list]] |
| 1154 | 1151 | for the list of currently operational bans and blocks. Note that deleted pages listed here will not be listed using |
| — | — | @@ -1157,51 +1154,48 @@ |
| 1158 | 1155 | will remain hidden only as long as they are blocked.', |
| 1159 | 1156 | |
| 1160 | 1157 | # Diffs |
| 1161 | | -# |
| 1162 | | -'difference' => '(Difference between revisions)', |
| 1163 | | -'loadingrev' => 'loading revision for diff', |
| 1164 | | -'lineno' => "Line $1:", |
| 1165 | | -'editcurrent' => 'Edit the current version of this page', |
| | 1158 | +'difference' => '(Difference between revisions)', |
| | 1159 | +'loadingrev' => 'loading revision for diff', |
| | 1160 | +'lineno' => 'Line $1:', |
| | 1161 | +'editcurrent' => 'Edit the current version of this page', |
| 1166 | 1162 | 'selectnewerversionfordiff' => 'Select a newer version for comparison', |
| 1167 | 1163 | 'selectolderversionfordiff' => 'Select an older version for comparison', |
| 1168 | | -'compareselectedversions' => 'Compare selected versions', |
| 1169 | | -'editundo' => 'undo', |
| 1170 | | -'diff-multi' => "({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} not shown.)", |
| | 1164 | +'compareselectedversions' => 'Compare selected versions', |
| | 1165 | +'editundo' => 'undo', |
| | 1166 | +'diff-multi' => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} not shown.)', |
| 1171 | 1167 | |
| 1172 | 1168 | # Search results |
| 1173 | | -# |
| 1174 | | -'searchresults' => 'Search results', |
| 1175 | | -'searchresulttext' => "For more information about searching {{SITENAME}}, see [[{{MediaWiki:helppage}}|{{int:help}}]].", |
| 1176 | | -'searchsubtitle' => "You searched for '''[[:$1]]'''", |
| | 1169 | +'searchresults' => 'Search results', |
| | 1170 | +'searchresulttext' => 'For more information about searching {{SITENAME}}, see [[{{MediaWiki:helppage}}|{{int:help}}]].', |
| | 1171 | +'searchsubtitle' => "You searched for '''[[:$1]]'''", |
| 1177 | 1172 | 'searchsubtitleinvalid' => "You searched for '''$1'''", |
| 1178 | | -'badquery' => 'Badly formed search query', |
| 1179 | | -'badquerytext' => 'We could not process your query. |
| | 1173 | +'badquery' => 'Badly formed search query', |
| | 1174 | +'badquerytext' => 'We could not process your query. |
| 1180 | 1175 | This is probably because you have attempted to search for a |
| 1181 | 1176 | word fewer than three letters long, which is not yet supported. |
| 1182 | 1177 | It could also be that you have mistyped the expression, for |
| 1183 | 1178 | example "fish and and scales". |
| 1184 | 1179 | Please try another query.', |
| 1185 | | -'matchtotals' => "The query \"$1\" matched $2 page titles |
| 1186 | | -and the text of $3 pages.", |
| 1187 | | -'noexactmatch' => "'''There is no page titled \"$1\".''' You can [[:$1|create this page]].", |
| 1188 | | -'titlematches' => 'Article title matches', |
| 1189 | | -'notitlematches' => 'No page title matches', |
| 1190 | | -'textmatches' => 'Page text matches', |
| 1191 | | -'notextmatches' => 'No page text matches', |
| 1192 | | -'prevn' => "previous $1", |
| 1193 | | -'nextn' => "next $1", |
| 1194 | | -'viewprevnext' => "View ($1) ($2) ($3).", |
| 1195 | | -'showingresults' => "Showing below up to {{PLURAL:$1|'''1''' result|'''$1''' results}} starting with #'''$2'''.", |
| 1196 | | -'showingresultsnum' => "Showing below {{PLURAL:$3|'''1''' result|'''$3''' results}} starting with #'''$2'''.", |
| 1197 | | -'nonefound' => "'''Note''': Unsuccessful searches are |
| | 1180 | +'matchtotals' => 'The query "$1" matched $2 page titles |
| | 1181 | +and the text of $3 pages.', |
| | 1182 | +'noexactmatch' => "'''There is no page titled \"\$1\".''' You can [[:\$1|create this page]].", |
| | 1183 | +'titlematches' => 'Article title matches', |
| | 1184 | +'notitlematches' => 'No page title matches', |
| | 1185 | +'textmatches' => 'Page text matches', |
| | 1186 | +'notextmatches' => 'No page text matches', |
| | 1187 | +'prevn' => 'previous $1', |
| | 1188 | +'nextn' => 'next $1', |
| | 1189 | +'viewprevnext' => 'View ($1) ($2) ($3).', |
| | 1190 | +'showingresults' => "Showing below up to {{PLURAL:$1|'''1''' result|'''$1''' results}} starting with #'''$2'''.", |
| | 1191 | +'showingresultsnum' => "Showing below {{PLURAL:$3|'''1''' result|'''$3''' results}} starting with #'''$2'''.", |
| | 1192 | +'nonefound' => "'''Note''': Unsuccessful searches are |
| 1198 | 1193 | often caused by searching for common words like \"have\" and \"from\", |
| 1199 | 1194 | which are not indexed, or by specifying more than one search term (only pages |
| 1200 | 1195 | containing all of the search terms will appear in the result).", |
| 1201 | | -'powersearch' => 'Search', |
| 1202 | | -'powersearchtext' => "Search in namespaces:<br />$1<br />$2 List redirects<br />Search for $3 $9", |
| 1203 | | -'searchdisabled' => '{{SITENAME}} search is disabled. You can search via Google in the meantime. Note that their indexes of {{SITENAME}} content may be out of date.', |
| 1204 | | - |
| 1205 | | -'googlesearch' => ' |
| | 1196 | +'powersearch' => 'Search', |
| | 1197 | +'powersearchtext' => 'Search in namespaces:<br />$1<br />$2 List redirects<br />Search for $3 $9', |
| | 1198 | +'searchdisabled' => '{{SITENAME}} search is disabled. You can search via Google in the meantime. Note that their indexes of {{SITENAME}} content may be out of date.', |
| | 1199 | +'googlesearch' => ' |
| 1206 | 1200 | <form method="get" action="http://www.google.com/search" id="googlesearch"> |
| 1207 | 1201 | <input type="hidden" name="domains" value="{{SERVER}}" /> |
| 1208 | 1202 | <input type="hidden" name="num" value="50" /> |
| — | — | @@ -1214,96 +1208,95 @@ |
| 1215 | 1209 | <input type="radio" name="sitesearch" id="gwiki" value="{{SERVER}}" checked="checked" /><label for="gwiki">{{SITENAME}}</label> |
| 1216 | 1210 | <input type="radio" name="sitesearch" id="gWWW" value="" /><label for="gWWW">WWW</label> |
| 1217 | 1211 | </div> |
| 1218 | | -</form>', |
| 1219 | | -'blanknamespace' => '(Main)', |
| | 1212 | +</form>', # don't translate or duplicate this message to other languages |
| | 1213 | +'blanknamespace' => '(Main)', |
| 1220 | 1214 | |
| 1221 | 1215 | # Preferences page |
| 1222 | | -# |
| 1223 | | -'preferences' => 'Preferences', |
| 1224 | | -'preferences-summary' => '', |
| 1225 | | -'mypreferences' => 'My preferences', |
| 1226 | | -'prefsnologin' => 'Not logged in', |
| 1227 | | -'prefsnologintext' => "You must be [[Special:Userlogin|logged in]] to set user preferences.", |
| 1228 | | -'prefsreset' => 'Preferences have been reset from storage.', |
| 1229 | | -'qbsettings' => 'Quickbar', |
| 1230 | | -'qbsettings-none' => 'None', |
| 1231 | | -'qbsettings-fixedleft' => 'Fixed left', |
| 1232 | | -'qbsettings-fixedright' => 'Fixed right', |
| 1233 | | -'qbsettings-floatingleft' => 'Floating left', |
| 1234 | | -'qbsettings-floatingright' => 'Floating right', |
| 1235 | | -'changepassword' => 'Change password', |
| 1236 | | -'skin' => 'Skin', |
| 1237 | | -'math' => 'Math', |
| 1238 | | -'dateformat' => 'Date format', |
| 1239 | | -'datedefault' => 'No preference', |
| 1240 | | -'datetime' => 'Date and time', |
| 1241 | | -'math_failure' => 'Failed to parse', |
| 1242 | | -'math_unknown_error' => 'unknown error', |
| 1243 | | -'math_unknown_function' => 'unknown function', |
| 1244 | | -'math_lexing_error' => 'lexing error', |
| 1245 | | -'math_syntax_error' => 'syntax error', |
| 1246 | | -'math_image_error' => 'PNG conversion failed; check for correct installation of latex, dvips, gs, and convert', |
| 1247 | | -'math_bad_tmpdir' => 'Can\'t write to or create math temp directory', |
| 1248 | | -'math_bad_output' => 'Can\'t write to or create math output directory', |
| 1249 | | -'math_notexvc' => 'Missing texvc executable; please see math/README to configure.', |
| 1250 | | -'prefs-personal' => 'User profile', |
| 1251 | | -'prefs-rc' => 'Recent changes', |
| 1252 | | -'prefs-watchlist' => 'Watchlist', |
| 1253 | | -'prefs-watchlist-days' => 'Number of days to show in watchlist:', |
| 1254 | | -'prefs-watchlist-edits' => 'Number of edits to show in expanded watchlist:', |
| 1255 | | -'prefs-misc' => 'Misc', |
| 1256 | | -'saveprefs' => 'Save', |
| 1257 | | -'resetprefs' => 'Reset', |
| 1258 | | -'oldpassword' => 'Old password:', |
| 1259 | | -'newpassword' => 'New password:', |
| 1260 | | -'retypenew' => 'Retype new password:', |
| 1261 | | -'textboxsize' => 'Editing', |
| 1262 | | -'rows' => 'Rows:', |
| 1263 | | -'columns' => 'Columns:', |
| 1264 | | -'searchresultshead' => 'Search', |
| 1265 | | -'resultsperpage' => 'Hits per page:', |
| 1266 | | -'contextlines' => 'Lines per hit:', |
| 1267 | | -'contextchars' => 'Context per line:', |
| 1268 | | -'stubthreshold' => 'Threshold for stub display:', |
| 1269 | | -'recentchangesdays' => 'Days to show in recent changes:', |
| 1270 | | -'recentchangescount' => 'Number of edits to show in recent changes:', |
| 1271 | | -'savedprefs' => 'Your preferences have been saved.', |
| 1272 | | -'timezonelegend' => 'Time zone', |
| 1273 | | -'timezonetext' => 'The number of hours your local time differs from server time (UTC).', |
| 1274 | | -'localtime' => 'Local time', |
| 1275 | | -'timezoneoffset' => 'Offset¹', |
| 1276 | | -'servertime' => 'Server time', |
| 1277 | | -'guesstimezone' => 'Fill in from browser', |
| 1278 | | -'allowemail' => 'Enable e-mail from other users', |
| 1279 | | -'defaultns' => 'Search in these namespaces by default:', |
| 1280 | | -'default' => 'default', |
| 1281 | | -'files' => 'Files', |
| | 1216 | +'preferences' => 'Preferences', |
| | 1217 | +'preferences-summary' => '', # only translate this message to other languages if you have to change it |
| | 1218 | +'mypreferences' => 'My preferences', |
| | 1219 | +'prefsnologin' => 'Not logged in', |
| | 1220 | +'prefsnologintext' => 'You must be [[Special:Userlogin|logged in]] to set user preferences.', |
| | 1221 | +'prefsreset' => 'Preferences have been reset from storage.', |
| | 1222 | +'qbsettings' => 'Quickbar', |
| | 1223 | +'qbsettings-none' => 'None', |
| | 1224 | +'qbsettings-fixedleft' => 'Fixed left', |
| | 1225 | +'qbsettings-fixedright' => 'Fixed right', |
| | 1226 | +'qbsettings-floatingleft' => 'Floating left', |
| | 1227 | +'qbsettings-floatingright' => 'Floating right', |
| | 1228 | +'changepassword' => 'Change password', |
| | 1229 | +'skin' => 'Skin', |
| | 1230 | +'math' => 'Math', |
| | 1231 | +'dateformat' => 'Date format', |
| | 1232 | +'datedefault' => 'No preference', |
| | 1233 | +'datetime' => 'Date and time', |
| | 1234 | +'math_failure' => 'Failed to parse', |
| | 1235 | +'math_unknown_error' => 'unknown error', |
| | 1236 | +'math_unknown_function' => 'unknown function', |
| | 1237 | +'math_lexing_error' => 'lexing error', |
| | 1238 | +'math_syntax_error' => 'syntax error', |
| | 1239 | +'math_image_error' => 'PNG conversion failed; check for correct installation of latex, dvips, gs, and convert', |
| | 1240 | +'math_bad_tmpdir' => "Can't write to or create math temp directory", |
| | 1241 | +'math_bad_output' => "Can't write to or create math output directory", |
| | 1242 | +'math_notexvc' => 'Missing texvc executable; please see math/README to configure.', |
| | 1243 | +'prefs-personal' => 'User profile', |
| | 1244 | +'prefs-rc' => 'Recent changes', |
| | 1245 | +'prefs-watchlist' => 'Watchlist', |
| | 1246 | +'prefs-watchlist-days' => 'Number of days to show in watchlist:', |
| | 1247 | +'prefs-watchlist-edits' => 'Number of edits to show in expanded watchlist:', |
| | 1248 | +'prefs-misc' => 'Misc', |
| | 1249 | +'saveprefs' => 'Save', |
| | 1250 | +'resetprefs' => 'Reset', |
| | 1251 | +'oldpassword' => 'Old password:', |
| | 1252 | +'newpassword' => 'New password:', |
| | 1253 | +'retypenew' => 'Retype new password:', |
| | 1254 | +'textboxsize' => 'Editing', |
| | 1255 | +'rows' => 'Rows:', |
| | 1256 | +'columns' => 'Columns:', |
| | 1257 | +'searchresultshead' => 'Search', |
| | 1258 | +'resultsperpage' => 'Hits per page:', |
| | 1259 | +'contextlines' => 'Lines per hit:', |
| | 1260 | +'contextchars' => 'Context per line:', |
| | 1261 | +'stub-threshold' => 'Threshold for <a href="#" class="stub">stub link</a> formatting:', |
| | 1262 | +'recentchangesdays' => 'Days to show in recent changes:', |
| | 1263 | +'recentchangescount' => 'Number of edits to show in recent changes:', |
| | 1264 | +'savedprefs' => 'Your preferences have been saved.', |
| | 1265 | +'timezonelegend' => 'Time zone', |
| | 1266 | +'timezonetext' => 'The number of hours your local time differs from server time (UTC).', |
| | 1267 | +'localtime' => 'Local time', |
| | 1268 | +'timezoneoffset' => 'Offset¹', |
| | 1269 | +'servertime' => 'Server time', |
| | 1270 | +'guesstimezone' => 'Fill in from browser', |
| | 1271 | +'allowemail' => 'Enable e-mail from other users', |
| | 1272 | +'defaultns' => 'Search in these namespaces by default:', |
| | 1273 | +'default' => 'default', |
| | 1274 | +'files' => 'Files', |
| 1282 | 1275 | |
| 1283 | 1276 | # User rights |
| 1284 | | -'userrights-lookup-user' => 'Manage user groups', |
| 1285 | | -'userrights-user-editname' => 'Enter a username:', |
| 1286 | | -'editusergroup' => 'Edit User Groups', |
| 1287 | | -'userrights-editusergroup' => 'Edit user groups', |
| 1288 | | -'saveusergroups' => 'Save User Groups', |
| 1289 | | -'userrights-groupsmember' => 'Member of:', |
| | 1277 | +'userrights-lookup-user' => 'Manage user groups', |
| | 1278 | +'userrights-user-editname' => 'Enter a username:', |
| | 1279 | +'editusergroup' => 'Edit User Groups', |
| | 1280 | +'userrights-editusergroup' => 'Edit user groups', |
| | 1281 | +'saveusergroups' => 'Save User Groups', |
| | 1282 | +'userrights-groupsmember' => 'Member of:', |
| 1290 | 1283 | 'userrights-groupsavailable' => 'Available groups:', |
| 1291 | | -'userrights-groupshelp' => 'Select groups you want the user to be removed from or added to. |
| | 1284 | +'userrights-groupshelp' => 'Select groups you want the user to be removed from or added to. |
| 1292 | 1285 | Unselected groups will not be changed. You can deselect a group with CTRL + Left Click', |
| 1293 | | -'userrights-reason' => 'Reason for change:', |
| | 1286 | +'userrights-reason' => 'Reason for change:', |
| 1294 | 1287 | |
| 1295 | 1288 | # Groups |
| 1296 | | -'group' => 'Group:', |
| 1297 | | -'group-bot' => 'Bots', |
| 1298 | | -'group-sysop' => 'Sysops', |
| 1299 | | -'group-bureaucrat' => 'Bureaucrats', |
| 1300 | | -'group-all' => '(all)', |
| | 1289 | +'group' => 'Group:', |
| | 1290 | +'group-bot' => 'Bots', |
| | 1291 | +'group-sysop' => 'Sysops', |
| | 1292 | +'group-bureaucrat' => 'Bureaucrats', |
| | 1293 | +'group-all' => '(all)', |
| 1301 | 1294 | |
| 1302 | 1295 | 'group-bot-member' => 'Bot', |
| 1303 | 1296 | 'group-sysop-member' => 'Sysop', |
| 1304 | 1297 | 'group-bureaucrat-member' => 'Bureaucrat', |
| 1305 | 1298 | |
| 1306 | | -'grouppage-bot' => '{{ns:project}}:Bots', |
| 1307 | | -'grouppage-sysop' => '{{ns:project}}:Administrators', |
| | 1299 | +'grouppage-bot' => '{{ns:project}}:Bots', |
| | 1300 | +'grouppage-sysop' => '{{ns:project}}:Administrators', |
| 1308 | 1301 | 'grouppage-bureaucrat' => '{{ns:project}}:Bureaucrats', |
| 1309 | 1302 | |
| 1310 | 1303 | 'oversight' => 'Oversight', |
| — | — | @@ -1318,459 +1311,457 @@ |
| 1319 | 1312 | 'rightsnone' => '(none)', |
| 1320 | 1313 | |
| 1321 | 1314 | # Recent changes |
| 1322 | | -# |
| 1323 | | -'nchanges' => '$1 {{PLURAL:$1|change|changes}}', |
| 1324 | | -'recentchanges' => 'Recent changes', |
| 1325 | | -'recentchanges-url' => 'Special:Recentchanges', |
| 1326 | | -'recentchangestext' => 'Track the most recent changes to the wiki on this page.', |
| 1327 | | -'recentchanges-feed-description' => 'Track the most recent changes to the wiki in this feed.', |
| 1328 | | -'rcnote' => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|last '''$2''' days}}, as of $3.", |
| 1329 | | -'rcnotefrom' => "Below are the changes since <b>$2</b> (up to <b>$1</b> shown).", |
| 1330 | | -'rclistfrom' => "Show new changes starting from $1", |
| 1331 | | -'rcshowhideminor' => '$1 minor edits', |
| 1332 | | -'rcshowhidebots' => '$1 bots', |
| 1333 | | -'rcshowhideliu' => '$1 logged-in users', |
| 1334 | | -'rcshowhideanons' => '$1 anonymous users', |
| 1335 | | -'rcshowhidepatr' => '$1 patrolled edits', |
| 1336 | | -'rcshowhidemine' => '$1 my edits', |
| 1337 | | -'rclinks' => "Show last $1 changes in last $2 days<br />$3", |
| 1338 | | -'diff' => 'diff', |
| 1339 | | -'hist' => 'hist', |
| 1340 | | -'hide' => 'Hide', |
| 1341 | | -'show' => 'Show', |
| 1342 | | -'minoreditletter' => 'm', |
| 1343 | | -'newpageletter' => 'N', |
| 1344 | | -'boteditletter' => 'b', |
| 1345 | | -'sectionlink' => '→', |
| 1346 | | -'number_of_watching_users_RCview' => '[$1]', |
| 1347 | | -'number_of_watching_users_pageview' => '[$1 watching user/s]', |
| 1348 | | -'rc_categories' => 'Limit to categories (separate with "|")', |
| 1349 | | -'rc_categories_any' => 'Any', |
| 1350 | | -'rc-change-size' => '$1', |
| | 1315 | +'nchanges' => '$1 {{PLURAL:$1|change|changes}}', |
| | 1316 | +'recentchanges' => 'Recent changes', |
| | 1317 | +'recentchanges-url' => 'Special:Recentchanges', # don't translate or duplicate this message to other languages |
| | 1318 | +'recentchangestext' => 'Track the most recent changes to the wiki on this page.', |
| | 1319 | +'recentchanges-feed-description' => 'Track the most recent changes to the wiki in this feed.', |
| | 1320 | +'rcnote' => "Below {{PLURAL:$1|is '''1''' change|are the last '''$1''' changes}} in the last {{PLURAL:$2|day|'''$2''' days}}, as of $3.", |
| | 1321 | +'rcnotefrom' => 'Below are the changes since <b>$2</b> (up to <b>$1</b> shown).', |
| | 1322 | +'rclistfrom' => 'Show new changes starting from $1', |
| | 1323 | +'rcshowhideminor' => '$1 minor edits', |
| | 1324 | +'rcshowhidebots' => '$1 bots', |
| | 1325 | +'rcshowhideliu' => '$1 logged-in users', |
| | 1326 | +'rcshowhideanons' => '$1 anonymous users', |
| | 1327 | +'rcshowhidepatr' => '$1 patrolled edits', |
| | 1328 | +'rcshowhidemine' => '$1 my edits', |
| | 1329 | +'rclinks' => 'Show last $1 changes in last $2 days<br />$3', |
| | 1330 | +'diff' => 'diff', |
| | 1331 | +'hist' => 'hist', |
| | 1332 | +'hide' => 'Hide', |
| | 1333 | +'show' => 'Show', |
| | 1334 | +'minoreditletter' => 'm', |
| | 1335 | +'newpageletter' => 'N', |
| | 1336 | +'boteditletter' => 'b', |
| | 1337 | +'sectionlink' => '→', # only translate this message to other languages if you have to change it |
| | 1338 | +'number_of_watching_users_RCview' => '[$1]', # don't translate or duplicate this message to other languages |
| | 1339 | +'number_of_watching_users_pageview' => '[$1 watching user/s]', |
| | 1340 | +'rc_categories' => 'Limit to categories (separate with "|")', |
| | 1341 | +'rc_categories_any' => 'Any', |
| | 1342 | +'rc-change-size' => '$1', # only translate this message to other languages if you have to change it |
| 1351 | 1343 | |
| 1352 | | -# Recentchangeslinked |
| 1353 | | -'recentchangeslinked' => 'Related changes', |
| 1354 | | -'recentchangeslinked-noresult' => 'No changes on linked pages during the given period.', |
| 1355 | | -'recentchangeslinked-summary' => "This special page lists the last changes on pages who are linked. Pages on your watchlist are '''bold'''.", |
| | 1344 | +# Recent changes linked |
| | 1345 | +'recentchangeslinked' => 'Related changes', |
| | 1346 | +'recentchangeslinked-noresult' => 'No changes on linked pages during the given period.', |
| | 1347 | +'recentchangeslinked-summary' => "This special page lists the last changes on pages who are linked. Pages on your watchlist are '''bold'''.", |
| 1356 | 1348 | |
| 1357 | 1349 | # Upload |
| 1358 | | -# |
| 1359 | | -'upload' => 'Upload file', |
| 1360 | | -'uploadbtn' => 'Upload file', |
| 1361 | | -'reupload' => 'Re-upload', |
| 1362 | | -'reuploaddesc' => 'Return to the upload form.', |
| 1363 | | -'uploadnologin' => 'Not logged in', |
| 1364 | | -'uploadnologintext' => "You must be [[Special:Userlogin|logged in]] |
| 1365 | | -to upload files.", |
| 1366 | | -'upload_directory_read_only' => 'The upload directory ($1) is not writable by the webserver.', |
| 1367 | | -'uploaderror' => 'Upload error', |
| 1368 | | -'uploadtext' => "Use the form below to upload files, to view or search previously uploaded images go to the [[Special:Imagelist|list of uploaded files]], uploads and deletions are also logged in the [[Special:Log/upload|upload log]]. |
| | 1350 | +'upload' => 'Upload file', |
| | 1351 | +'uploadbtn' => 'Upload file', |
| | 1352 | +'reupload' => 'Re-upload', |
| | 1353 | +'reuploaddesc' => 'Return to the upload form.', |
| | 1354 | +'uploadnologin' => 'Not logged in', |
| | 1355 | +'uploadnologintext' => 'You must be [[Special:Userlogin|logged in]] |
| | 1356 | +to upload files.', |
| | 1357 | +'upload_directory_read_only' => 'The upload directory ($1) is not writable by the webserver.', |
| | 1358 | +'uploaderror' => 'Upload error', |
| | 1359 | +'uploadtext' => "Use the form below to upload files, to view or search previously uploaded images go to the [[Special:Imagelist|list of uploaded files]], uploads and deletions are also logged in the [[Special:Log/upload|upload log]]. |
| 1369 | 1360 | |
| 1370 | 1361 | To include the image in a page, use a link in the form |
| 1371 | 1362 | '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.jpg]]</nowiki>''', |
| 1372 | 1363 | '''<nowiki>[[</nowiki>{{ns:image}}<nowiki>:File.png|alt text]]</nowiki>''' or |
| 1373 | 1364 | '''<nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki>''' for directly linking to the file.", |
| 1374 | | -'uploadlog' => 'upload log', |
| 1375 | | -'uploadlogpage' => 'Upload log', |
| 1376 | | -'uploadlogpagetext' => 'Below is a list of the most recent file uploads.', |
| 1377 | | -'filename' => 'Filename', |
| 1378 | | -'filedesc' => 'Summary', |
| 1379 | | -'fileuploadsummary' => 'Summary:', |
| 1380 | | -'filestatus' => 'Copyright status', |
| 1381 | | -'filesource' => 'Source', |
| 1382 | | -'copyrightpage' => "Project:Copyrights", |
| 1383 | | -'copyrightpagename' => "{{SITENAME}} copyright", |
| 1384 | | -'uploadedfiles' => 'Uploaded files', |
| 1385 | | -'ignorewarning' => 'Ignore warning and save file anyway.', |
| 1386 | | -'ignorewarnings' => 'Ignore any warnings', |
| 1387 | | -'minlength' => 'File names must be at least three letters.', |
| 1388 | | -'illegalfilename' => 'The filename "$1" contains characters that are not allowed in page titles. Please rename the file and try uploading it again.', |
| 1389 | | -'badfilename' => 'File name has been changed to "$1".', |
| | 1365 | +'uploadlog' => 'upload log', |
| | 1366 | +'uploadlogpage' => 'Upload log', |
| | 1367 | +'uploadlogpagetext' => 'Below is a list of the most recent file uploads.', |
| | 1368 | +'filename' => 'Filename', |
| | 1369 | +'filedesc' => 'Summary', |
| | 1370 | +'fileuploadsummary' => 'Summary:', |
| | 1371 | +'filestatus' => 'Copyright status', |
| | 1372 | +'filesource' => 'Source', |
| | 1373 | +'uploadedfiles' => 'Uploaded files', |
| | 1374 | +'ignorewarning' => 'Ignore warning and save file anyway.', |
| | 1375 | +'ignorewarnings' => 'Ignore any warnings', |
| | 1376 | +'minlength' => 'File names must be at least three letters.', |
| | 1377 | +'illegalfilename' => 'The filename "$1" contains characters that are not allowed in page titles. Please rename the file and try uploading it again.', |
| | 1378 | +'badfilename' => 'File name has been changed to "$1".', |
| 1390 | 1379 | 'filetype-badmime' => 'Files of the MIME type "$1" are not allowed to be uploaded.', |
| 1391 | | -'filetype-badtype' => "'''\".$1\"''' is an unwanted file type |
| 1392 | | -: List of allowed file types: $2", |
| | 1380 | +'filetype-badtype' => "'''\".\$1\"''' is an unwanted file type |
| | 1381 | +: List of allowed file types: \$2", |
| 1393 | 1382 | 'filetype-missing' => 'The file has no extension (like ".jpg").', |
| 1394 | | -'large-file' => 'It is recommended that files are no larger than $1; this file is $2.', |
| 1395 | | -'largefileserver' => 'This file is bigger than the server is configured to allow.', |
| 1396 | | -'emptyfile' => 'The file you uploaded seems to be empty. This might be due to a typo in the file name. Please check whether you really want to upload this file.', |
| 1397 | | -'fileexists' => 'A file with this name exists already, please check <strong><tt>$1</tt></strong> if you are not sure if you want to change it.', |
| | 1383 | +'large-file' => 'It is recommended that files are no larger than $1; this file is $2.', |
| | 1384 | +'largefileserver' => 'This file is bigger than the server is configured to allow.', |
| | 1385 | +'emptyfile' => 'The file you uploaded seems to be empty. This might be due to a typo in the file name. Please check whether you really want to upload this file.', |
| | 1386 | +'fileexists' => 'A file with this name exists already, please check <strong><tt>$1</tt></strong> if you are not sure if you want to change it.', |
| 1398 | 1387 | 'fileexists-extension' => 'A file with a similar name exists:<br /> |
| 1399 | 1388 | Name of the uploading file: <strong><tt>$1</tt></strong><br /> |
| 1400 | 1389 | Name of the existing file: <strong><tt>$2</tt></strong><br /> |
| 1401 | 1390 | Please choose a different name.', |
| 1402 | | -'fileexists-thumb' => "'''<center>Existing image</center>'''", |
| 1403 | | -'fileexists-thumbnail-yes' => "The file seems to be an image of reduced size <i>(thumbnail)</i>. Please check the file <strong><tt>$1</tt></strong>.<br /> |
| 1404 | | -If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.", |
| 1405 | | -'file-thumbnail-no' => "The filename begins with <strong><tt>$1</tt></strong>. It seems to be an image of reduced size <i>(thumbnail)</i>. |
| 1406 | | -If you have this image in full resolution upload this one, otherwise change the file name please.", |
| 1407 | | -'fileexists-forbidden' => 'A file with this name exists already; please go back and upload this file under a new name. [[Image:$1|thumb|center|$1]]', |
| 1408 | | -'fileexists-shared-forbidden' => 'A file with this name exists already in the shared file repository; please go back and upload this file under a new name. [[Image:$1|thumb|center|$1]]', |
| 1409 | | -'successfulupload' => 'Successful upload', |
| 1410 | | -'fileuploaded' => "File $1 uploaded successfully. |
| | 1391 | +'fileexists-thumb' => "'''<center>Existing image</center>'''", |
| | 1392 | +'fileexists-thumbnail-yes' => 'The file seems to be an image of reduced size <i>(thumbnail)</i>. Please check the file <strong><tt>$1</tt></strong>.<br /> |
| | 1393 | +If the checked file is the same image of original size it is not necessary to upload an extra thumbnail.', |
| | 1394 | +'file-thumbnail-no' => 'The filename begins with <strong><tt>$1</tt></strong>. It seems to be an image of reduced size <i>(thumbnail)</i>. |
| | 1395 | +If you have this image in full resolution upload this one, otherwise change the file name please.', |
| | 1396 | +'fileexists-forbidden' => 'A file with this name exists already; please go back and upload this file under a new name. [[Image:$1|thumb|center|$1]]', |
| | 1397 | +'fileexists-shared-forbidden' => 'A file with this name exists already in the shared file repository; please go back and upload this file under a new name. [[Image:$1|thumb|center|$1]]', |
| | 1398 | +'successfulupload' => 'Successful upload', |
| | 1399 | +'fileuploaded' => 'File $1 uploaded successfully. |
| 1411 | 1400 | Please follow this link: $2 to the description page and fill |
| 1412 | 1401 | in information about the file, such as where it came from, when it was |
| 1413 | | -created and by whom, and anything else you may know about it. If this is an image, you can insert it like this: <tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:$1|thumb|Description]]</nowiki></tt>", |
| 1414 | | -'uploadwarning' => 'Upload warning', |
| 1415 | | -'savefile' => 'Save file', |
| 1416 | | -'uploadedimage' => "uploaded \"[[$1]]\"", |
| 1417 | | -'uploaddisabled' => 'Uploads disabled', |
| 1418 | | -'uploaddisabledtext' => 'File uploads are disabled on this wiki.', |
| 1419 | | -'uploadscripted' => 'This file contains HTML or script code that may be erroneously be interpreted by a web browser.', |
| 1420 | | -'uploadcorrupt' => 'The file is corrupt or has an incorrect extension. Please check the file and upload again.', |
| 1421 | | -'uploadvirus' => 'The file contains a virus! Details: $1', |
| 1422 | | -'sourcefilename' => 'Source filename', |
| 1423 | | -'destfilename' => 'Destination filename', |
| 1424 | | -'watchthisupload' => 'Watch this page', |
| 1425 | | -'filewasdeleted' => 'A file of this name has been previously uploaded and subsequently deleted. You should check the $1 before proceeding to upload it again.', |
| | 1402 | +created and by whom, and anything else you may know about it. If this is an image, you can insert it like this: <tt><nowiki>[[</nowiki>{{ns:image}}<nowiki>:$1|thumb|Description]]</nowiki></tt>', |
| | 1403 | +'uploadwarning' => 'Upload warning', |
| | 1404 | +'savefile' => 'Save file', |
| | 1405 | +'uploadedimage' => 'uploaded "[[$1]]"', |
| | 1406 | +'uploaddisabled' => 'Uploads disabled', |
| | 1407 | +'uploaddisabledtext' => 'File uploads are disabled on this wiki.', |
| | 1408 | +'uploadscripted' => 'This file contains HTML or script code that may be erroneously be interpreted by a web browser.', |
| | 1409 | +'uploadcorrupt' => 'The file is corrupt or has an incorrect extension. Please check the file and upload again.', |
| | 1410 | +'uploadvirus' => 'The file contains a virus! Details: $1', |
| | 1411 | +'sourcefilename' => 'Source filename', |
| | 1412 | +'destfilename' => 'Destination filename', |
| | 1413 | +'watchthisupload' => 'Watch this page', |
| | 1414 | +'filewasdeleted' => 'A file of this name has been previously uploaded and subsequently deleted. You should check the $1 before proceeding to upload it again.', |
| 1426 | 1415 | |
| 1427 | | -'upload-proto-error' => 'Incorrect protocol', |
| | 1416 | +'upload-proto-error' => 'Incorrect protocol', |
| 1428 | 1417 | 'upload-proto-error-text' => 'Remote upload requires URLs beginning with <code>http://</code> or <code>ftp://</code>.', |
| 1429 | | -'upload-file-error' => 'Internal error', |
| 1430 | | -'upload-file-error-text' => 'An internal error occurred when attempting to create a temporary file on the server. Please contact a system administrator.', |
| 1431 | | -'upload-misc-error' => 'Unknown upload error', |
| 1432 | | -'upload-misc-error-text' => 'An unknown error occurred during the upload. Please verify that the URL is valid and accessible and try again. If the problem persists, contact a system administrator.', |
| 1433 | | -# Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html> |
| 1434 | | -'upload-curl-error6' => "Couldn't reach URL", |
| 1435 | | -'upload-curl-error6-text' => 'The URL provided could not be reached. Please double-check that the URL is correct and the site is up.', |
| 1436 | | -'upload-curl-error28' => 'Upload timeout', |
| | 1418 | +'upload-file-error' => 'Internal error', |
| | 1419 | +'upload-file-error-text' => 'An internal error occurred when attempting to create a temporary file on the server. Please contact a system administrator.', |
| | 1420 | +'upload-misc-error' => 'Unknown upload error', |
| | 1421 | +'upload-misc-error-text' => 'An unknown error occurred during the upload. Please verify that the URL is valid and accessible and try again. If the problem persists, contact a system administrator.', |
| | 1422 | + |
| | 1423 | +# Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html> |
| | 1424 | +'upload-curl-error6' => "Couldn't reach URL", |
| | 1425 | +'upload-curl-error6-text' => 'The URL provided could not be reached. Please double-check that the URL is correct and the site is up.', |
| | 1426 | +'upload-curl-error28' => 'Upload timeout', |
| 1437 | 1427 | 'upload-curl-error28-text' => 'The site took too long to respond. Please check the site is up, wait a short while and try again. You may want to try at a less busy time.', |
| 1438 | 1428 | |
| 1439 | | -'license' => 'Licensing', |
| 1440 | | -'nolicense' => 'None selected', |
| 1441 | | -'licenses' => '-', # Don't duplicate this in translations |
| 1442 | | -'upload_source_url' => ' (a valid, publicly accessible URL)', |
| | 1429 | +'license' => 'Licensing', |
| | 1430 | +'nolicense' => 'None selected', |
| | 1431 | +'licenses' => '-', # don't translate or duplicate this message to other languages |
| | 1432 | +'upload_source_url' => ' (a valid, publicly accessible URL)', |
| 1443 | 1433 | 'upload_source_file' => ' (a file on your computer)', |
| 1444 | 1434 | |
| 1445 | 1435 | # Image list |
| 1446 | | -# |
| 1447 | | -'imagelist' => 'File list', |
| 1448 | | -'imagelist-summary' => '', |
| 1449 | | -'imagelisttext' => "Below is a list of '''$1''' {{PLURAL:$1|file|files}} sorted $2.", |
| 1450 | | -'imagelistforuser' => "This shows only images uploaded by $1.", |
| 1451 | | -'getimagelist' => 'fetching file list', |
| 1452 | | -'ilsubmit' => 'Search', |
| 1453 | | -'showlast' => 'Show last $1 files sorted $2.', |
| 1454 | | -'byname' => 'by name', |
| 1455 | | -'bydate' => 'by date', |
| 1456 | | -'bysize' => 'by size', |
| 1457 | | -'imgdelete' => 'del', |
| 1458 | | -'imgdesc' => 'desc', |
| 1459 | | -'imgfile' => 'file', |
| 1460 | | -'imglegend' => 'Legend: (desc) = show/edit file description.', |
| 1461 | | -'imghistory' => 'File history', |
| 1462 | | -'revertimg' => 'rev', |
| 1463 | | -'deleteimg' => 'del', |
| 1464 | | -'deleteimgcompletely' => 'Delete all revisions of this file', |
| 1465 | | -'imghistlegend' => 'Legend: (cur) = this is the current file, (rev) = revert to this old version. |
| | 1436 | +'imagelist' => 'File list', |
| | 1437 | +'imagelist-summary' => '', # only translate this message to other languages if you have to change it |
| | 1438 | +'imagelisttext' => "Below is a list of '''$1''' {{PLURAL:$1|file|files}} sorted $2.", |
| | 1439 | +'imagelistforuser' => 'This shows only images uploaded by $1.', |
| | 1440 | +'getimagelist' => 'fetching file list', |
| | 1441 | +'ilsubmit' => 'Search', |
| | 1442 | +'showlast' => 'Show last $1 files sorted $2.', |
| | 1443 | +'byname' => 'by name', |
| | 1444 | +'bydate' => 'by date', |
| | 1445 | +'bysize' => 'by size', |
| | 1446 | +'imgdelete' => 'del', |
| | 1447 | +'imgdesc' => 'desc', |
| | 1448 | +'imgfile' => 'file', |
| | 1449 | +'imglegend' => 'Legend: (desc) = show/edit file description.', |
| | 1450 | +'imghistory' => 'File history', |
| | 1451 | +'revertimg' => 'rev', |
| | 1452 | +'deleteimg' => 'del', |
| | 1453 | +'deleteimgcompletely' => 'Delete all revisions of this file', |
| | 1454 | +'imghistlegend' => 'Legend: (cur) = this is the current file, (rev) = revert to this old version. |
| | 1455 | + |
| 1466 | 1456 | <br /><i>Click on date to see the file uploaded on that date</i>.', |
| 1467 | | -'imagelinks' => 'Links', |
| 1468 | | -'linkstoimage' => 'The following pages link to this file:', |
| 1469 | | -'nolinkstoimage' => 'There are no pages that link to this file.', |
| 1470 | | -'sharedupload' => 'This file is a shared upload and may be used by other projects.', |
| 1471 | | -'shareduploadwiki' => 'Please see the $1 for further information.', |
| | 1457 | +'imagelinks' => 'Links', |
| | 1458 | +'linkstoimage' => 'The following pages link to this file:', |
| | 1459 | +'nolinkstoimage' => 'There are no pages that link to this file.', |
| | 1460 | +'sharedupload' => 'This file is a shared upload and may be used by other projects.', |
| | 1461 | +'shareduploadwiki' => 'Please see the $1 for further information.', |
| 1472 | 1462 | 'shareduploadwiki-linktext' => 'file description page', |
| 1473 | | -'shareddescriptionfollows' => '-', |
| 1474 | | -'noimage' => 'No file by this name exists, you can $1.', |
| 1475 | | -'noimage-linktext' => 'upload it', |
| | 1463 | +'shareddescriptionfollows' => '-', # don't translate or duplicate this message to other languages |
| | 1464 | +'noimage' => 'No file by this name exists, you can $1.', |
| | 1465 | +'noimage-linktext' => 'upload it', |
| 1476 | 1466 | 'uploadnewversion-linktext' => 'Upload a new version of this file', |
| 1477 | | -'imagelist_date' => 'Date', |
| 1478 | | -'imagelist_name' => 'Name', |
| 1479 | | -'imagelist_user' => 'User', |
| 1480 | | -'imagelist_size' => 'Size', |
| 1481 | | -'imagelist_description' => 'Description', |
| 1482 | | -'imagelist_search_for' => 'Search for image name:', |
| | 1467 | +'imagelist_date' => 'Date', |
| | 1468 | +'imagelist_name' => 'Name', |
| | 1469 | +'imagelist_user' => 'User', |
| | 1470 | +'imagelist_size' => 'Size', |
| | 1471 | +'imagelist_description' => 'Description', |
| | 1472 | +'imagelist_search_for' => 'Search for image name:', |
| 1483 | 1473 | |
| 1484 | | -# Mime search |
| 1485 | | -# |
| 1486 | | -'mimesearch' => 'MIME search', |
| | 1474 | +# MIME search |
| | 1475 | +'mimesearch' => 'MIME search', |
| 1487 | 1476 | 'mimesearch-summary' => 'This page enables the filtering of files for its MIME-type. Input: contenttype/subtype, e.g. <tt>image/jpeg</tt>.', |
| 1488 | | -'mimetype' => 'MIME type:', |
| 1489 | | -'download' => 'download', |
| | 1477 | +'mimetype' => 'MIME type:', |
| | 1478 | +'download' => 'download', |
| 1490 | 1479 | |
| 1491 | | -# Unwatchedpages |
| 1492 | | -# |
| 1493 | | -'unwatchedpages' => 'Unwatched pages', |
| 1494 | | -'unwatchedpages-summary' => '', |
| | 1480 | +# Unwatched pages |
| | 1481 | +'unwatchedpages' => 'Unwatched pages', |
| | 1482 | +'unwatchedpages-summary' => '', # only translate this message to other languages if you have to change it |
| 1495 | 1483 | |
| 1496 | 1484 | # List redirects |
| 1497 | | -'listredirects' => 'List redirects', |
| 1498 | | -'listredirects-summary' => '', |
| | 1485 | +'listredirects' => 'List redirects', |
| | 1486 | +'listredirects-summary' => '', # only translate this message to other languages if you have to change it |
| 1499 | 1487 | |
| 1500 | 1488 | # Unused templates |
| 1501 | | -'unusedtemplates' => 'Unused templates', |
| 1502 | | -'unusedtemplates-summary' => '', |
| 1503 | | -'unusedtemplatestext' => 'This page lists all pages in the template namespace which are not included in another page. Remember to check for other links to the templates before deleting them.', |
| 1504 | | -'unusedtemplateswlh' => 'other links', |
| | 1489 | +'unusedtemplates' => 'Unused templates', |
| | 1490 | +'unusedtemplates-summary' => '', # only translate this message to other languages if you have to change it |
| | 1491 | +'unusedtemplatestext' => 'This page lists all pages in the template namespace which are not included in another page. Remember to check for other links to the templates before deleting them.', |
| | 1492 | +'unusedtemplateswlh' => 'other links', |
| 1505 | 1493 | |
| 1506 | 1494 | # Random redirect |
| 1507 | | -'randomredirect' => 'Random redirect', |
| | 1495 | +'randomredirect' => 'Random redirect', |
| 1508 | 1496 | 'randomredirect-nopages' => 'There are no redirects in this namespace.', |
| 1509 | 1497 | |
| 1510 | 1498 | # Statistics |
| 1511 | | -# |
| 1512 | | -'statistics' => 'Statistics', |
| 1513 | | -'sitestats' => '{{SITENAME}} statistics', |
| 1514 | | -'userstats' => 'User statistics', |
| 1515 | | -'sitestatstext' => "There {{PLURAL:$1|is '''1''' page|are '''$1''' total pages}} in the database. |
| | 1499 | +'statistics' => 'Statistics', |
| | 1500 | +'sitestats' => '{{SITENAME}} statistics', |
| | 1501 | +'userstats' => 'User statistics', |
| | 1502 | +'sitestatstext' => "There {{PLURAL:\$1|is '''1''' page|are '''\$1''' total pages}} in the database. |
| 1516 | 1503 | This includes \"talk\" pages, pages about {{SITENAME}}, minimal \"stub\" |
| 1517 | 1504 | pages, redirects, and others that probably don't qualify as content pages. |
| 1518 | | -Excluding those, there {{PLURAL:$2|is '''1''' page that is a|are '''$2''' pages that are}} probably legitimate |
| 1519 | | -content {{PLURAL:$2|page|pages}}. |
| | 1505 | +Excluding those, there {{PLURAL:\$2|is '''1''' page that is a|are '''\$2''' pages that are}} probably legitimate |
| | 1506 | +content {{PLURAL:\$2|page|pages}}. |
| 1520 | 1507 | |
| 1521 | | -'''$8''' {{PLURAL:$8|file|files}} have been uploaded. |
| | 1508 | +'''\$8''' {{PLURAL:\$8|file|files}} have been uploaded. |
| 1522 | 1509 | |
| 1523 | | -There have been a total of '''$3''' {{PLURAL:$3|page view|page views}}, and '''$4''' {{PLURAL:$4|page edit|page edits}} |
| | 1510 | +There have been a total of '''\$3''' {{PLURAL:\$3|page view|page views}}, and '''\$4''' {{PLURAL:\$4|page edit|page edits}} |
| 1524 | 1511 | since {{SITENAME}} was setup. |
| 1525 | | -That comes to '''$5''' average edits per page, and '''$6''' views per edit. |
| | 1512 | +That comes to '''\$5''' average edits per page, and '''\$6''' views per edit. |
| 1526 | 1513 | |
| 1527 | | -The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''$7'''.", |
| 1528 | | -'userstatstext' => "There {{PLURAL:$1|is '''1''' registered user|are '''$1''' registered users}}, of which |
| | 1514 | +The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''\$7'''.", |
| | 1515 | +'userstatstext' => "There {{PLURAL:$1|is '''1''' registered user|are '''$1''' registered users}}, of which |
| 1529 | 1516 | '''$2''' (or '''$4%''') {{PLURAL:$2|has|have}} $5 rights.", |
| 1530 | 1517 | 'statistics-mostpopular' => 'Most viewed pages', |
| 1531 | | -'statistics-footer' => '', |
| | 1518 | +'statistics-footer' => '', # don't translate or duplicate this message to other languages |
| 1532 | 1519 | |
| 1533 | | -'disambiguations' => 'Disambiguation pages', |
| 1534 | | -'disambiguations-summary' => '', |
| 1535 | | -'disambiguationspage' => 'Template:disambig', |
| 1536 | | -'disambiguations-text' => "The following pages link to a '''disambiguation page'''. They should link to the appropriate topic instead.<br />A page is treated as disambiguation page if it uses a template which is linked from [[MediaWiki:disambiguationspage]]", |
| | 1520 | +'disambiguations' => 'Disambiguation pages', |
| | 1521 | +'disambiguations-summary' => '', # only translate this message to other languages if you have to change it |
| | 1522 | +'disambiguationspage' => 'Template:disambig', |
| | 1523 | +'disambiguations-text' => "The following pages link to a '''disambiguation page'''. They should link to the appropriate topic instead.<br />A page is treated as disambiguation page if it uses a template which is linked from [[MediaWiki:disambiguationspage]]", |
| 1537 | 1524 | |
| 1538 | | -'doubleredirects' => 'Double redirects', |
| 1539 | | -'doubleredirects-summary' => '', |
| 1540 | | -'doubleredirectstext' => "Each row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the \"real\" target page, which the first redirect should point to.", |
| | 1525 | +'doubleredirects' => 'Double redirects', |
| | 1526 | +'doubleredirects-summary' => '', # only translate this message to other languages if you have to change it |
| | 1527 | +'doubleredirectstext' => 'Each row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the "real" target page, which the first redirect should point to.', |
| 1541 | 1528 | |
| 1542 | | -'brokenredirects' => 'Broken redirects', |
| 1543 | | -'brokenredirects-summary' => '', |
| 1544 | | -'brokenredirectstext' => 'The following redirects link to non-existent pages:', |
| 1545 | | -'brokenredirects-edit' => '(edit)', |
| 1546 | | -'brokenredirects-delete' => '(delete)', |
| | 1529 | +'brokenredirects' => 'Broken redirects', |
| | 1530 | +'brokenredirects-summary' => '', # only translate this message to other languages if you have to change it |
| | 1531 | +'brokenredirectstext' => 'The following redirects link to non-existent pages:', |
| | 1532 | +'brokenredirects-edit' => '(edit)', |
| | 1533 | +'brokenredirects-delete' => '(delete)', |
| 1547 | 1534 | |
| 1548 | | -'withoutinterwiki' => 'Pages without language links', |
| 1549 | | -'withoutinterwiki-header' => 'The following pages do not link to other language versions:', |
| 1550 | | -'withoutinterwiki-summary' => '', |
| | 1535 | +'withoutinterwiki' => 'Pages without language links', |
| | 1536 | +'withoutinterwiki-header' => 'The following pages do not link to other language versions:', |
| | 1537 | +'withoutinterwiki-summary' => '', # only translate this message to other languages if you have to change it |
| 1551 | 1538 | |
| 1552 | | -'fewestrevisions' => 'Articles with the fewest revisions', |
| 1553 | | -'fewestrevisions-summary' => '', |
| | 1539 | +'fewestrevisions' => 'Articles with the fewest revisions', |
| | 1540 | +'fewestrevisions-summary' => '', # only translate this message to other languages if you have to change it |
| 1554 | 1541 | |
| 1555 | 1542 | # Miscellaneous special pages |
| 1556 | | -# |
| 1557 | | -'nbytes' => '$1 {{PLURAL:$1|byte|bytes}}', |
| 1558 | | -'ncategories' => '$1 {{PLURAL:$1|category|categories}}', |
| 1559 | | -'nlinks' => '$1 {{PLURAL:$1|link|links}}', |
| 1560 | | -'nmembers' => '$1 {{PLURAL:$1|member|members}}', |
| 1561 | | -'nrevisions' => '$1 {{PLURAL:$1|revision|revisions}}', |
| 1562 | | -'nviews' => '$1 {{PLURAL:$1|view|views}}', |
| 1563 | | -'specialpage-empty' => 'This page is empty.', |
| 1564 | | -'lonelypages' => 'Orphaned pages', |
| 1565 | | -'lonelypages-summary' => '', |
| 1566 | | -'lonelypagestext' => 'The following pages are not linked from other pages in this wiki.', |
| 1567 | | -'uncategorizedpages' => 'Uncategorized pages', |
| 1568 | | -'uncategorizedpages-summary' => '', |
| 1569 | | -'uncategorizedcategories' => 'Uncategorized categories', |
| 1570 | | -'uncategorizedcategories-summary' => '', |
| 1571 | | -'uncategorizedimages' => 'Uncategorized images', |
| 1572 | | -'uncategorizedimages-summary' => '', |
| 1573 | | -'unusedcategories' => 'Unused categories', |
| 1574 | | -'unusedimages' => 'Unused files', |
| 1575 | | -'popularpages' => 'Popular pages', |
| 1576 | | -'popularpages-summary' => '', |
| 1577 | | -'wantedcategories' => 'Wanted categories', |
| 1578 | | -'wantedcategories-summary' => '', |
| 1579 | | -'wantedpages' => 'Wanted pages', |
| 1580 | | -'wantedpages-summary' => '', |
| 1581 | | -'mostlinked' => 'Most linked to pages', |
| 1582 | | -'mostlinked-summary' => '', |
| 1583 | | -'mostlinkedcategories' => 'Most linked to categories', |
| 1584 | | -'mostlinkedcategories-summary' => '', |
| 1585 | | -'mostcategories' => 'Articles with the most categories', |
| 1586 | | -'mostcategories-summary' => '', |
| 1587 | | -'mostimages' => 'Most linked to images', |
| 1588 | | -'mostimages-summary' => '', |
| 1589 | | -'mostrevisions' => 'Articles with the most revisions', |
| 1590 | | -'mostrevisions-summary' => '', |
| 1591 | | -'allpages' => 'All pages', |
| 1592 | | -'allpages-summary' => '', |
| 1593 | | -'prefixindex' => 'Prefix index', |
| 1594 | | -'prefixindex-summary' => '', |
| 1595 | | -'randompage' => 'Random page', |
| 1596 | | -'randompage-nopages' => 'There are no pages in this namespace.', |
| 1597 | | -'randompage-url'=> 'Special:Random', |
| 1598 | | -'shortpages' => 'Short pages', |
| 1599 | | -'shortpages-summary' => '', |
| 1600 | | -'longpages' => 'Long pages', |
| 1601 | | -'longpages-summary' => '', |
| 1602 | | -'deadendpages' => 'Dead-end pages', |
| 1603 | | -'deadendpages-summary' => '', |
| 1604 | | -'deadendpagestext' => 'The following pages do not link to other pages in this wiki.', |
| 1605 | | -'protectedpages' => 'Protected pages', |
| 1606 | | -'protectedpages-summary' => '', |
| 1607 | | -'protectedpagestext' => 'The following pages are protected from moving or editing', |
| 1608 | | -'protectedpagesempty' => 'No pages are currently protected with these parameters.', |
| 1609 | | -'listusers' => 'User list', |
| 1610 | | -'listusers-summary' => '', |
| 1611 | | -'specialpages' => 'Special pages', |
| 1612 | | -'specialpages-summary' => '', |
| 1613 | | -'spheading' => 'Special pages for all users', |
| 1614 | | -'restrictedpheading' => 'Restricted special pages', |
| 1615 | | -'rclsub' => "(to pages linked from \"$1\")", |
| 1616 | | -'newpages' => 'New pages', |
| 1617 | | -'newpages-summary' => '', |
| 1618 | | -'newpages-username' => 'Username:', |
| 1619 | | -'ancientpages' => 'Oldest pages', |
| 1620 | | -'ancientpages-summary' => '', |
| 1621 | | -'intl' => 'Interlanguage links', |
| 1622 | | -'move' => 'Move', |
| 1623 | | -'movethispage' => 'Move this page', |
| 1624 | | -'unusedimagestext' => '<p>Please note that other web sites may link to an image with |
| | 1543 | +'nbytes' => '$1 {{PLURAL:$1|byte|bytes}}', |
| | 1544 | +'ncategories' => '$1 {{PLURAL:$1|category|categories}}', |
| | 1545 | +'nlinks' => '$1 {{PLURAL:$1|link|links}}', |
| | 1546 | +'nmembers' => '$1 {{PLURAL:$1|member|members}}', |
| | 1547 | +'nrevisions' => '$1 {{PLURAL:$1|revision|revisions}}', |
| | 1548 | +'nviews' => '$1 {{PLURAL:$1|view|views}}', |
| | 1549 | +'specialpage-empty' => 'There are no results for this report.', |
| | 1550 | +'lonelypages' => 'Orphaned pages', |
| | 1551 | +'lonelypages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1552 | +'lonelypagestext' => 'The following pages are not linked from other pages in this wiki.', |
| | 1553 | +'uncategorizedpages' => 'Uncategorized pages', |
| | 1554 | +'uncategorizedpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1555 | +'uncategorizedcategories' => 'Uncategorized categories', |
| | 1556 | +'uncategorizedcategories-summary' => '', # only translate this message to other languages if you have to change it |
| | 1557 | +'uncategorizedimages' => 'Uncategorized images', |
| | 1558 | +'uncategorizedimages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1559 | +'uncategorizedtemplates' => 'Uncategorized templates', |
| | 1560 | +'uncategorizedtemplates-summary' => '', |
| | 1561 | +'unusedcategories' => 'Unused categories', |
| | 1562 | +'unusedimages' => 'Unused files', |
| | 1563 | +'popularpages' => 'Popular pages', |
| | 1564 | +'popularpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1565 | +'wantedcategories' => 'Wanted categories', |
| | 1566 | +'wantedcategories-summary' => '', # only translate this message to other languages if you have to change it |
| | 1567 | +'wantedpages' => 'Wanted pages', |
| | 1568 | +'wantedpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1569 | +'mostlinked' => 'Most linked to pages', |
| | 1570 | +'mostlinked-summary' => '', # only translate this message to other languages if you have to change it |
| | 1571 | +'mostlinkedcategories' => 'Most linked to categories', |
| | 1572 | +'mostlinkedcategories-summary' => '', # only translate this message to other languages if you have to change it |
| | 1573 | +'mostlinkedtemplates' => 'Most linked-to templates', |
| | 1574 | +'mostlinkedtemplates-summary' => '', # only translate this message to other languages if you have to change it |
| | 1575 | +'mostcategories' => 'Articles with the most categories', |
| | 1576 | +'mostcategories-summary' => '', # only translate this message to other languages if you have to change it |
| | 1577 | +'mostimages' => 'Most linked to images', |
| | 1578 | +'mostimages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1579 | +'mostrevisions' => 'Articles with the most revisions', |
| | 1580 | +'mostrevisions-summary' => '', # only translate this message to other languages if you have to change it |
| | 1581 | +'allpages' => 'All pages', |
| | 1582 | +'allpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1583 | +'prefixindex' => 'Prefix index', |
| | 1584 | +'prefixindex-summary' => '', # only translate this message to other languages if you have to change it |
| | 1585 | +'randompage' => 'Random page', |
| | 1586 | +'randompage-nopages' => 'There are no pages in this namespace.', |
| | 1587 | +'randompage-url' => 'Special:Random', # don't translate or duplicate this message to other languages |
| | 1588 | +'shortpages' => 'Short pages', |
| | 1589 | +'shortpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1590 | +'longpages' => 'Long pages', |
| | 1591 | +'longpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1592 | +'deadendpages' => 'Dead-end pages', |
| | 1593 | +'deadendpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1594 | +'deadendpagestext' => 'The following pages do not link to other pages in this wiki.', |
| | 1595 | +'protectedpages' => 'Protected pages', |
| | 1596 | +'protectedpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1597 | +'protectedpagestext' => 'The following pages are protected from moving or editing', |
| | 1598 | +'protectedpagesempty' => 'No pages are currently protected with these parameters.', |
| | 1599 | +'listusers' => 'User list', |
| | 1600 | +'listusers-summary' => '', # only translate this message to other languages if you have to change it |
| | 1601 | +'specialpages' => 'Special pages', |
| | 1602 | +'specialpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1603 | +'spheading' => 'Special pages for all users', |
| | 1604 | +'restrictedpheading' => 'Restricted special pages', |
| | 1605 | +'restrictedlheading' => 'Restricted logs', |
| | 1606 | +'rclsub' => '(to pages linked from "$1")', |
| | 1607 | +'newpages' => 'New pages', |
| | 1608 | +'newpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1609 | +'newpages-username' => 'Username:', |
| | 1610 | +'ancientpages' => 'Oldest pages', |
| | 1611 | +'ancientpages-summary' => '', # only translate this message to other languages if you have to change it |
| | 1612 | +'intl' => 'Interlanguage links', |
| | 1613 | +'move' => 'Move', |
| | 1614 | +'movethispage' => 'Move this page', |
| | 1615 | +'unusedimagestext' => '<p>Please note that other web sites may link to an image with |
| 1625 | 1616 | a direct URL, and so may still be listed here despite being |
| 1626 | 1617 | in active use.</p>', |
| 1627 | | -'unusedcategoriestext' => 'The following category pages exist although no other article or category make use of them.', |
| | 1618 | +'unusedcategoriestext' => 'The following category pages exist although no other article or category make use of them.', |
| 1628 | 1619 | |
| 1629 | 1620 | # Book sources |
| 1630 | | -'booksources' => 'Book sources', |
| 1631 | | -'booksources-summary' => '', |
| | 1621 | +'booksources' => 'Book sources', |
| | 1622 | +'booksources-summary' => '', # only translate this message to other languages if you have to change it |
| 1632 | 1623 | 'booksources-search-legend' => 'Search for book sources', |
| 1633 | | -'booksources-isbn' => 'ISBN:', |
| 1634 | | -'booksources-go' => 'Go', |
| 1635 | | -'booksources-text' => 'Below is a list of links to other sites that sell new and used books, and may also have |
| | 1624 | +'booksources-isbn' => 'ISBN:', |
| | 1625 | +'booksources-go' => 'Go', |
| | 1626 | +'booksources-text' => 'Below is a list of links to other sites that sell new and used books, and may also have |
| 1636 | 1627 | further information about books you are looking for:', |
| 1637 | 1628 | |
| 1638 | 1629 | 'categoriespagetext' => 'The following categories exist in the wiki.', |
| 1639 | | -'data' => 'Data', |
| 1640 | | -'userrights' => 'User rights management', |
| 1641 | | -'userrights-summary' => '', |
| 1642 | | -'groups' => 'User groups', |
| | 1630 | +'data' => 'Data', |
| | 1631 | +'userrights' => 'User rights management', |
| | 1632 | +'userrights-summary' => '', # only translate this message to other languages if you have to change it |
| | 1633 | +'groups' => 'User groups', |
| | 1634 | +'isbn' => 'ISBN', |
| | 1635 | +'rfcurl' => 'http://tools.ietf.org/html/rfc$1', # don't translate or duplicate this message to other languages |
| | 1636 | +'pubmedurl' => 'http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&list_uids=$1', # don't translate or duplicate this message to other languages |
| | 1637 | +'alphaindexline' => '$1 to $2', |
| | 1638 | +'version' => 'Version', |
| 1643 | 1639 | |
| 1644 | | -'isbn' => 'ISBN', |
| 1645 | | -'rfcurl' => 'http://tools.ietf.org/html/rfc$1', |
| 1646 | | -'pubmedurl' => 'http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&list_uids=$1', |
| 1647 | | -'alphaindexline' => "$1 to $2", |
| 1648 | | -'version' => 'Version', |
| 1649 | | - |
| 1650 | | -# Special:Logs |
| | 1640 | +# Special:Log |
| 1651 | 1641 | 'specialloguserlabel' => 'User:', |
| 1652 | 1642 | 'speciallogtitlelabel' => 'Title:', |
| 1653 | 1643 | 'log' => 'Logs', |
| 1654 | | -'log-search-legend' => 'Search for logs', |
| 1655 | | -'log-search-submit' => 'Go', |
| | 1644 | +'all-logs-page' => 'All public logs', |
| | 1645 | +'log-search-legend' => 'Search for logs', |
| | 1646 | +'log-search-submit' => 'Go', |
| 1656 | 1647 | 'alllogstext' => 'Combined display of all available public logs of {{SITENAME}}. |
| 1657 | 1648 | You can narrow down the view by selecting a log type, the user name, or the affected page.', |
| 1658 | 1649 | 'logempty' => 'No matching items in log.', |
| 1659 | | -'log-title-wildcard' => 'Search titles starting with this text', |
| | 1650 | +'log-title-wildcard' => 'Search titles starting with this text', |
| 1660 | 1651 | |
| 1661 | 1652 | # Special:Allpages |
| 1662 | 1653 | 'nextpage' => 'Next page ($1)', |
| 1663 | 1654 | 'prevpage' => 'Previous page ($1)', |
| 1664 | | -'allpagesfrom' => 'Display pages starting at:', |
| 1665 | | -'allarticles' => 'All articles', |
| 1666 | | -'allinnamespace' => 'All pages ($1 namespace)', |
| 1667 | | -'allnotinnamespace' => 'All pages (not in $1 namespace)', |
| 1668 | | -'allpagesprev' => 'Previous', |
| 1669 | | -'allpagesnext' => 'Next', |
| 1670 | | -'allpagessubmit' => 'Go', |
| 1671 | | -'allpagesprefix' => 'Display pages with prefix:', |
| 1672 | | -'allpagesbadtitle' => 'The given page title was invalid or had an inter-language or inter-wiki prefix. It may contain one or more characters which cannot be used in titles.', |
| | 1655 | +'allpagesfrom' => 'Display pages starting at:', |
| | 1656 | +'allarticles' => 'All articles', |
| | 1657 | +'allinnamespace' => 'All pages ($1 namespace)', |
| | 1658 | +'allnotinnamespace' => 'All pages (not in $1 namespace)', |
| | 1659 | +'allpagesprev' => 'Previous', |
| | 1660 | +'allpagesnext' => 'Next', |
| | 1661 | +'allpagessubmit' => 'Go', |
| | 1662 | +'allpagesprefix' => 'Display pages with prefix:', |
| | 1663 | +'allpagesbadtitle' => 'The given page title was invalid or had an inter-language or inter-wiki prefix. It may contain one or more characters which cannot be used in titles.', |
| 1673 | 1664 | |
| 1674 | 1665 | # Special:Listusers |
| 1675 | 1666 | 'listusersfrom' => 'Display users starting at:', |
| 1676 | 1667 | 'listusers-submit' => 'Show', |
| 1677 | 1668 | 'listusers-noresult' => 'No user found.', |
| 1678 | 1669 | |
| 1679 | | -# Email this user |
| 1680 | | -# |
| 1681 | | -'mailnologin' => 'No send address', |
| 1682 | | -'mailnologintext' => "You must be [[Special:Userlogin|logged in]] |
| | 1670 | +# E-mail user |
| | 1671 | +'mailnologin' => 'No send address', |
| | 1672 | +'mailnologintext' => 'You must be [[Special:Userlogin|logged in]] |
| 1683 | 1673 | and have a valid e-mail address in your [[Special:Preferences|preferences]] |
| 1684 | | -to send e-mail to other users.", |
| 1685 | | -'emailuser' => 'E-mail this user', |
| 1686 | | -'emailpage' => 'E-mail user', |
| 1687 | | -'emailpagetext' => 'If this user has entered a valid e-mail address in |
| | 1674 | +to send e-mail to other users.', |
| | 1675 | +'emailuser' => 'E-mail this user', |
| | 1676 | +'emailpage' => 'E-mail user', |
| | 1677 | +'emailpagetext' => 'If this user has entered a valid e-mail address in |
| 1688 | 1678 | his or her user preferences, the form below will send a single message. |
| 1689 | 1679 | The e-mail address you entered in your user preferences will appear |
| 1690 | 1680 | as the "From" address of the mail, so the recipient will be able |
| 1691 | 1681 | to reply.', |
| 1692 | 1682 | 'usermailererror' => 'Mail object returned error:', |
| 1693 | | -'defemailsubject' => "{{SITENAME}} e-mail", |
| 1694 | | -'noemailtitle' => 'No e-mail address', |
| 1695 | | -'noemailtext' => 'This user has not specified a valid e-mail address, |
| | 1683 | +'defemailsubject' => '{{SITENAME}} e-mail', |
| | 1684 | +'noemailtitle' => 'No e-mail address', |
| | 1685 | +'noemailtext' => 'This user has not specified a valid e-mail address, |
| 1696 | 1686 | or has chosen not to receive e-mail from other users.', |
| 1697 | | -'emailfrom' => 'From', |
| 1698 | | -'emailto' => 'To', |
| 1699 | | -'emailsubject' => 'Subject', |
| 1700 | | -'emailmessage' => 'Message', |
| 1701 | | -'emailsend' => 'Send', |
| 1702 | | -'emailccme' => 'E-mail me a copy of my message.', |
| 1703 | | -'emailccsubject'=> 'Copy of your message to $1: $2', |
| 1704 | | -'emailsent' => 'E-mail sent', |
| 1705 | | -'emailsenttext' => 'Your e-mail message has been sent.', |
| | 1687 | +'emailfrom' => 'From', |
| | 1688 | +'emailto' => 'To', |
| | 1689 | +'emailsubject' => 'Subject', |
| | 1690 | +'emailmessage' => 'Message', |
| | 1691 | +'emailsend' => 'Send', |
| | 1692 | +'emailccme' => 'E-mail me a copy of my message.', |
| | 1693 | +'emailccsubject' => 'Copy of your message to $1: $2', |
| | 1694 | +'emailsent' => 'E-mail sent', |
| | 1695 | +'emailsenttext' => 'Your e-mail message has been sent.', |
| 1706 | 1696 | |
| 1707 | 1697 | # Watchlist |
| 1708 | | -'watchlist' => 'My watchlist', |
| 1709 | | -'mywatchlist' => 'My watchlist', |
| 1710 | | -'watchlistfor' => "(for '''$1''')", |
| 1711 | | -'nowatchlist' => 'You have no items on your watchlist.', |
| 1712 | | -'watchlistanontext' => 'Please $1 to view or edit items on your watchlist.', |
| 1713 | | -'watchlistcount' => "'''You have {{PLURAL:$1|$1 item|$1 items}} on your watchlist, including talk pages.'''", |
| 1714 | | -'clearwatchlist' => 'Clear watchlist', |
| 1715 | | -'watchlistcleartext' => 'Are you sure you wish to remove them?', |
| | 1698 | +'watchlist' => 'My watchlist', |
| | 1699 | +'mywatchlist' => 'My watchlist', |
| | 1700 | +'watchlistfor' => "(for '''$1''')", |
| | 1701 | +'nowatchlist' => 'You have no items on your watchlist.', |
| | 1702 | +'watchlistanontext' => 'Please $1 to view or edit items on your watchlist.', |
| | 1703 | +'watchlistcount' => "'''You have {{PLURAL:$1|$1 item|$1 items}} on your watchlist, including talk pages.'''", |
| | 1704 | +'clearwatchlist' => 'Clear watchlist', |
| | 1705 | +'watchlistcleartext' => 'Are you sure you wish to remove them?', |
| 1716 | 1706 | 'watchlistclearbutton' => 'Clear watchlist', |
| 1717 | | -'watchlistcleardone' => 'Your watchlist has been cleared. {{PLURAL:$1|$1 item was|$1 items were}} removed.', |
| 1718 | | -'watchnologin' => 'Not logged in', |
| 1719 | | -'watchnologintext' => 'You must be [[Special:Userlogin|logged in]] to modify your watchlist.', |
| 1720 | | -'addedwatch' => 'Added to watchlist', |
| 1721 | | -'addedwatchtext' => "The page \"[[:$1]]\" has been added to your [[Special:Watchlist|watchlist]]. |
| | 1707 | +'watchlistcleardone' => 'Your watchlist has been cleared. {{PLURAL:$1|$1 item was|$1 items were}} removed.', |
| | 1708 | +'watchnologin' => 'Not logged in', |
| | 1709 | +'watchnologintext' => 'You must be [[Special:Userlogin|logged in]] to modify your watchlist.', |
| | 1710 | +'addedwatch' => 'Added to watchlist', |
| | 1711 | +'addedwatchtext' => "The page \"[[:\$1]]\" has been added to your [[Special:Watchlist|watchlist]]. |
| 1722 | 1712 | Future changes to this page and its associated Talk page will be listed there, |
| 1723 | 1713 | and the page will appear '''bolded''' in the [[Special:Recentchanges|list of recent changes]] to |
| 1724 | 1714 | make it easier to pick out. |
| 1725 | 1715 | |
| 1726 | 1716 | If you want to remove the page from your watchlist later, click \"Unwatch\" in the sidebar.", |
| 1727 | | -'removedwatch' => 'Removed from watchlist', |
| 1728 | | -'removedwatchtext' => "The page \"[[:$1]]\" has been removed from your watchlist.", |
| 1729 | | -'watch' => 'Watch', |
| 1730 | | -'watchthispage' => 'Watch this page', |
| 1731 | | -'unwatch' => 'Unwatch', |
| 1732 | | -'unwatchthispage' => 'Stop watching', |
| 1733 | | -'notanarticle' => 'Not a content page', |
| 1734 | | -'watchnochange' => 'None of your watched items was edited in the time period displayed.', |
| 1735 | | -'watchdetails' => '* {{PLURAL:$1|$1 page|$1 pages}} watched not counting talk pages |
| | 1717 | +'removedwatch' => 'Removed from watchlist', |
| | 1718 | +'removedwatchtext' => 'The page "[[:$1]]" has been removed from your watchlist.', |
| | 1719 | +'watch' => 'Watch', |
| | 1720 | +'watchthispage' => 'Watch this page', |
| | 1721 | +'unwatch' => 'Unwatch', |
| | 1722 | +'unwatchthispage' => 'Stop watching', |
| | 1723 | +'notanarticle' => 'Not a content page', |
| | 1724 | +'watchnochange' => 'None of your watched items was edited in the time period displayed.', |
| | 1725 | +'watchdetails' => '* {{PLURAL:$1|$1 page|$1 pages}} watched not counting talk pages |
| 1736 | 1726 | * [[Special:Watchlist/edit|Show and edit complete watchlist]] |
| 1737 | 1727 | * [[Special:Watchlist/clear|Remove all pages]]', |
| 1738 | | -'wlheader-enotif' => "* E-mail notification is enabled.", |
| 1739 | | -'wlheader-showupdated' => "* Pages which have been changed since you last visited them are shown in '''bold'''", |
| 1740 | | -'watchmethod-recent'=> 'checking recent edits for watched pages', |
| 1741 | | -'watchmethod-list' => 'checking watched pages for recent edits', |
| 1742 | | -'removechecked' => 'Remove checked items from watchlist', |
| 1743 | | -'watchlistcontains' => "Your watchlist contains $1 {{PLURAL:$1|page|pages}}.", |
| 1744 | | -'watcheditlist' => 'Here\'s an alphabetical list of your |
| 1745 | | -watched content pages. Check the boxes of pages you want to remove from your watchlist and click the \'remove checked\' button |
| 1746 | | -at the bottom of the screen (deleting a content page also deletes the accompanying talk page and vice versa).', |
| 1747 | | -'removingchecked' => 'Removing requested items from watchlist...', |
| 1748 | | -'couldntremove' => "Couldn't remove item '$1'...", |
| 1749 | | -'iteminvalidname' => "Problem with item '$1', invalid name...", |
| 1750 | | -'wlnote' => "Below {{PLURAL:$1|is the last change|are the last '''$1''' changes}} in the last {{PLURAL:$2|hour|'''$2''' hours}}.", |
| 1751 | | -'wlshowlast' => 'Show last $1 hours $2 days $3', |
| 1752 | | -'wlsaved' => 'This is a saved version of your watchlist.', |
| 1753 | | -'watchlist-show-bots' => 'Show bot edits', |
| 1754 | | -'watchlist-hide-bots' => 'Hide bot edits', |
| 1755 | | -'watchlist-show-own' => 'Show my edits', |
| 1756 | | -'watchlist-hide-own' => 'Hide my edits', |
| | 1728 | +'wlheader-enotif' => '* E-mail notification is enabled.', |
| | 1729 | +'wlheader-showupdated' => "* Pages which have been changed since you last visited them are shown in '''bold'''", |
| | 1730 | +'watchmethod-recent' => 'checking recent edits for watched pages', |
| | 1731 | +'watchmethod-list' => 'checking watched pages for recent edits', |
| | 1732 | +'removechecked' => 'Remove checked items from watchlist', |
| | 1733 | +'watchlistcontains' => 'Your watchlist contains $1 {{PLURAL:$1|page|pages}}.', |
| | 1734 | +'watcheditlist' => "Here's an alphabetical list of your |
| | 1735 | +watched content pages. Check the boxes of pages you want to remove from your watchlist and click the 'remove checked' button |
| | 1736 | +at the bottom of the screen (deleting a content page also deletes the accompanying talk page and vice versa).", |
| | 1737 | +'removingchecked' => 'Removing requested items from watchlist...', |
| | 1738 | +'couldntremove' => "Couldn't remove item '$1'...", |
| | 1739 | +'iteminvalidname' => "Problem with item '$1', invalid name...", |
| | 1740 | +'wlnote' => "Below {{PLURAL:$1|is the last change|are the last '''$1''' changes}} in the last {{PLURAL:$2|hour|'''$2''' hours}}.", |
| | 1741 | +'wlshowlast' => 'Show last $1 hours $2 days $3', |
| | 1742 | +'wlsaved' => 'This is a saved version of your watchlist.', |
| | 1743 | +'watchlist-show-bots' => 'Show bot edits', |
| | 1744 | +'watchlist-hide-bots' => 'Hide bot edits', |
| | 1745 | +'watchlist-show-own' => 'Show my edits', |
| | 1746 | +'watchlist-hide-own' => 'Hide my edits', |
| 1757 | 1747 | 'watchlist-show-minor' => 'Show minor edits', |
| 1758 | 1748 | 'watchlist-hide-minor' => 'Hide minor edits', |
| 1759 | | -'wldone' => 'Done.', |
| | 1749 | +'wldone' => 'Done.', |
| | 1750 | + |
| 1760 | 1751 | # Displayed when you click the "watch" button and it's in the process of watching |
| 1761 | | -'watching' => 'Watching...', |
| | 1752 | +'watching' => 'Watching...', |
| 1762 | 1753 | 'unwatching' => 'Unwatching...', |
| 1763 | 1754 | |
| 1764 | | -'enotif_mailer' => '{{SITENAME}} Notification Mailer', |
| 1765 | | -'enotif_reset' => 'Mark all pages visited', |
| 1766 | | -'enotif_newpagetext'=> 'This is a new page.', |
| 1767 | | -'enotif_impersonal_salutation' => '{{SITENAME}} user', |
| 1768 | | -'changed' => 'changed', |
| 1769 | | -'created' => 'created', |
| 1770 | | -'enotif_subject' => '{{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED by $PAGEEDITOR', |
| 1771 | | -'enotif_lastvisited' => 'See $1 for all changes since your last visit.', |
| 1772 | | -'enotif_lastdiff' => 'See $1 to view this change.', |
| 1773 | | -'enotif_anon_editor' => 'anonymous user $1', |
| 1774 | | -'enotif_body' => 'Dear $WATCHINGUSERNAME, |
| | 1755 | +'enotif_mailer' => '{{SITENAME}} Notification Mailer', |
| | 1756 | +'enotif_reset' => 'Mark all pages visited', |
| | 1757 | +'enotif_newpagetext' => 'This is a new page.', |
| | 1758 | +'enotif_impersonal_salutation' => '{{SITENAME}} user', |
| | 1759 | +'changed' => 'changed', |
| | 1760 | +'created' => 'created', |
| | 1761 | +'enotif_subject' => '{{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED by $PAGEEDITOR', |
| | 1762 | +'enotif_lastvisited' => 'See $1 for all changes since your last visit.', |
| | 1763 | +'enotif_lastdiff' => 'See $1 to view this change.', |
| | 1764 | +'enotif_anon_editor' => 'anonymous user $1', |
| | 1765 | +'enotif_body' => 'Dear $WATCHINGUSERNAME, |
| 1775 | 1766 | |
| 1776 | 1767 | |
| 1777 | 1768 | The {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATE by $PAGEEDITOR, see $PAGETITLE_URL for the current version. |
| — | — | @@ -1795,149 +1786,145 @@ |
| 1796 | 1787 | {{fullurl:{{MediaWiki:helppage}}}}', |
| 1797 | 1788 | |
| 1798 | 1789 | # Delete/protect/revert |
| 1799 | | -# |
| 1800 | | -'deletepage' => 'Delete page', |
| 1801 | | -'confirm' => 'Confirm', |
| 1802 | | -'excontent' => "content was: '$1'", |
| 1803 | | -'excontentauthor' => "content was: '$1' (and the only contributor was '[[Special:Contributions/$2|$2]]')", |
| 1804 | | -'exbeforeblank' => "content before blanking was: '$1'", |
| 1805 | | -'exblank' => 'page was empty', |
| 1806 | | -'confirmdelete' => 'Confirm delete', |
| 1807 | | -'deletesub' => "(Deleting \"$1\")", |
| 1808 | | -'historywarning' => 'Warning: The page you are about to delete has a history:', |
| 1809 | | -'confirmdeletetext' => "You are about to permanently delete a page |
| | 1790 | +'deletepage' => 'Delete page', |
| | 1791 | +'confirm' => 'Confirm', |
| | 1792 | +'excontent' => "content was: '$1'", |
| | 1793 | +'excontentauthor' => "content was: '$1' (and the only contributor was '[[Special:Contributions/$2|$2]]')", |
| | 1794 | +'exbeforeblank' => "content before blanking was: '$1'", |
| | 1795 | +'exblank' => 'page was empty', |
| | 1796 | +'confirmdelete' => 'Confirm delete', |
| | 1797 | +'deletesub' => '(Deleting "$1")', |
| | 1798 | +'historywarning' => 'Warning: The page you are about to delete has a history:', |
| | 1799 | +'confirmdeletetext' => 'You are about to permanently delete a page |
| 1810 | 1800 | or image along with all of its history from the database. |
| 1811 | 1801 | Please confirm that you intend to do this, that you understand the |
| 1812 | 1802 | consequences, and that you are doing this in accordance with |
| 1813 | | -[[{{MediaWiki:policy-url}}]].", |
| 1814 | | -'policy-url' => 'Project:Policy', |
| 1815 | | -'actioncomplete' => 'Action complete', |
| 1816 | | -'deletedtext' => "\"$1\" has been deleted. |
| 1817 | | -See $2 for a record of recent deletions.", |
| 1818 | | -'deletedarticle' => "deleted \"[[$1]]\"", |
| 1819 | | -'dellogpage' => 'Deletion log', |
| 1820 | | -'dellogpagetext' => 'Below is a list of the most recent deletions. The deletion of single revisions and events |
| 1821 | | -can be reviewed by clicking the linked numbers that appear within parenthesis, which correspond to each deleted item.', |
| 1822 | | -'deletionlog' => 'deletion log', |
| 1823 | | -'reverted' => 'Reverted to earlier revision', |
| 1824 | | -'deletecomment' => 'Reason for deletion', |
| 1825 | | -'imagereverted' => 'Revert to earlier version was successful.', |
| 1826 | | -'rollback' => 'Roll back edits', |
| 1827 | | -'rollback_short' => 'Rollback', |
| 1828 | | -'rollbacklink' => 'rollback', |
| 1829 | | -'rollbackfailed' => 'Rollback failed', |
| 1830 | | -'cantrollback' => 'Cannot revert edit; last contributor is only author of this page.', |
| 1831 | | -'alreadyrolled' => "Cannot rollback last edit of [[:$1]] |
| | 1803 | +[[{{MediaWiki:policy-url}}]].', |
| | 1804 | +'actioncomplete' => 'Action complete', |
| | 1805 | +'deletedtext' => '"$1" has been deleted. |
| | 1806 | +See $2 for a record of recent deletions.', |
| | 1807 | +'deletedarticle' => 'deleted "[[$1]]"', |
| | 1808 | +'dellogpage' => 'Deletion log', |
| | 1809 | +'dellogpagetext' => 'Below is a list of the most recent deletions.', |
| | 1810 | +'deletionlog' => 'deletion log', |
| | 1811 | +'reverted' => 'Reverted to earlier revision', |
| | 1812 | +'deletecomment' => 'Reason for deletion', |
| | 1813 | +'imagereverted' => 'Revert to earlier version was successful.', |
| | 1814 | +'rollback' => 'Roll back edits', |
| | 1815 | +'rollback_short' => 'Rollback', |
| | 1816 | +'rollbacklink' => 'rollback', |
| | 1817 | +'rollbackfailed' => 'Rollback failed', |
| | 1818 | +'cantrollback' => 'Cannot revert edit; last contributor is only author of this page.', |
| | 1819 | +'alreadyrolled' => 'Cannot rollback last edit of [[:$1]] |
| 1832 | 1820 | by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled back the page already. |
| 1833 | 1821 | |
| 1834 | | -Last edit was by [[User:$3|$3]] ([[User talk:$3|Talk]]).", |
| 1835 | | -# only shown if there is an edit comment |
| 1836 | | -'editcomment' => "The edit comment was: \"<i>$1</i>\".", |
| 1837 | | -'revertpage' => "Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]); changed back to last version by [[User:$1|$1]]", |
| 1838 | | -'sessionfailure' => 'There seems to be a problem with your login session; |
| | 1822 | +Last edit was by [[User:$3|$3]] ([[User talk:$3|Talk]]).', |
| | 1823 | +'editcomment' => 'The edit comment was: "<i>$1</i>".', # only shown if there is an edit comment |
| | 1824 | +'revertpage' => 'Reverted edits by [[Special:Contributions/$2|$2]] ([[User talk:$2|Talk]]); changed back to last version by [[User:$1|$1]]', |
| | 1825 | +'sessionfailure' => 'There seems to be a problem with your login session; |
| 1839 | 1826 | this action has been canceled as a precaution against session hijacking. |
| 1840 | 1827 | Please hit "back" and reload the page you came from, then try again.', |
| 1841 | | -'protectlogpage' => 'Protection log', |
| 1842 | | -'protectlogtext' => "Below is a list of page locks and unlocks. See the [[Special:Protectedpages|protected pages list]] for the list of currently operational page protections.", |
| 1843 | | -'protectedarticle' => 'protected "[[$1]]"', |
| 1844 | | -'unprotectedarticle' => 'unprotected "[[$1]]"', |
| 1845 | | -'protectsub' => '(Protecting "$1")', |
| 1846 | | -'confirmprotecttext' => 'Do you really want to protect this page?', |
| 1847 | | -'confirmprotect' => 'Confirm protection', |
| 1848 | | -'protectmoveonly' => 'Protect from moves only', |
| 1849 | | -'protectcomment' => 'Reason for protecting', |
| 1850 | | -'protectexpiry' => 'Expiry', |
| 1851 | | -'protect_expiry_invalid' => 'Expiry time is invalid.', |
| 1852 | | -'protect_expiry_old' => 'Expiry time is in the past.', |
| 1853 | | -'unprotectsub' =>"(Unprotecting \"$1\")", |
| 1854 | | -'confirmunprotecttext' => 'Do you really want to unprotect this page?', |
| 1855 | | -'confirmunprotect' => 'Confirm unprotection', |
| 1856 | | -'unprotectcomment' => 'Reason for unprotecting', |
| 1857 | | -'protect-unchain' => 'Unlock move permissions', |
| 1858 | | -'protect-text' => 'You may view and change the protection level here for the page <strong>$1</strong>.', |
| 1859 | | -'protect-locked-blocked' => 'You cannot change protection levels while blocked. Here are the |
| | 1828 | + |
| | 1829 | +'protectlogpage' => 'Protection log', |
| | 1830 | +'protectlogtext' => 'Below is a list of page locks and unlocks. See the [[Special:Protectedpages|protected pages list]] for the list of currently operational page protections.', |
| | 1831 | +'protectedarticle' => 'protected "[[$1]]"', |
| | 1832 | +'modifiedarticleprotection' => 'changed protection level for "[[$1]]"', |
| | 1833 | +'unprotectedarticle' => 'unprotected "[[$1]]"', |
| | 1834 | +'protectsub' => '(Protecting "$1")', |
| | 1835 | +'confirmprotect' => 'Confirm protection', |
| | 1836 | +'protect-fileonly' => 'Apply edit restrictions to file uploads only', |
| | 1837 | +'protectcomment' => 'Comment:', |
| | 1838 | +'protectexpiry' => 'Expires:', |
| | 1839 | +'protect_expiry_invalid' => 'Expiry time is invalid.', |
| | 1840 | +'protect_expiry_old' => 'Expiry time is in the past.', |
| | 1841 | +'unprotectsub' => '(Unprotecting "$1")', |
| | 1842 | +'protect-unchain' => 'Unlock move permissions', |
| | 1843 | +'protect-text' => 'You may view and change the protection level here for the page <strong>$1</strong>.', |
| | 1844 | +'protect-locked-blocked' => 'You cannot change protection levels while blocked. Here are the |
| 1860 | 1845 | current settings for the page <strong>$1</strong>:', |
| 1861 | | -'protect-locked-dblock' => 'Protection levels cannot be changed due to an active database lock. |
| | 1846 | +'protect-locked-dblock' => 'Protection levels cannot be changed due to an active database lock. |
| 1862 | 1847 | Here are the current settings for the page <strong>$1</strong>:', |
| 1863 | | -'protect-locked-access' => 'Your account does not have permission to change page protection levels. |
| | 1848 | +'protect-locked-access' => 'Your account does not have permission to change page protection levels. |
| 1864 | 1849 | Here are the current settings for the page <strong>$1</strong>:', |
| 1865 | | -'protect-cascadeon' => "This page is currently protected because it is included in the following {{PLURAL:$1|page, which has|pages, which have}} cascading protection turned on. You can change this page's protection level, but it will not affect the cascading protection.", |
| 1866 | | -'protect-default' => '(default)', |
| | 1850 | +'protect-cascadeon' => "This page is currently protected because it is included in the following {{PLURAL:$1|page, which has|pages, which have}} cascading protection turned on. You can change this page's protection level, but it will not affect the cascading protection.", |
| | 1851 | +'protect-default' => '(default)', |
| 1867 | 1852 | 'protect-level-autoconfirmed' => 'Block unregistered users', |
| 1868 | | -'protect-level-sysop' => 'Sysops only', |
| 1869 | | -'protect-summary-cascade' => 'cascading', |
| 1870 | | -'protect-expiring' => 'expires $1 (UTC)', |
| 1871 | | -'protect-cascade' => 'Cascading protection - protect any pages included in this page.', |
| 1872 | | -'restriction-type' => 'Permission:', |
| 1873 | | -'restriction-level' => 'Restriction level:', |
| 1874 | | -'minimum-size' => 'Min size', |
| 1875 | | -'maximum-size' => 'Max size', |
| 1876 | | -'pagesize' => '(bytes)', |
| | 1853 | +'protect-level-sysop' => 'Sysops only', |
| | 1854 | +'protect-summary-cascade' => 'cascading', |
| | 1855 | +'protect-expiring' => 'expires $1 (UTC)', |
| | 1856 | +'protect-cascade' => 'Protect pages included in this page (cascading protection)', |
| | 1857 | +'restriction-type' => 'Permission:', |
| | 1858 | +'restriction-level' => 'Restriction level:', |
| | 1859 | +'minimum-size' => 'Min size', |
| | 1860 | +'maximum-size' => 'Max size', |
| | 1861 | +'pagesize' => '(bytes)', |
| 1877 | 1862 | |
| 1878 | | -# restrictions (nouns) |
| | 1863 | +# Restrictions (nouns) |
| 1879 | 1864 | 'restriction-edit' => 'Edit', |
| 1880 | 1865 | 'restriction-move' => 'Move', |
| | 1866 | +'restriction-upload' => 'Upload', |
| 1881 | 1867 | |
| 1882 | | -# restriction levels |
| 1883 | | -'restriction-level-sysop' => 'full protected', |
| | 1868 | +# Restriction levels |
| | 1869 | +'restriction-level-sysop' => 'full protected', |
| 1884 | 1870 | 'restriction-level-autoconfirmed' => 'semi protected', |
| 1885 | | -'restriction-level-all' => 'any level', |
| | 1871 | +'restriction-level-all' => 'any level', |
| 1886 | 1872 | |
| 1887 | | - |
| 1888 | 1873 | # Undelete |
| 1889 | | -'undelete' => 'View deleted pages', |
| 1890 | | -'undeletepage' => 'View and restore deleted pages', |
| 1891 | | -'viewdeletedpage' => 'View deleted pages', |
| 1892 | | -'undeletepagetext' => 'The following pages have been deleted but are still in the archive and |
| | 1874 | +'undelete' => 'View deleted pages', |
| | 1875 | +'undeletepage' => 'View and restore deleted pages', |
| | 1876 | +'viewdeletedpage' => 'View deleted pages', |
| | 1877 | +'undeletepagetitle' => '\'\'\'The following list consists of deleted revisions of [[$1]]\'\'\'.', |
| | 1878 | +'undeletepagetext' => 'The following pages have been deleted but are still in the archive and |
| 1893 | 1879 | can be restored. The archive may be periodically cleaned out.', |
| 1894 | | -'undeleteextrahelp' => "To restore the entire page, leave all radios deselected and click '''''Restore'''''. |
| | 1880 | +'undeleteextrahelp' => "To restore the entire page, leave all radios deselected and click '''''Restore'''''. |
| 1895 | 1881 | To perform a selective restoration, check the desired restore point below and click '''''Restore'''''. |
| 1896 | 1882 | Clicking '''''Reset''''' will reset this form. Note that you will have to re-select any options if you |
| 1897 | 1883 | use the navigation links.", |
| 1898 | | -'undeleterevisions' => "$1 {{PLURAL:$1|revision|revisions}} archived", |
| 1899 | | -'undeletehistory' => 'If you restore the page, these revisions will be restored to the page history. |
| 1900 | | -If a new page with the same name has been created since the deletion, the restored revisions will appear |
| 1901 | | -in the prior history.', |
| 1902 | | -'undeleterevdel' => 'Undeletion will not be performed if either it would result in the top page or image revision |
| 1903 | | -being restricted or it would result in an alternating page history between these and any live revisions for this page. ', |
| 1904 | | -'restorepoint' => 'Use the radio button column to restore only revisions from the specified time onwards.', |
| 1905 | | -'restorenone' => '(select this button to restore none of these revisions)', |
| 1906 | | -'undeletehistorynoadmin' => 'This article has been deleted. The reason for deletion is |
| | 1884 | +'undeleterevisions' => '$1 {{PLURAL:$1|revision|revisions}} archived', |
| | 1885 | +'undeletehistory' => 'If you restore the page, all revisions will be restored to the history. |
| | 1886 | +If a new page with the same name has been created since the deletion, the restored |
| | 1887 | +revisions will appear in the prior history, and the current revision of the live page |
| | 1888 | +will not be automatically replaced. Also note that restrictions on file revisions are lost upon restoration', |
| | 1889 | +'undeleterevdel' => 'Undeletion will not be performed if either it would result in the top page or image revision |
| | 1890 | +being restricted or it would result in an alternating page history between these and any live revisions for this page.', |
| | 1891 | +'undeletehistorynoadmin' => 'This article has been deleted. The reason for deletion is |
| 1907 | 1892 | shown in the summary below, along with details of the users who had edited this page |
| 1908 | 1893 | before deletion. The actual text of these deleted revisions is only available to administrators.', |
| 1909 | | -'undelete-revision' => 'Deleted revision of $1 from $2:', |
| 1910 | | -'undeleterevision-missing' => "Invalid or missing revision. You may have a bad link, or the |
| 1911 | | -revision may have been restored or removed from the archive.", |
| 1912 | | -'undeletebtn' => 'Restore', |
| 1913 | | -'undeletereset' => 'Reset', |
| 1914 | | -'undeletecomment' => 'Comment:', |
| 1915 | | -'undeletedarticle' => "restored \"[[$1]]\"", |
| 1916 | | -'undeletedrevisions' => "$1 {{PLURAL:$1|revision|revisions}} restored", |
| 1917 | | -'undeletedrevisions-files' => "$1 {{PLURAL:$1|revision|revisions}} and $2 {{PLURAL:$2|file|files}} restored", |
| 1918 | | -'undeletedfiles' => "$1 {{PLURAL:$1|file|files}} restored", |
| 1919 | | -'cannotundelete' => 'Undelete failed; someone else may have undeleted the page first.', |
| 1920 | | -'undeletedpage' => "<big>'''$1 has been restored'''</big> |
| | 1894 | +'restorepoint' => 'Use the radio button column to restore only revisions from the specified time onwards.', |
| | 1895 | +'restorenone' => '(select this button to restore none of these revisions)', |
| 1921 | 1896 | |
| | 1897 | +'undelete-revision' => 'Deleted revision of $1 from $2:', |
| | 1898 | +'undeleterevision-missing' => 'Invalid or missing revision. You may have a bad link, or the |
| | 1899 | +revision may have been restored or removed from the archive.', |
| | 1900 | +'undeletebtn' => 'Restore', |
| | 1901 | +'undeletereset' => 'Reset', |
| | 1902 | +'undeletecomment' => 'Comment:', |
| | 1903 | +'undeletedarticle' => 'restored "[[$1]]"', |
| | 1904 | +'undeletedrevisions' => '$1 {{PLURAL:$1|revision|revisions}} restored', |
| | 1905 | +'undeletedrevisions-files' => '$1 {{PLURAL:$1|revision|revisions}} and $2 {{PLURAL:$2|file|files}} restored', |
| | 1906 | +'undeletedfiles' => '$1 {{PLURAL:$1|file|files}} restored', |
| | 1907 | +'cannotundelete' => 'Undelete failed; someone else may have undeleted the page first.', |
| | 1908 | +'undeletedpage' => "<big>'''$1 has been restored'''</big> |
| | 1909 | + |
| 1922 | 1910 | Consult the [[Special:Log/delete|deletion log]] for a record of recent deletions and restorations.", |
| 1923 | | -'undelete-header' => 'See [[Special:Log/delete|the deletion log]] for recently deleted pages or revisions.', |
| 1924 | | -'undelete-search-box' => 'Search deleted pages', |
| 1925 | | -'undelete-search-prefix' => 'Show pages starting with:', |
| 1926 | | -'undelete-search-submit' => 'Search', |
| 1927 | | -'undelete-no-results' => 'No matching pages found in the deletion archive.', |
| | 1911 | +'undelete-header' => 'See [[Special:Log/delete|the deletion log]] for recently deleted pages.', |
| | 1912 | +'undelete-search-box' => 'Search deleted pages', |
| | 1913 | +'undelete-search-prefix' => 'Show pages starting with:', |
| | 1914 | +'undelete-search-submit' => 'Search', |
| | 1915 | +'undelete-no-results' => 'No matching pages found in the deletion archive.', |
| 1928 | 1916 | |
| 1929 | 1917 | # Namespace form on various pages |
| 1930 | 1918 | 'namespace' => 'Namespace:', |
| 1931 | | -'invert' => 'Invert selection', |
| | 1919 | +'invert' => 'Invert selection', |
| 1932 | 1920 | |
| 1933 | 1921 | # Contributions |
| 1934 | | -# |
| 1935 | 1922 | 'contributions' => 'User contributions', |
| 1936 | 1923 | 'mycontris' => 'My contributions', |
| 1937 | | -'contribsub2' => "For $1 ($2)", |
| | 1924 | +'contribsub2' => 'For $1 ($2)', |
| 1938 | 1925 | 'nocontribs' => 'No changes were found matching these criteria.', |
| 1939 | 1926 | 'ucnote' => "Below are this user's last <b>$1</b> changes in the last <b>$2</b> days.", |
| 1940 | | -'uclinks' => "View the last $1 changes; view the last $2 days.", |
| 1941 | | -'uctop' => ' (top)' , |
| | 1927 | +'uclinks' => 'View the last $1 changes; view the last $2 days.', |
| | 1928 | +'uctop' => ' (top)', |
| 1942 | 1929 | |
| 1943 | 1930 | 'sp-contributions-newest' => 'Newest', |
| 1944 | 1931 | 'sp-contributions-oldest' => 'Oldest', |
| — | — | @@ -1949,16 +1936,15 @@ |
| 1950 | 1937 | 'sp-contributions-search' => 'Search for contributions', |
| 1951 | 1938 | 'sp-contributions-username' => 'IP Address or username:', |
| 1952 | 1939 | 'sp-contributions-submit' => 'Search', |
| 1953 | | -'sp-contributions-footer' => '-', |
| 1954 | | -'sp-contributions-footer-anon' => '-', |
| | 1940 | +'sp-contributions-footer' => '-', # don't translate or duplicate this message to other languages |
| | 1941 | +'sp-contributions-footer-anon' => '-', # don't translate or duplicate this message to other languages |
| 1955 | 1942 | |
| 1956 | 1943 | 'sp-newimages-showfrom' => 'Show new images starting from $1', |
| 1957 | 1944 | |
| 1958 | 1945 | # What links here |
| 1959 | | -# |
| 1960 | 1946 | 'whatlinkshere' => 'What links here', |
| 1961 | | -'whatlinkshere-summary' => '', |
| 1962 | | -'whatlinkshere-barrow' => '<', |
| | 1947 | +'whatlinkshere-summary' => '', # only translate this message to other languages if you have to change it |
| | 1948 | +'whatlinkshere-barrow' => '<', # only translate this message to other languages if you have to change it |
| 1963 | 1949 | 'notargettitle' => 'No target', |
| 1964 | 1950 | 'notargettext' => 'You have not specified a target page or user |
| 1965 | 1951 | to perform this function on.', |
| — | — | @@ -1970,21 +1956,21 @@ |
| 1971 | 1957 | 'istemplate' => 'inclusion', |
| 1972 | 1958 | 'whatlinkshere-prev' => '{{PLURAL:$1|previous|previous $1}}', |
| 1973 | 1959 | 'whatlinkshere-next' => '{{PLURAL:$1|next|next $1}}', |
| | 1960 | +'whatlinkshere-links' => '← links', |
| 1974 | 1961 | |
| 1975 | | -# Block/unblock IP |
| 1976 | | -# |
| 1977 | | -'blockip' => 'Block user', |
| 1978 | | -'blockiptext' => "Use the form below to block write access |
| | 1962 | +# Block/unblock |
| | 1963 | +'blockip' => 'Block user', |
| | 1964 | +'blockiptext' => 'Use the form below to block write access |
| 1979 | 1965 | from a specific IP address or username. |
| 1980 | 1966 | This should be done only to prevent vandalism, and in |
| 1981 | 1967 | accordance with [[{{MediaWiki:policy-url}}|policy]]. |
| 1982 | 1968 | Fill in a specific reason below (for example, citing particular |
| 1983 | | -pages that were vandalized).", |
| 1984 | | -'ipaddress' => 'IP Address:', |
| 1985 | | -'ipadressorusername' => 'IP Address or username:', |
| 1986 | | -'ipbexpiry' => 'Expiry:', |
| 1987 | | -'ipbreason' => 'Reason:', |
| 1988 | | -'ipbreasonotherlist' => 'Other reason', |
| | 1969 | +pages that were vandalized).', |
| | 1970 | +'ipaddress' => 'IP Address:', |
| | 1971 | +'ipadressorusername' => 'IP Address or username:', |
| | 1972 | +'ipbexpiry' => 'Expiry:', |
| | 1973 | +'ipbreason' => 'Reason:', |
| | 1974 | +'ipbreasonotherlist' => 'Other reason', |
| 1989 | 1975 | |
| 1990 | 1976 | // These are examples only. They can be translated but should be adjusted via |
| 1991 | 1977 | // [[MediaWiki:ipbreason-list]] by the local community |
| — | — | @@ -1992,7 +1978,7 @@ |
| 1993 | 1979 | // * defines a block reason group in the drow down menu |
| 1994 | 1980 | // ** defines a block reason |
| 1995 | 1981 | // To disable this drop down menu enter '-' in [[MediaWiki:ipbreason-dropdown]]. |
| 1996 | | -'ipbreason-dropdown' => ' |
| | 1982 | +'ipbreason-dropdown' => ' |
| 1997 | 1983 | *Common block reasons |
| 1998 | 1984 | ** Inserting false information |
| 1999 | 1985 | ** Removing content from pages |
| — | — | @@ -2001,97 +1987,97 @@ |
| 2002 | 1988 | ** Intimidating behaviour/harassment |
| 2003 | 1989 | ** Abusing multiple accounts |
| 2004 | 1990 | ** Unacceptable username', |
| 2005 | | -'ipbanononly' => 'Block anonymous users only', |
| 2006 | | -'ipbcreateaccount' => 'Prevent account creation', |
| 2007 | | -'ipbenableautoblock' => 'Automatically block the last IP address used by this user, and any subsequent IPs they try to edit from', |
| 2008 | | -'ipbsubmit' => 'Block this user', |
| 2009 | | -'ipbother' => 'Other time:', |
| 2010 | | -'ipboptions' => '2 hours:2 hours,1 day:1 day,3 days:3 days,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,infinite:infinite', |
| 2011 | | -'ipbotheroption' => 'other', |
| 2012 | | -'ipbotherreason' => 'Other/additional reason:', |
| 2013 | | -'ipbhidename' => 'Hide username/IP from the block log, active block list and user list', |
| 2014 | | -'badipaddress' => 'Invalid IP address', |
| 2015 | | -'blockipsuccesssub' => 'Block succeeded', |
| 2016 | | -'blockipsuccesstext' => '[[Special:Contributions/$1|$1]] has been blocked. |
| | 1991 | +'ipbanononly' => 'Block anonymous users only', |
| | 1992 | +'ipbcreateaccount' => 'Prevent account creation', |
| | 1993 | +'ipbemailban' => 'Prevent user from sending e-mail', |
| | 1994 | +'ipbenableautoblock' => 'Automatically block the last IP address used by this user, and any subsequent IPs they try to edit from', |
| | 1995 | +'ipbsubmit' => 'Block this user', |
| | 1996 | +'ipbother' => 'Other time:', |
| | 1997 | +'ipboptions' => '2 hours:2 hours,1 day:1 day,3 days:3 days,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,infinite:infinite', |
| | 1998 | +'ipbotheroption' => 'other', |
| | 1999 | +'ipbotherreason' => 'Other/additional reason:', |
| | 2000 | +'ipbhidename' => 'Hide username/IP from the block log, active block list and user list', |
| | 2001 | +'badipaddress' => 'Invalid IP address', |
| | 2002 | +'blockipsuccesssub' => 'Block succeeded', |
| | 2003 | +'blockipsuccesstext' => '[[Special:Contributions/$1|$1]] has been blocked. |
| 2017 | 2004 | <br />See [[Special:Ipblocklist|IP block list]] to review blocks.', |
| 2018 | | -'ipb-edit-dropdown' => 'Edit block reasons', |
| 2019 | | -'ipb-unblock-addr' => 'Unblock $1', |
| 2020 | | -'ipb-unblock' => 'Unblock a username or IP address', |
| 2021 | | -'ipb-blocklist-addr' => 'View existing blocks for $1', |
| 2022 | | -'ipb-blocklist' => 'View existing blocks', |
| 2023 | | -'unblockip' => 'Unblock user', |
| 2024 | | -'unblockiptext' => 'Use the form below to restore write access |
| | 2005 | +'ipb-edit-dropdown' => 'Edit block reasons', |
| | 2006 | +'ipb-unblock-addr' => 'Unblock $1', |
| | 2007 | +'ipb-unblock' => 'Unblock a username or IP address', |
| | 2008 | +'ipb-blocklist-addr' => 'View existing blocks for $1', |
| | 2009 | +'ipb-blocklist' => 'View existing blocks', |
| | 2010 | +'unblockip' => 'Unblock user', |
| | 2011 | +'unblockiptext' => 'Use the form below to restore write access |
| 2025 | 2012 | to a previously blocked IP address or username.', |
| 2026 | | -'ipusubmit' => 'Unblock this address', |
| 2027 | | -'unblocked' => '[[User:$1|$1]] has been unblocked', |
| 2028 | | -'unblocked-id' => 'Block $1 has been removed', |
| 2029 | | -'ipblocklist' => 'List of blocked IP addresses and usernames', |
| 2030 | | -'ipblocklist-summary' => '', |
| 2031 | | -'ipblocklist-submit' => 'Search', |
| 2032 | | -'blocklistline' => "$1, $2 blocked $3 ($4)", |
| 2033 | | -'infiniteblock' => 'infinite', |
| 2034 | | -'expiringblock' => 'expires $1', |
| 2035 | | -'anononlyblock' => 'anon. only', |
| 2036 | | -'noautoblockblock' => 'autoblock disabled', |
| 2037 | | -'createaccountblock' => 'account creation blocked', |
| 2038 | | -'ipblocklist-empty' => 'The blocklist is empty.', |
| 2039 | | -'ipblocklist-no-results' => 'The requested IP address or username is not blocked.', |
| 2040 | | -'blocklink' => 'block', |
| 2041 | | -'unblocklink' => 'unblock', |
| 2042 | | -'contribslink' => 'contribs', |
| 2043 | | -'autoblocker' => 'Autoblocked because your IP address has been recently used by "[[User:$1|$1]]". The reason given for $1\'s block is: "$2"', |
| 2044 | | -'blocklogpage' => 'Block log', |
| 2045 | | -'blocklogentry' => 'blocked "[[$1]]" with an expiry time of $2 $3', |
| 2046 | | -'blocklogtext' => 'This is a log of user blocking and unblocking actions. Automatically |
| | 2013 | +'ipusubmit' => 'Unblock this address', |
| | 2014 | +'unblocked' => '[[User:$1|$1]] has been unblocked', |
| | 2015 | +'unblocked-id' => 'Block $1 has been removed', |
| | 2016 | +'ipblocklist' => 'List of blocked IP addresses and usernames', |
| | 2017 | +'ipblocklist-summary' => '', # only translate this message to other languages if you have to change it |
| | 2018 | +'ipblocklist-submit' => 'Search', |
| | 2019 | +'blocklistline' => '$1, $2 blocked $3 ($4)', |
| | 2020 | +'infiniteblock' => 'infinite', |
| | 2021 | +'expiringblock' => 'expires $1', |
| | 2022 | +'anononlyblock' => 'anon. only', |
| | 2023 | +'noautoblockblock' => 'autoblock disabled', |
| | 2024 | +'createaccountblock' => 'account creation blocked', |
| | 2025 | +'emailblock' => 'e-mail blocked', |
| | 2026 | +'ipblocklist-empty' => 'The blocklist is empty.', |
| | 2027 | +'ipblocklist-no-results' => 'The requested IP address or username is not blocked.', |
| | 2028 | +'blocklink' => 'block', |
| | 2029 | +'unblocklink' => 'unblock', |
| | 2030 | +'contribslink' => 'contribs', |
| | 2031 | +'autoblocker' => 'Autoblocked because your IP address has been recently used by "[[User:$1|$1]]". The reason given for $1\'s block is: "$2"', |
| | 2032 | +'blocklogpage' => 'Block log', |
| | 2033 | +'blocklogentry' => 'blocked "[[$1]]" with an expiry time of $2 $3', |
| | 2034 | +'blocklogtext' => 'This is a log of user blocking and unblocking actions. Automatically |
| 2047 | 2035 | blocked IP addresses are not listed. See the [[Special:Ipblocklist|IP block list]] for |
| 2048 | 2036 | the list of currently operational bans and blocks.', |
| 2049 | | -'unblocklogentry' => 'unblocked $1', |
| 2050 | | -'block-log-flags-anononly' => 'anonymous users only', |
| 2051 | | -'block-log-flags-nocreate' => 'account creation disabled', |
| | 2037 | +'unblocklogentry' => 'unblocked $1', |
| | 2038 | +'block-log-flags-anononly' => 'anonymous users only', |
| | 2039 | +'block-log-flags-nocreate' => 'account creation disabled', |
| 2052 | 2040 | 'block-log-flags-noautoblock' => 'autoblock disabled', |
| 2053 | | -'range_block_disabled' => 'The sysop ability to create range blocks is disabled.', |
| 2054 | | -'ipb_expiry_invalid' => 'Expiry time invalid.', |
| 2055 | | -'ipb_already_blocked' => '"$1" is already blocked', |
| 2056 | | -'ip_range_invalid' => 'Invalid IP range.', |
| 2057 | | -'proxyblocker' => 'Proxy blocker', |
| 2058 | | -'ipb_cant_unblock' => 'Error: Block ID $1 not found. It may have been unblocked already.', |
| 2059 | | -'proxyblockreason' => 'Your IP address has been blocked because it is an open proxy. Please contact your Internet service provider or tech support and inform them of this serious security problem.', |
| 2060 | | -'proxyblocksuccess' => 'Done.', |
| 2061 | | -'sorbs' => 'DNSBL', |
| 2062 | | -'sorbsreason' => 'Your IP address is listed as an open proxy in the DNSBL used by this site.', |
| | 2041 | +'block-log-flags-noemail' => 'e-mail blocked', |
| | 2042 | +'range_block_disabled' => 'The sysop ability to create range blocks is disabled.', |
| | 2043 | +'ipb_expiry_invalid' => 'Expiry time invalid.', |
| | 2044 | +'ipb_already_blocked' => '"$1" is already blocked', |
| | 2045 | +'ip_range_invalid' => 'Invalid IP range.', |
| | 2046 | +'proxyblocker' => 'Proxy blocker', |
| | 2047 | +'ipb_cant_unblock' => 'Error: Block ID $1 not found. It may have been unblocked already.', |
| | 2048 | +'proxyblockreason' => 'Your IP address has been blocked because it is an open proxy. Please contact your Internet service provider or tech support and inform them of this serious security problem.', |
| | 2049 | +'proxyblocksuccess' => 'Done.', |
| | 2050 | +'sorbs' => 'DNSBL', |
| | 2051 | +'sorbsreason' => 'Your IP address is listed as an open proxy in the DNSBL used by this site.', |
| 2063 | 2052 | 'sorbs_create_account_reason' => 'Your IP address is listed as an open proxy in the DNSBL used by this site. You cannot create an account', |
| 2064 | 2053 | |
| 2065 | | - |
| 2066 | 2054 | # Developer tools |
| 2067 | | -# |
| 2068 | | -'lockdb' => 'Lock database', |
| 2069 | | -'unlockdb' => 'Unlock database', |
| 2070 | | -'lockdbtext' => 'Locking the database will suspend the ability of all |
| | 2055 | +'lockdb' => 'Lock database', |
| | 2056 | +'unlockdb' => 'Unlock database', |
| | 2057 | +'lockdbtext' => 'Locking the database will suspend the ability of all |
| 2071 | 2058 | users to edit pages, change their preferences, edit their watchlists, and |
| 2072 | 2059 | other things requiring changes in the database. |
| 2073 | 2060 | Please confirm that this is what you intend to do, and that you will |
| 2074 | 2061 | unlock the database when your maintenance is done.', |
| 2075 | | -'unlockdbtext' => 'Unlocking the database will restore the ability of all |
| | 2062 | +'unlockdbtext' => 'Unlocking the database will restore the ability of all |
| 2076 | 2063 | users to edit pages, change their preferences, edit their watchlists, and |
| 2077 | 2064 | other things requiring changes in the database. |
| 2078 | 2065 | Please confirm that this is what you intend to do.', |
| 2079 | | -'lockconfirm' => 'Yes, I really want to lock the database.', |
| 2080 | | -'unlockconfirm' => 'Yes, I really want to unlock the database.', |
| 2081 | | -'lockbtn' => 'Lock database', |
| 2082 | | -'unlockbtn' => 'Unlock database', |
| 2083 | | -'locknoconfirm' => 'You did not check the confirmation box.', |
| 2084 | | -'lockdbsuccesssub' => 'Database lock succeeded', |
| 2085 | | -'unlockdbsuccesssub' => 'Database lock removed', |
| 2086 | | -'lockdbsuccesstext' => 'The database has been locked. |
| | 2066 | +'lockconfirm' => 'Yes, I really want to lock the database.', |
| | 2067 | +'unlockconfirm' => 'Yes, I really want to unlock the database.', |
| | 2068 | +'lockbtn' => 'Lock database', |
| | 2069 | +'unlockbtn' => 'Unlock database', |
| | 2070 | +'locknoconfirm' => 'You did not check the confirmation box.', |
| | 2071 | +'lockdbsuccesssub' => 'Database lock succeeded', |
| | 2072 | +'unlockdbsuccesssub' => 'Database lock removed', |
| | 2073 | +'lockdbsuccesstext' => 'The database has been locked. |
| 2087 | 2074 | <br />Remember to [[Special:Unlockdb|remove the lock]] after your maintenance is complete.', |
| 2088 | 2075 | 'unlockdbsuccesstext' => 'The database has been unlocked.', |
| 2089 | 2076 | 'lockfilenotwritable' => 'The database lock file is not writable. To lock or unlock the database, this needs to be writable by the web server.', |
| 2090 | | -'databasenotlocked' => 'The database is not locked.', |
| | 2077 | +'databasenotlocked' => 'The database is not locked.', |
| 2091 | 2078 | |
| 2092 | 2079 | # Move page |
| 2093 | | -# |
| 2094 | | -'movepage' => 'Move page', |
| 2095 | | -'movepagetext' => 'Using the form below will rename a page, moving all |
| | 2080 | +'movepage' => 'Move page', |
| | 2081 | +'movepagetext' => "Using the form below will rename a page, moving all |
| 2096 | 2082 | of its history to the new name. |
| 2097 | 2083 | The old title will become a redirect page to the new title. |
| 2098 | 2084 | Links to the old page title will not be changed; be sure to |
| — | — | @@ -2099,7 +2085,7 @@ |
| 2100 | 2086 | You are responsible for making sure that links continue to |
| 2101 | 2087 | point where they are supposed to go. |
| 2102 | 2088 | |
| 2103 | | -Note that the page will \'\'\'not\'\'\' be moved if there is already |
| | 2089 | +Note that the page will '''not''' be moved if there is already |
| 2104 | 2090 | a page at the new title, unless it is empty or a redirect and has no |
| 2105 | 2091 | past edit history. This means that you can rename a page back to where |
| 2106 | 2092 | it was just renamed from if you make a mistake, and you cannot overwrite |
| — | — | @@ -2108,49 +2094,47 @@ |
| 2109 | 2095 | <b>WARNING!</b> |
| 2110 | 2096 | This can be a drastic and unexpected change for a popular page; |
| 2111 | 2097 | please be sure you understand the consequences of this before |
| 2112 | | -proceeding.', |
| 2113 | | -'movepagetalktext' => 'The associated talk page will be automatically moved along with it \'\'\'unless:\'\'\' |
| | 2098 | +proceeding.", |
| | 2099 | +'movepagetalktext' => "The associated talk page will be automatically moved along with it '''unless:''' |
| 2114 | 2100 | *A non-empty talk page already exists under the new name, or |
| 2115 | 2101 | *You uncheck the box below. |
| 2116 | 2102 | |
| 2117 | | -In those cases, you will have to move or merge the page manually if desired.', |
| 2118 | | -'movearticle' => 'Move page', |
| 2119 | | -'movenologin' => 'Not logged in', |
| 2120 | | -'movenologintext' => "You must be a registered user and [[Special:Userlogin|logged in]] |
| 2121 | | -to move a page.", |
| 2122 | | -'newtitle' => 'To new title', |
| 2123 | | -'move-watch' => 'Watch this page', |
| 2124 | | -'movepagebtn' => 'Move page', |
| 2125 | | -'pagemovedsub' => 'Move succeeded', |
| 2126 | | -'pagemovedtext' => "Page \"[[$1]]\" moved to \"[[$2]]\".", |
| 2127 | | -'articleexists' => 'A page of that name already exists, or the |
| | 2103 | +In those cases, you will have to move or merge the page manually if desired.", |
| | 2104 | +'movearticle' => 'Move page', |
| | 2105 | +'movenologin' => 'Not logged in', |
| | 2106 | +'movenologintext' => 'You must be a registered user and [[Special:Userlogin|logged in]] |
| | 2107 | +to move a page.', |
| | 2108 | +'newtitle' => 'To new title', |
| | 2109 | +'move-watch' => 'Watch this page', |
| | 2110 | +'movepagebtn' => 'Move page', |
| | 2111 | +'pagemovedsub' => 'Move succeeded', |
| | 2112 | +'pagemovedtext' => 'Page "[[$1]]" moved to "[[$2]]".', |
| | 2113 | +'articleexists' => 'A page of that name already exists, or the |
| 2128 | 2114 | name you have chosen is not valid. |
| 2129 | 2115 | Please choose another name.', |
| 2130 | | -'talkexists' => "'''The page itself was moved successfully, but the talk page could not be moved because one already exists at the new title. Please merge them manually.'''", |
| 2131 | | -'movedto' => 'moved to', |
| 2132 | | -'movetalk' => 'Move associated talk page', |
| 2133 | | -'talkpagemoved' => 'The corresponding talk page was also moved.', |
| 2134 | | -'talkpagenotmoved' => 'The corresponding talk page was <strong>not</strong> moved.', |
| 2135 | | -'1movedto2' => '[[$1]] moved to [[$2]]', |
| 2136 | | -'1movedto2_redir' => '[[$1]] moved to [[$2]] over redirect', |
| 2137 | | -'movelogpage' => 'Move log', |
| 2138 | | -'movelogpagetext' => 'Below is a list of page moved.', |
| 2139 | | -'movereason' => 'Reason', |
| 2140 | | -'revertmove' => 'revert', |
| 2141 | | -'delete_and_move' => 'Delete and move', |
| 2142 | | -'delete_and_move_text' => |
| 2143 | | -'==Deletion required== |
| | 2116 | +'talkexists' => "'''The page itself was moved successfully, but the talk page could not be moved because one already exists at the new title. Please merge them manually.'''", |
| | 2117 | +'movedto' => 'moved to', |
| | 2118 | +'movetalk' => 'Move associated talk page', |
| | 2119 | +'talkpagemoved' => 'The corresponding talk page was also moved.', |
| | 2120 | +'talkpagenotmoved' => 'The corresponding talk page was <strong>not</strong> moved.', |
| | 2121 | +'1movedto2' => '[[$1]] moved to [[$2]]', |
| | 2122 | +'1movedto2_redir' => '[[$1]] moved to [[$2]] over redirect', |
| | 2123 | +'movelogpage' => 'Move log', |
| | 2124 | +'movelogpagetext' => 'Below is a list of page moved.', |
| | 2125 | +'movereason' => 'Reason', |
| | 2126 | +'revertmove' => 'revert', |
| | 2127 | +'delete_and_move' => 'Delete and move', |
| | 2128 | +'delete_and_move_text' => '==Deletion required== |
| 2144 | 2129 | |
| 2145 | 2130 | The destination article "[[$1]]" already exists. Do you want to delete it to make way for the move?', |
| 2146 | 2131 | 'delete_and_move_confirm' => 'Yes, delete the page', |
| 2147 | | -'delete_and_move_reason' => 'Deleted to make way for move', |
| 2148 | | -'selfmove' => "Source and destination titles are the same; can't move a page over itself.", |
| 2149 | | -'immobile_namespace' => "Source or destination title is of a special type; cannot move pages from and into that namespace.", |
| | 2132 | +'delete_and_move_reason' => 'Deleted to make way for move', |
| | 2133 | +'selfmove' => "Source and destination titles are the same; can't move a page over itself.", |
| | 2134 | +'immobile_namespace' => 'Source or destination title is of a special type; cannot move pages from and into that namespace.', |
| 2150 | 2135 | |
| 2151 | 2136 | # Export |
| 2152 | | - |
| 2153 | | -'export' => 'Export pages', |
| 2154 | | -'exporttext' => 'You can export the text and editing history of a particular page or |
| | 2137 | +'export' => 'Export pages', |
| | 2138 | +'exporttext' => 'You can export the text and editing history of a particular page or |
| 2155 | 2139 | set of pages wrapped in some XML. This can be imported into another wiki using MediaWiki |
| 2156 | 2140 | via the [[Special:Import|import page]]. |
| 2157 | 2141 | |
| — | — | @@ -2159,314 +2143,311 @@ |
| 2160 | 2144 | history lines, or just the current version with the info about the last edit. |
| 2161 | 2145 | |
| 2162 | 2146 | In the latter case you can also use a link, e.g. [[{{ns:Special}}:Export/{{MediaWiki:mainpage}}]] for the page {{MediaWiki:mainpage}}.', |
| 2163 | | -'exportcuronly' => 'Include only the current revision, not the full history', |
| 2164 | | -'exportnohistory' => "---- |
| | 2147 | +'exportcuronly' => 'Include only the current revision, not the full history', |
| | 2148 | +'exportnohistory' => "---- |
| 2165 | 2149 | '''Note:''' Exporting the full history of pages through this form has been disabled due to performance reasons.", |
| 2166 | | -'export-submit' => 'Export', |
| | 2150 | +'export-submit' => 'Export', |
| 2167 | 2151 | 'export-addcattext' => 'Add pages from category:', |
| 2168 | | -'export-addcat' => 'Add', |
| | 2152 | +'export-addcat' => 'Add', |
| 2169 | 2153 | |
| 2170 | 2154 | # Namespace 8 related |
| 2171 | | - |
| 2172 | | -'allmessages' => 'System messages', |
| 2173 | | -'allmessagesname' => 'Name', |
| 2174 | | -'allmessagesdefault' => 'Default text', |
| 2175 | | -'allmessagescurrent' => 'Current text', |
| 2176 | | -'allmessagestext' => 'This is a list of system messages available in the MediaWiki namespace.', |
| | 2155 | +'allmessages' => 'System messages', |
| | 2156 | +'allmessagesname' => 'Name', |
| | 2157 | +'allmessagesdefault' => 'Default text', |
| | 2158 | +'allmessagescurrent' => 'Current text', |
| | 2159 | +'allmessagestext' => 'This is a list of system messages available in the MediaWiki namespace.', |
| 2177 | 2160 | 'allmessagesnotsupportedUI' => 'Your current interface language <b>$1</b> is not supported by {{ns:special}}:Allmessages at this site.', |
| 2178 | | -'allmessagesnotsupportedDB' => '\'\'\'{{ns:special}}:Allmessages\'\'\' cannot be used because \'\'\'$wgUseDatabaseMessages\'\'\' is switched off.', |
| 2179 | | -'allmessagesfilter' => 'Message name filter:', |
| 2180 | | -'allmessagesmodified' => 'Show only modified', |
| | 2161 | +'allmessagesnotsupportedDB' => "'''{{ns:special}}:Allmessages''' cannot be used because '''\$wgUseDatabaseMessages''' is switched off.", |
| | 2162 | +'allmessagesfilter' => 'Message name filter:', |
| | 2163 | +'allmessagesmodified' => 'Show only modified', |
| 2181 | 2164 | |
| 2182 | | - |
| 2183 | 2165 | # Thumbnails |
| 2184 | | - |
| 2185 | | -'thumbnail-more' => 'Enlarge', |
| 2186 | | -'missingimage' => '<b>Missing image</b><br /><i>$1</i>', |
| 2187 | | -'filemissing' => 'File missing', |
| 2188 | | -'thumbnail_error' => 'Error creating thumbnail: $1', |
| 2189 | | -'djvu_page_error' => 'DjVu page out of range', |
| 2190 | | -'djvu_no_xml' => 'Unable to fetch XML for DjVu file', |
| | 2166 | +'thumbnail-more' => 'Enlarge', |
| | 2167 | +'missingimage' => '<b>Missing image</b><br /><i>$1</i>', |
| | 2168 | +'filemissing' => 'File missing', |
| | 2169 | +'thumbnail_error' => 'Error creating thumbnail: $1', |
| | 2170 | +'djvu_page_error' => 'DjVu page out of range', |
| | 2171 | +'djvu_no_xml' => 'Unable to fetch XML for DjVu file', |
| 2191 | 2172 | 'thumbnail_invalid_params' => 'Invalid thumbnail parameters', |
| 2192 | 2173 | 'thumbnail_dest_directory' => 'Unable to create destination directory', |
| 2193 | 2174 | |
| 2194 | 2175 | # Special:Import |
| 2195 | | -'import' => 'Import pages', |
| 2196 | | -'importinterwiki' => 'Transwiki import', |
| 2197 | | -'import-interwiki-text' => 'Select a wiki and page title to import. |
| 2198 | | -Revision dates and editors\' names will be preserved. |
| 2199 | | -All transwiki import actions are logged at the [[Special:Log/import|import log]].', |
| 2200 | | -'import-interwiki-history' => 'Copy all history versions for this page', |
| 2201 | | -'import-interwiki-submit' => 'Import', |
| | 2176 | +'import' => 'Import pages', |
| | 2177 | +'importinterwiki' => 'Transwiki import', |
| | 2178 | +'import-interwiki-text' => "Select a wiki and page title to import. |
| | 2179 | +Revision dates and editors' names will be preserved. |
| | 2180 | +All transwiki import actions are logged at the [[Special:Log/import|import log]].", |
| | 2181 | +'import-interwiki-history' => 'Copy all history versions for this page', |
| | 2182 | +'import-interwiki-submit' => 'Import', |
| 2202 | 2183 | 'import-interwiki-namespace' => 'Transfer pages into namespace:', |
| 2203 | | -'importtext' => 'Please export the file from the source wiki using the Special:Export utility, save it to |
| 2204 | | -your disk and upload it here. Note that if the page used by an imported revision already exists, the revision |
| 2205 | | -will only be inserted if it is newer than or predates the page history.', |
| 2206 | | -'importstart' => "Importing pages...", |
| 2207 | | -'import-revision-count' => '$1 {{PLURAL:$1|revision|revisions}}', |
| 2208 | | -'importnopages' => "No pages to import.", |
| 2209 | | -'importfailed' => "Import failed: $1", |
| 2210 | | -'importunknownsource' => "Unknown import source type", |
| 2211 | | -'importcantopen' => "Couldn't open import file", |
| 2212 | | -'importbadinterwiki' => "Bad interwiki link", |
| 2213 | | -'importnotext' => 'Empty or no text', |
| 2214 | | -'importsuccess' => 'Import succeeded!', |
| 2215 | | -'importhistoryconflict' => 'Conflicting history revision exists (may have imported this page before)', |
| 2216 | | -'importnosources' => 'No transwiki import sources have been defined and direct history uploads are disabled.', |
| 2217 | | -'importnofile' => 'No import file was uploaded.', |
| 2218 | | -'importuploaderror' => 'Upload of import file failed; perhaps the file is bigger than the allowed upload size.', |
| | 2184 | +'importtext' => 'Please export the file from the source wiki using the Special:Export utility, save it to your disk and upload it here.', |
| | 2185 | +'importstart' => 'Importing pages...', |
| | 2186 | +'import-revision-count' => '$1 {{PLURAL:$1|revision|revisions}}', |
| | 2187 | +'importnopages' => 'No pages to import.', |
| | 2188 | +'importfailed' => 'Import failed: $1', |
| | 2189 | +'importunknownsource' => 'Unknown import source type', |
| | 2190 | +'importcantopen' => "Couldn't open import file", |
| | 2191 | +'importbadinterwiki' => 'Bad interwiki link', |
| | 2192 | +'importnotext' => 'Empty or no text', |
| | 2193 | +'importsuccess' => 'Import succeeded!', |
| | 2194 | +'importhistoryconflict' => 'Conflicting history revision exists (may have imported this page before)', |
| | 2195 | +'importnosources' => 'No transwiki import sources have been defined and direct history uploads are disabled.', |
| | 2196 | +'importnofile' => 'No import file was uploaded.', |
| | 2197 | +'importuploaderror' => 'Upload of import file failed; perhaps the file is bigger than the allowed upload size.', |
| 2219 | 2198 | |
| 2220 | | -# import log |
| 2221 | | -'importlogpage' => 'Import log', |
| 2222 | | -'importlogpagetext' => 'Administrative imports of pages with edit history from other wikis.', |
| 2223 | | -'import-logentry-upload' => 'imported [[$1]] by file upload', |
| 2224 | | -'import-logentry-upload-detail' => '$1 revision(s)', |
| 2225 | | -'import-logentry-interwiki' => 'transwikied $1', |
| | 2199 | +# Import log |
| | 2200 | +'importlogpage' => 'Import log', |
| | 2201 | +'importlogpagetext' => 'Administrative imports of pages with edit history from other wikis.', |
| | 2202 | +'import-logentry-upload' => 'imported [[$1]] by file upload', |
| | 2203 | +'import-logentry-upload-detail' => '$1 revision(s)', |
| | 2204 | +'import-logentry-interwiki' => 'transwikied $1', |
| 2226 | 2205 | 'import-logentry-interwiki-detail' => '$1 revision(s) from $2', |
| 2227 | 2206 | |
| 2228 | | - |
| 2229 | 2207 | # Keyboard access keys for power users |
| 2230 | | -'accesskey-pt-userpage' => '.', |
| 2231 | | -'accesskey-pt-anonuserpage' => '.', |
| 2232 | | -'accesskey-pt-mytalk' => 'n', |
| 2233 | | -'accesskey-pt-anontalk' => 'n', |
| 2234 | | -'accesskey-pt-preferences' => '', |
| 2235 | | -'accesskey-pt-watchlist' => 'l', |
| 2236 | | -'accesskey-pt-mycontris' => 'y', |
| 2237 | | -'accesskey-pt-login' => 'o', |
| 2238 | | -'accesskey-pt-anonlogin' => 'o', |
| 2239 | | -'accesskey-pt-logout' => '', |
| 2240 | | -'accesskey-ca-talk' => 't', |
| 2241 | | -'accesskey-ca-edit' => 'e', |
| 2242 | | -'accesskey-ca-addsection' => '+', |
| 2243 | | -'accesskey-ca-viewsource' => 'e', |
| 2244 | | -'accesskey-ca-history' => 'h', |
| 2245 | | -'accesskey-ca-protect' => '=', |
| 2246 | | -'accesskey-ca-delete' => 'd', |
| 2247 | | -'accesskey-ca-undelete' => 'd', |
| 2248 | | -'accesskey-ca-move' => 'm', |
| 2249 | | -'accesskey-ca-watch' => 'w', |
| 2250 | | -'accesskey-ca-unwatch' => 'w', |
| 2251 | | -'accesskey-search' => 'f', |
| 2252 | | -'accesskey-p-logo' => '', |
| 2253 | | -'accesskey-n-mainpage' => 'z', |
| 2254 | | -'accesskey-n-portal' => '', |
| 2255 | | -'accesskey-n-currentevents' => '', |
| 2256 | | -'accesskey-n-recentchanges' => 'r', |
| 2257 | | -'accesskey-n-randompage' => 'x', |
| 2258 | | -'accesskey-n-help' => '', |
| 2259 | | -'accesskey-n-sitesupport' => '', |
| 2260 | | -'accesskey-t-whatlinkshere' => 'j', |
| 2261 | | -'accesskey-t-recentchangeslinked' => 'k', |
| 2262 | | -'accesskey-feed-rss' => '', |
| 2263 | | -'accesskey-feed-atom' => '', |
| 2264 | | -'accesskey-t-contributions' => '', |
| 2265 | | -'accesskey-t-emailuser' => '', |
| 2266 | | -'accesskey-t-permalink' => '', |
| 2267 | | -'accesskey-t-print' => 'p', |
| 2268 | | -'accesskey-t-upload' => 'u', |
| 2269 | | -'accesskey-t-specialpages' => 'q', |
| 2270 | | -'accesskey-ca-nstab-main' => 'c', |
| 2271 | | -'accesskey-ca-nstab-user' => 'c', |
| 2272 | | -'accesskey-ca-nstab-media' => 'c', |
| 2273 | | -'accesskey-ca-nstab-special' => '', |
| 2274 | | -'accesskey-ca-nstab-project' => 'a', |
| 2275 | | -'accesskey-ca-nstab-image' => 'c', |
| 2276 | | -'accesskey-ca-nstab-mediawiki' => 'c', |
| 2277 | | -'accesskey-ca-nstab-template' => 'c', |
| 2278 | | -'accesskey-ca-nstab-help' => 'c', |
| 2279 | | -'accesskey-ca-nstab-category' => 'c', |
| 2280 | | -'accesskey-minoredit' => 'i', |
| 2281 | | -'accesskey-save' => 's', |
| 2282 | | -'accesskey-preview' => 'p', |
| 2283 | | -'accesskey-diff' => 'v', |
| 2284 | | -'accesskey-compareselectedversions' => 'v', |
| 2285 | | -'accesskey-watch' => 'w', |
| | 2208 | +'accesskey-pt-userpage' => '.', # don't translate or duplicate this message to other languages |
| | 2209 | +'accesskey-pt-anonuserpage' => '.', # don't translate or duplicate this message to other languages |
| | 2210 | +'accesskey-pt-mytalk' => 'n', # don't translate or duplicate this message to other languages |
| | 2211 | +'accesskey-pt-anontalk' => 'n', # don't translate or duplicate this message to other languages |
| | 2212 | +'accesskey-pt-preferences' => '', # don't translate or duplicate this message to other languages |
| | 2213 | +'accesskey-pt-watchlist' => 'l', # don't translate or duplicate this message to other languages |
| | 2214 | +'accesskey-pt-mycontris' => 'y', # don't translate or duplicate this message to other languages |
| | 2215 | +'accesskey-pt-login' => 'o', # don't translate or duplicate this message to other languages |
| | 2216 | +'accesskey-pt-anonlogin' => 'o', # don't translate or duplicate this message to other languages |
| | 2217 | +'accesskey-pt-logout' => '', # don't translate or duplicate this message to other languages |
| | 2218 | +'accesskey-ca-talk' => 't', # don't translate or duplicate this message to other languages |
| | 2219 | +'accesskey-ca-edit' => 'e', # don't translate or duplicate this message to other languages |
| | 2220 | +'accesskey-ca-addsection' => '+', # don't translate or duplicate this message to other languages |
| | 2221 | +'accesskey-ca-viewsource' => 'e', # don't translate or duplicate this message to other languages |
| | 2222 | +'accesskey-ca-history' => 'h', # don't translate or duplicate this message to other languages |
| | 2223 | +'accesskey-ca-protect' => '=', # don't translate or duplicate this message to other languages |
| | 2224 | +'accesskey-ca-delete' => 'd', # don't translate or duplicate this message to other languages |
| | 2225 | +'accesskey-ca-undelete' => 'd', # don't translate or duplicate this message to other languages |
| | 2226 | +'accesskey-ca-move' => 'm', # don't translate or duplicate this message to other languages |
| | 2227 | +'accesskey-ca-watch' => 'w', # don't translate or duplicate this message to other languages |
| | 2228 | +'accesskey-ca-unwatch' => 'w', # don't translate or duplicate this message to other languages |
| | 2229 | +'accesskey-search' => 'f', # don't translate or duplicate this message to other languages |
| | 2230 | +'accesskey-p-logo' => '', # don't translate or duplicate this message to other languages |
| | 2231 | +'accesskey-n-mainpage' => 'z', # don't translate or duplicate this message to other languages |
| | 2232 | +'accesskey-n-portal' => '', # don't translate or duplicate this message to other languages |
| | 2233 | +'accesskey-n-currentevents' => '', # don't translate or duplicate this message to other languages |
| | 2234 | +'accesskey-n-recentchanges' => 'r', # don't translate or duplicate this message to other languages |
| | 2235 | +'accesskey-n-randompage' => 'x', # don't translate or duplicate this message to other languages |
| | 2236 | +'accesskey-n-help' => '', # don't translate or duplicate this message to other languages |
| | 2237 | +'accesskey-n-sitesupport' => '', # don't translate or duplicate this message to other languages |
| | 2238 | +'accesskey-t-whatlinkshere' => 'j', # don't translate or duplicate this message to other languages |
| | 2239 | +'accesskey-t-recentchangeslinked' => 'k', # don't translate or duplicate this message to other languages |
| | 2240 | +'accesskey-feed-rss' => '', # don't translate or duplicate this message to other languages |
| | 2241 | +'accesskey-feed-atom' => '', # don't translate or duplicate this message to other languages |
| | 2242 | +'accesskey-t-contributions' => '', # don't translate or duplicate this message to other languages |
| | 2243 | +'accesskey-t-emailuser' => '', # don't translate or duplicate this message to other languages |
| | 2244 | +'accesskey-t-permalink' => '', # don't translate or duplicate this message to other languages |
| | 2245 | +'accesskey-t-print' => 'p', # don't translate or duplicate this message to other languages |
| | 2246 | +'accesskey-t-upload' => 'u', # don't translate or duplicate this message to other languages |
| | 2247 | +'accesskey-t-specialpages' => 'q', # don't translate or duplicate this message to other languages |
| | 2248 | +'accesskey-ca-nstab-main' => 'c', # don't translate or duplicate this message to other languages |
| | 2249 | +'accesskey-ca-nstab-user' => 'c', # don't translate or duplicate this message to other languages |
| | 2250 | +'accesskey-ca-nstab-media' => 'c', # don't translate or duplicate this message to other languages |
| | 2251 | +'accesskey-ca-nstab-special' => '', # don't translate or duplicate this message to other languages |
| | 2252 | +'accesskey-ca-nstab-project' => 'a', # don't translate or duplicate this message to other languages |
| | 2253 | +'accesskey-ca-nstab-image' => 'c', # don't translate or duplicate this message to other languages |
| | 2254 | +'accesskey-ca-nstab-mediawiki' => 'c', # don't translate or duplicate this message to other languages |
| | 2255 | +'accesskey-ca-nstab-template' => 'c', # don't translate or duplicate this message to other languages |
| | 2256 | +'accesskey-ca-nstab-help' => 'c', # don't translate or duplicate this message to other languages |
| | 2257 | +'accesskey-ca-nstab-category' => 'c', # don't translate or duplicate this message to other languages |
| | 2258 | +'accesskey-minoredit' => 'i', # don't translate or duplicate this message to other languages |
| | 2259 | +'accesskey-save' => 's', # don't translate or duplicate this message to other languages |
| | 2260 | +'accesskey-preview' => 'p', # don't translate or duplicate this message to other languages |
| | 2261 | +'accesskey-diff' => 'v', # don't translate or duplicate this message to other languages |
| | 2262 | +'accesskey-compareselectedversions' => 'v', # don't translate or duplicate this message to other languages |
| | 2263 | +'accesskey-watch' => 'w', # don't translate or duplicate this message to other languages |
| 2286 | 2264 | |
| 2287 | 2265 | # Tooltip help for the actions |
| 2288 | | -'tooltip-pt-userpage' => 'My user page', |
| 2289 | | -'tooltip-pt-anonuserpage' => "The user page for the ip you're editing as", |
| 2290 | | -'tooltip-pt-mytalk' => 'My talk page', |
| 2291 | | -'tooltip-pt-anontalk' => 'Discussion about edits from this ip address', |
| 2292 | | -'tooltip-pt-preferences' => 'My preferences', |
| 2293 | | -'tooltip-pt-watchlist' => "The list of pages you're monitoring for changes", |
| 2294 | | -'tooltip-pt-mycontris' => 'List of my contributions', |
| 2295 | | -'tooltip-pt-login' => 'You are encouraged to log in, it is not mandatory however.', |
| 2296 | | -'tooltip-pt-anonlogin' => 'You are encouraged to log in, it is not mandatory however.', |
| 2297 | | -'tooltip-pt-logout' => 'Log out', |
| 2298 | | -'tooltip-ca-talk' => 'Discussion about the content page', |
| 2299 | | -'tooltip-ca-edit' => 'You can edit this page. Please use the preview button before saving.', |
| 2300 | | -'tooltip-ca-addsection' => 'Add a comment to this discussion.', |
| 2301 | | -'tooltip-ca-viewsource' => 'This page is protected. You can view its source.', |
| 2302 | | -'tooltip-ca-history' => 'Past versions of this page.', |
| 2303 | | -'tooltip-ca-protect' => 'Protect this page', |
| 2304 | | -'tooltip-ca-delete' => 'Delete this page', |
| 2305 | | -'tooltip-ca-undelete' => 'Restore the edits done to this page before it was deleted', |
| 2306 | | -'tooltip-ca-move' => 'Move this page', |
| 2307 | | -'tooltip-ca-watch' => 'Add this page to your watchlist', |
| 2308 | | -'tooltip-ca-unwatch' => 'Remove this page from your watchlist', |
| 2309 | | -'tooltip-search' => 'Search {{SITENAME}}', |
| 2310 | | -'tooltip-p-logo' => 'Main Page', |
| 2311 | | -'tooltip-n-mainpage' => 'Visit the Main Page', |
| 2312 | | -'tooltip-n-portal' => 'About the project, what you can do, where to find things', |
| 2313 | | -'tooltip-n-currentevents' => 'Find background information on current events', |
| 2314 | | -'tooltip-n-recentchanges' => 'The list of recent changes in the wiki.', |
| 2315 | | -'tooltip-n-randompage' => 'Load a random page', |
| 2316 | | -'tooltip-n-help' => 'The place to find out.', |
| 2317 | | -'tooltip-n-sitesupport' => 'Support us', |
| 2318 | | -'tooltip-t-whatlinkshere' => 'List of all wiki pages that link here', |
| 2319 | | -'tooltip-t-recentchangeslinked' => 'Recent changes in pages linked from this page', |
| 2320 | | -'tooltip-feed-rss' => 'RSS feed for this page', |
| 2321 | | -'tooltip-feed-atom' => 'Atom feed for this page', |
| 2322 | | -'tooltip-t-contributions' => 'View the list of contributions of this user', |
| 2323 | | -'tooltip-t-emailuser' => 'Send a mail to this user', |
| 2324 | | -'tooltip-t-upload' => 'Upload images or media files', |
| 2325 | | -'tooltip-t-specialpages' => 'List of all special pages', |
| 2326 | | -'tooltip-t-print' => 'Printable version of this page', |
| 2327 | | -'tooltip-t-permalink' => 'Permanent link to this version of the page', |
| 2328 | | -'tooltip-ca-nstab-main' => 'View the content page', |
| 2329 | | -'tooltip-ca-nstab-user' => 'View the user page', |
| 2330 | | -'tooltip-ca-nstab-media' => 'View the media page', |
| 2331 | | -'tooltip-ca-nstab-special' => "This is a special page, you can't edit the page itself", |
| 2332 | | -'tooltip-ca-nstab-project' => 'View the project page', |
| 2333 | | -'tooltip-ca-nstab-image' => 'View the image page', |
| 2334 | | -'tooltip-ca-nstab-mediawiki' => 'View the system message', |
| 2335 | | -'tooltip-ca-nstab-template' => 'View the template', |
| 2336 | | -'tooltip-ca-nstab-help' => 'View the help page', |
| 2337 | | -'tooltip-ca-nstab-category' => 'View the category page', |
| 2338 | | -'tooltip-minoredit' => 'Mark this as a minor edit', |
| 2339 | | -'tooltip-save' => 'Save your changes', |
| 2340 | | -'tooltip-preview' => 'Preview your changes, please use this before saving!', |
| 2341 | | -'tooltip-diff' => 'Show which changes you made to the text.', |
| | 2266 | +'tooltip-pt-userpage' => 'My user page', |
| | 2267 | +'tooltip-pt-anonuserpage' => "The user page for the ip you're editing as", |
| | 2268 | +'tooltip-pt-mytalk' => 'My talk page', |
| | 2269 | +'tooltip-pt-anontalk' => 'Discussion about edits from this ip address', |
| | 2270 | +'tooltip-pt-preferences' => 'My preferences', |
| | 2271 | +'tooltip-pt-watchlist' => "The list of pages you're monitoring for changes", |
| | 2272 | +'tooltip-pt-mycontris' => 'List of my contributions', |
| | 2273 | +'tooltip-pt-login' => 'You are encouraged to log in, it is not mandatory however.', |
| | 2274 | +'tooltip-pt-anonlogin' => 'You are encouraged to log in, it is not mandatory however.', |
| | 2275 | +'tooltip-pt-logout' => 'Log out', |
| | 2276 | +'tooltip-ca-talk' => 'Discussion about the content page', |
| | 2277 | +'tooltip-ca-edit' => 'You can edit this page. Please use the preview button before saving.', |
| | 2278 | +'tooltip-ca-addsection' => 'Add a comment to this discussion.', |
| | 2279 | +'tooltip-ca-viewsource' => 'This page is protected. You can view its source.', |
| | 2280 | +'tooltip-ca-history' => 'Past versions of this page.', |
| | 2281 | +'tooltip-ca-protect' => 'Protect this page', |
| | 2282 | +'tooltip-ca-delete' => 'Delete this page', |
| | 2283 | +'tooltip-ca-undelete' => 'Restore the edits done to this page before it was deleted', |
| | 2284 | +'tooltip-ca-move' => 'Move this page', |
| | 2285 | +'tooltip-ca-watch' => 'Add this page to your watchlist', |
| | 2286 | +'tooltip-ca-unwatch' => 'Remove this page from your watchlist', |
| | 2287 | +'tooltip-search' => 'Search {{SITENAME}}', |
| | 2288 | +'tooltip-p-logo' => 'Main Page', |
| | 2289 | +'tooltip-n-mainpage' => 'Visit the Main Page', |
| | 2290 | +'tooltip-n-portal' => 'About the project, what you can do, where to find things', |
| | 2291 | +'tooltip-n-currentevents' => 'Find background information on current events', |
| | 2292 | +'tooltip-n-recentchanges' => 'The list of recent changes in the wiki.', |
| | 2293 | +'tooltip-n-randompage' => 'Load a random page', |
| | 2294 | +'tooltip-n-help' => 'The place to find out.', |
| | 2295 | +'tooltip-n-sitesupport' => 'Support us', |
| | 2296 | +'tooltip-t-whatlinkshere' => 'List of all wiki pages that link here', |
| | 2297 | +'tooltip-t-recentchangeslinked' => 'Recent changes in pages linked from this page', |
| | 2298 | +'tooltip-feed-rss' => 'RSS feed for this page', |
| | 2299 | +'tooltip-feed-atom' => 'Atom feed for this page', |
| | 2300 | +'tooltip-t-contributions' => 'View the list of contributions of this user', |
| | 2301 | +'tooltip-t-emailuser' => 'Send a mail to this user', |
| | 2302 | +'tooltip-t-upload' => 'Upload images or media files', |
| | 2303 | +'tooltip-t-specialpages' => 'List of all special pages', |
| | 2304 | +'tooltip-t-print' => 'Printable version of this page', |
| | 2305 | +'tooltip-t-permalink' => 'Permanent link to this version of the page', |
| | 2306 | +'tooltip-ca-nstab-main' => 'View the content page', |
| | 2307 | +'tooltip-ca-nstab-user' => 'View the user page', |
| | 2308 | +'tooltip-ca-nstab-media' => 'View the media page', |
| | 2309 | +'tooltip-ca-nstab-special' => "This is a special page, you can't edit the page itself", |
| | 2310 | +'tooltip-ca-nstab-project' => 'View the project page', |
| | 2311 | +'tooltip-ca-nstab-image' => 'View the image page', |
| | 2312 | +'tooltip-ca-nstab-mediawiki' => 'View the system message', |
| | 2313 | +'tooltip-ca-nstab-template' => 'View the template', |
| | 2314 | +'tooltip-ca-nstab-help' => 'View the help page', |
| | 2315 | +'tooltip-ca-nstab-category' => 'View the category page', |
| | 2316 | +'tooltip-minoredit' => 'Mark this as a minor edit', |
| | 2317 | +'tooltip-save' => 'Save your changes', |
| | 2318 | +'tooltip-preview' => 'Preview your changes, please use this before saving!', |
| | 2319 | +'tooltip-diff' => 'Show which changes you made to the text.', |
| 2342 | 2320 | 'tooltip-compareselectedversions' => 'See the differences between the two selected versions of this page.', |
| 2343 | | -'tooltip-watch' => 'Add this page to your watchlist', |
| 2344 | | -'tooltip-recreate' => 'Recreate the page despite it has been deleted', |
| | 2321 | +'tooltip-watch' => 'Add this page to your watchlist', |
| | 2322 | +'tooltip-recreate' => 'Recreate the page despite it has been deleted', |
| 2345 | 2323 | |
| 2346 | | -# stylesheets |
| 2347 | | -'common.css' => '/** CSS placed here will be applied to all skins */', |
| | 2324 | +# Stylesheets |
| | 2325 | +'common.css' => '/** CSS placed here will be applied to all skins */', |
| 2348 | 2326 | 'monobook.css' => '/* CSS placed here will affect users of the Monobook skin */', |
| 2349 | 2327 | |
| 2350 | 2328 | # Scripts |
| 2351 | | -'common.js' => '/* Any JavaScript here will be loaded for all users on every page load. */', |
| | 2329 | +'common.js' => '/* Any JavaScript here will be loaded for all users on every page load. */', |
| 2352 | 2330 | 'monobook.js' => '/* Deprecated; use [[MediaWiki:common.js]] */', |
| 2353 | 2331 | |
| 2354 | 2332 | # Metadata |
| 2355 | | -'nodublincore' => 'Dublin Core RDF metadata disabled for this server.', |
| | 2333 | +'nodublincore' => 'Dublin Core RDF metadata disabled for this server.', |
| 2356 | 2334 | 'nocreativecommons' => 'Creative Commons RDF metadata disabled for this server.', |
| 2357 | | -'notacceptable' => 'The wiki server can\'t provide data in a format your client can read.', |
| | 2335 | +'notacceptable' => "The wiki server can't provide data in a format your client can read.", |
| 2358 | 2336 | |
| 2359 | 2337 | # Attribution |
| | 2338 | +'anonymous' => 'Anonymous user(s) of {{SITENAME}}', |
| | 2339 | +'siteuser' => '{{SITENAME}} user $1', |
| | 2340 | +'lastmodifiedatby' => 'This page was last modified $2, $1 by $3.', # $1 date, $2 time, $3 user |
| | 2341 | +'and' => 'and', |
| | 2342 | +'othercontribs' => 'Based on work by $1.', |
| | 2343 | +'others' => 'others', |
| | 2344 | +'siteusers' => '{{SITENAME}} user(s) $1', |
| | 2345 | +'creditspage' => 'Page credits', |
| | 2346 | +'nocredits' => 'There is no credits info available for this page.', |
| 2360 | 2347 | |
| 2361 | | -'anonymous' => 'Anonymous user(s) of {{SITENAME}}', |
| 2362 | | -'siteuser' => '{{SITENAME}} user $1', |
| 2363 | | -'lastmodifiedatby' => 'This page was last modified $2, $1 by $3.', // $1 date, $2 time. $3 user |
| 2364 | | -'and' => 'and', |
| 2365 | | -'othercontribs' => 'Based on work by $1.', |
| 2366 | | -'others' => 'others', |
| 2367 | | -'siteusers' => '{{SITENAME}} user(s) $1', |
| 2368 | | -'creditspage' => 'Page credits', |
| 2369 | | -'nocredits' => 'There is no credits info available for this page.', |
| 2370 | | - |
| 2371 | 2348 | # Spam protection |
| | 2349 | +'spamprotectiontitle' => 'Spam protection filter', |
| | 2350 | +'spamprotectiontext' => 'The page you wanted to save was blocked by the spam filter. This is probably caused by a link to an external site.', |
| | 2351 | +'spamprotectionmatch' => 'The following text is what triggered our spam filter: $1', |
| | 2352 | +'subcategorycount' => 'There {{PLURAL:$1|is one subcategory|are $1 subcategories}} to this category.', |
| | 2353 | +'categoryarticlecount' => 'There {{PLURAL:$1|is one article|are $1 articles}} in this category.', |
| | 2354 | +'category-media-count' => 'There {{PLURAL:$1|is one file|are $1 files}} in this category.', |
| | 2355 | +'listingcontinuesabbrev' => ' cont.', |
| | 2356 | +'spambot_username' => 'MediaWiki spam cleanup', |
| | 2357 | +'spam_reverting' => 'Reverting to last version not containing links to $1', |
| | 2358 | +'spam_blanking' => 'All revisions contained links to $1, blanking', |
| 2372 | 2359 | |
| 2373 | | -'spamprotectiontitle' => 'Spam protection filter', |
| 2374 | | -'spamprotectiontext' => 'The page you wanted to save was blocked by the spam filter. This is probably caused by a link to an external site.', |
| 2375 | | -'spamprotectionmatch' => 'The following text is what triggered our spam filter: $1', |
| 2376 | | -'subcategorycount' => "There {{PLURAL:$1|is one subcategory|are $1 subcategories}} to this category.", |
| 2377 | | -'categoryarticlecount' => "There {{PLURAL:$1|is one article|are $1 articles}} in this category.", |
| 2378 | | -'category-media-count' => "There {{PLURAL:$1|is one file|are $1 files}} in this category.", |
| 2379 | | -'listingcontinuesabbrev' => " cont.", |
| 2380 | | -'spambot_username' => 'MediaWiki spam cleanup', |
| 2381 | | -'spam_reverting' => 'Reverting to last version not containing links to $1', |
| 2382 | | -'spam_blanking' => 'All revisions contained links to $1, blanking', |
| 2383 | | - |
| 2384 | 2360 | # Info page |
| 2385 | | -'infosubtitle' => 'Information for page', |
| 2386 | | -'numedits' => 'Number of edits (article): $1', |
| 2387 | | -'numtalkedits' => 'Number of edits (discussion page): $1', |
| 2388 | | -'numwatchers' => 'Number of watchers: $1', |
| 2389 | | -'numauthors' => 'Number of distinct authors (article): $1', |
| | 2361 | +'infosubtitle' => 'Information for page', |
| | 2362 | +'numedits' => 'Number of edits (article): $1', |
| | 2363 | +'numtalkedits' => 'Number of edits (discussion page): $1', |
| | 2364 | +'numwatchers' => 'Number of watchers: $1', |
| | 2365 | +'numauthors' => 'Number of distinct authors (article): $1', |
| 2390 | 2366 | 'numtalkauthors' => 'Number of distinct authors (discussion page): $1', |
| 2391 | 2367 | |
| 2392 | 2368 | # Math options |
| 2393 | | -'mw_math_png' => 'Always render PNG', |
| | 2369 | +'mw_math_png' => 'Always render PNG', |
| 2394 | 2370 | 'mw_math_simple' => 'HTML if very simple or else PNG', |
| 2395 | | -'mw_math_html' => 'HTML if possible or else PNG', |
| | 2371 | +'mw_math_html' => 'HTML if possible or else PNG', |
| 2396 | 2372 | 'mw_math_source' => 'Leave it as TeX (for text browsers)', |
| 2397 | 2373 | 'mw_math_modern' => 'Recommended for modern browsers', |
| 2398 | 2374 | 'mw_math_mathml' => 'MathML if possible (experimental)', |
| 2399 | 2375 | |
| 2400 | 2376 | # Patrolling |
| 2401 | | -'markaspatrolleddiff' => "Mark as patrolled", |
| 2402 | | -'markaspatrolledlink' => "[$1]", |
| 2403 | | -'markaspatrolledtext' => "Mark this article as patrolled", |
| 2404 | | -'markedaspatrolled' => "Marked as patrolled", |
| 2405 | | -'markedaspatrolledtext' => "The selected revision has been marked as patrolled.", |
| 2406 | | -'rcpatroldisabled' => "Recent Changes Patrol disabled", |
| 2407 | | -'rcpatroldisabledtext' => "The Recent Changes Patrol feature is currently disabled.", |
| 2408 | | -'markedaspatrollederror' => "Cannot mark as patrolled", |
| 2409 | | -'markedaspatrollederrortext' => "You need to specify a revision to mark as patrolled.", |
| | 2377 | +'markaspatrolleddiff' => 'Mark as patrolled', |
| | 2378 | +'markaspatrolledlink' => '[$1]', # don't translate or duplicate this message to other languages |
| | 2379 | +'markaspatrolledtext' => 'Mark this article as patrolled', |
| | 2380 | +'markedaspatrolled' => 'Marked as patrolled', |
| | 2381 | +'markedaspatrolledtext' => 'The selected revision has been marked as patrolled.', |
| | 2382 | +'rcpatroldisabled' => 'Recent Changes Patrol disabled', |
| | 2383 | +'rcpatroldisabledtext' => 'The Recent Changes Patrol feature is currently disabled.', |
| | 2384 | +'markedaspatrollederror' => 'Cannot mark as patrolled', |
| | 2385 | +'markedaspatrollederrortext' => 'You need to specify a revision to mark as patrolled.', |
| 2410 | 2386 | 'markedaspatrollederror-noautopatrol' => 'You are not allowed to mark your own changes as patrolled.', |
| 2411 | 2387 | |
| 2412 | 2388 | # Patrol log |
| 2413 | | -'patrol-log-page' => 'Patrol log', |
| 2414 | | -'patrol-log-header' => '', |
| 2415 | | -'patrol-log-line' => 'marked $1 of $2 patrolled $3', |
| 2416 | | -'patrol-log-auto' => '(automatic)', |
| 2417 | | -'patrol-log-diff' => 'r$1', |
| | 2389 | +'patrol-log-page' => 'Patrol log', |
| | 2390 | +'patrol-log-header' => '', # don't translate or duplicate this message to other languages |
| | 2391 | +'patrol-log-line' => 'marked $1 of $2 patrolled $3', |
| | 2392 | +'patrol-log-auto' => '(automatic)', |
| | 2393 | +'patrol-log-diff' => 'r$1', |
| 2418 | 2394 | |
| 2419 | | -# image deletion |
| | 2395 | +# Image deletion |
| 2420 | 2396 | 'deletedrevision' => 'Deleted old revision $1.', |
| 2421 | 2397 | |
| 2422 | | -# browsing diffs |
| | 2398 | +# Browsing diffs |
| 2423 | 2399 | 'previousdiff' => '← Previous diff', |
| 2424 | | -'nextdiff' => 'Next diff →', |
| | 2400 | +'nextdiff' => 'Next diff →', |
| 2425 | 2401 | |
| 2426 | | -# media-info |
| 2427 | | -'mediawarning' => "'''Warning''': This file may contain malicious code, by executing it your system may be compromised.<hr />", |
| 2428 | | -'imagemaxsize' => 'Limit images on image description pages to:', |
| 2429 | | -'thumbsize' => 'Thumbnail size:', |
| 2430 | | -'widthheight' => '$1×$2', |
| 2431 | | -'file-info' => '(file size: $1, MIME type: $2)', |
| 2432 | | -'file-info-size' => '($1 × $2 pixel, file size: $3, MIME type: $4)', |
| 2433 | | -'file-nohires' => '<small>No higher resolution available.</small>', |
| 2434 | | -'file-svg' => '<small>This is a lossless scalable vector image. Base size: $1 × $2 pixels.</small>', |
| 2435 | | -'show-big-image' => 'Full resolution', |
| 2436 | | -'show-big-image-thumb' => '<small>Size of this preview: $1 × $2 pixels</small>', |
| | 2402 | +# Media information |
| | 2403 | +'mediawarning' => "'''Warning''': This file may contain malicious code, by executing it your system may be compromised.<hr />", |
| | 2404 | +'imagemaxsize' => 'Limit images on image description pages to:', |
| | 2405 | +'thumbsize' => 'Thumbnail size:', |
| | 2406 | +'widthheight' => '$1×$2', # only translate this message to other languages if you have to change it |
| | 2407 | +'file-info' => '(file size: $1, MIME type: $2)', |
| | 2408 | +'file-info-size' => '($1 × $2 pixel, file size: $3, MIME type: $4)', |
| | 2409 | +'file-nohires' => '<small>No higher resolution available.</small>', |
| | 2410 | +'file-svg' => '<small>This is a lossless scalable vector image. Base size: $1 × $2 pixels.</small>', |
| | 2411 | +'show-big-image' => 'Full resolution', |
| | 2412 | +'show-big-image-thumb' => '<small>Size of this preview: $1 × $2 pixels</small>', |
| 2437 | 2413 | |
| 2438 | | -'newimages' => 'Gallery of new files', |
| 2439 | | -'newimages-summary' => '', |
| 2440 | | -'showhidebots' => '($1 bots)', |
| 2441 | | -'noimages' => 'Nothing to see.', |
| | 2414 | +'newimages' => 'Gallery of new files', |
| | 2415 | +'newimages-summary' => '', # only translate this message to other languages if you have to change it |
| | 2416 | +'showhidebots' => '($1 bots)', |
| | 2417 | +'noimages' => 'Nothing to see.', |
| 2442 | 2418 | |
| 2443 | | -# short names for language variants used for language conversion links. |
| 2444 | | -# to disable showing a particular link, set it to 'disable', e.g. |
| 2445 | | -# 'variantname-zh-sg' => 'disable', |
| 2446 | | -'variantname-zh-cn' => 'cn', |
| 2447 | | -'variantname-zh-tw' => 'tw', |
| 2448 | | -'variantname-zh-hk' => 'hk', |
| 2449 | | -'variantname-zh-sg' => 'sg', |
| 2450 | | -'variantname-zh' => 'zh', |
| 2451 | | -# variants for Serbian language |
| 2452 | | -'variantname-sr-ec' => 'sr-ec', |
| 2453 | | -'variantname-sr-el' => 'sr-el', |
| 2454 | | -'variantname-sr-jc' => 'sr-jc', |
| 2455 | | -'variantname-sr-jl' => 'sr-jl', |
| 2456 | | -'variantname-sr' => 'sr', |
| 2457 | | -# variants for Kazakh language |
| 2458 | | -'variantname-kk-tr' => 'kk-tr', |
| 2459 | | -'variantname-kk-kz' => 'kk-kz', |
| 2460 | | -'variantname-kk-cn' => 'kk-cn', |
| 2461 | | -'variantname-kk' => 'kk', |
| | 2419 | +/* |
| | 2420 | +Short names for language variants used for language conversion links. |
| | 2421 | +To disable showing a particular link, set it to 'disable', e.g. |
| | 2422 | +'variantname-zh-sg' => 'disable', |
| | 2423 | +Variants for Chinese language |
| | 2424 | +*/ |
| | 2425 | +'variantname-zh-cn' => 'cn', # only translate this message to other languages if you have to change it |
| | 2426 | +'variantname-zh-tw' => 'tw', # only translate this message to other languages if you have to change it |
| | 2427 | +'variantname-zh-hk' => 'hk', # only translate this message to other languages if you have to change it |
| | 2428 | +'variantname-zh-sg' => 'sg', # only translate this message to other languages if you have to change it |
| | 2429 | +'variantname-zh' => 'zh', # only translate this message to other languages if you have to change it |
| 2462 | 2430 | |
| | 2431 | +# Variants for Serbian language |
| | 2432 | +'variantname-sr-ec' => 'sr-ec', # only translate this message to other languages if you have to change it |
| | 2433 | +'variantname-sr-el' => 'sr-el', # only translate this message to other languages if you have to change it |
| | 2434 | +'variantname-sr-jc' => 'sr-jc', # only translate this message to other languages if you have to change it |
| | 2435 | +'variantname-sr-jl' => 'sr-jl', # only translate this message to other languages if you have to change it |
| | 2436 | +'variantname-sr' => 'sr', # only translate this message to other languages if you have to change it |
| | 2437 | + |
| | 2438 | +# Variants for Kazakh language |
| | 2439 | +'variantname-kk-tr' => 'kk-tr', # only translate this message to other languages if you have to change it |
| | 2440 | +'variantname-kk-kz' => 'kk-kz', # only translate this message to other languages if you have to change it |
| | 2441 | +'variantname-kk-cn' => 'kk-cn', # only translate this message to other languages if you have to change it |
| | 2442 | +'variantname-kk' => 'kk', # only translate this message to other languages if you have to change it |
| | 2443 | + |
| 2463 | 2444 | 'passwordtooshort' => 'Your password is invalid or too short. It must have at least $1 characters and be different from your username.', |
| 2464 | 2445 | |
| 2465 | 2446 | # Metadata |
| 2466 | | -'metadata' => 'Metadata', |
| 2467 | | -'metadata-help' => 'This file contains additional information, probably added from the digital camera or scanner used to create or digitize it. If the file has been modified from its original state, some details may not fully reflect the modified image.', |
| 2468 | | -'metadata-expand' => 'Show extended details', |
| | 2447 | +'metadata' => 'Metadata', |
| | 2448 | +'metadata-help' => 'This file contains additional information, probably added from the digital camera or scanner used to create or digitize it. If the file has been modified from its original state, some details may not fully reflect the modified image.', |
| | 2449 | +'metadata-expand' => 'Show extended details', |
| 2469 | 2450 | 'metadata-collapse' => 'Hide extended details', |
| 2470 | | -'metadata-fields' => 'EXIF metadata fields listed in this message will |
| | 2451 | +'metadata-fields' => 'EXIF metadata fields listed in this message will |
| 2471 | 2452 | be included on image page display when the metadata table |
| 2472 | 2453 | is collapsed. Others will be hidden by default. |
| 2473 | 2454 | * make |
| — | — | @@ -2476,160 +2457,158 @@ |
| 2477 | 2458 | * fnumber |
| 2478 | 2459 | * focallength', |
| 2479 | 2460 | |
| 2480 | | -# Exif tags |
| 2481 | | -'exif-imagewidth' =>'Width', |
| 2482 | | -'exif-imagelength' =>'Height', |
| 2483 | | -'exif-bitspersample' =>'Bits per component', |
| 2484 | | -'exif-compression' =>'Compression scheme', |
| 2485 | | -'exif-photometricinterpretation' =>'Pixel composition', |
| 2486 | | -'exif-orientation' =>'Orientation', |
| 2487 | | -'exif-samplesperpixel' =>'Number of components', |
| 2488 | | -'exif-planarconfiguration' =>'Data arrangement', |
| 2489 | | -'exif-ycbcrsubsampling' =>'Subsampling ratio of Y to C', |
| 2490 | | -'exif-ycbcrpositioning' =>'Y and C positioning', |
| 2491 | | -'exif-xresolution' =>'Horizontal resolution', |
| 2492 | | -'exif-yresolution' =>'Vertical resolution', |
| 2493 | | -'exif-resolutionunit' =>'Unit of X and Y resolution', |
| 2494 | | -'exif-stripoffsets' =>'Image data location', |
| 2495 | | -'exif-rowsperstrip' =>'Number of rows per strip', |
| 2496 | | -'exif-stripbytecounts' =>'Bytes per compressed strip', |
| 2497 | | -'exif-jpeginterchangeformat' =>'Offset to JPEG SOI', |
| 2498 | | -'exif-jpeginterchangeformatlength' =>'Bytes of JPEG data', |
| 2499 | | -'exif-transferfunction' =>'Transfer function', |
| 2500 | | -'exif-whitepoint' =>'White point chromaticity', |
| 2501 | | -'exif-primarychromaticities' =>'Chromaticities of primarities', |
| 2502 | | -'exif-ycbcrcoefficients' =>'Color space transformation matrix coefficients', |
| 2503 | | -'exif-referenceblackwhite' =>'Pair of black and white reference values', |
| 2504 | | -'exif-datetime' =>'File change date and time', |
| 2505 | | -'exif-imagedescription' =>'Image title', |
| 2506 | | -'exif-make' =>'Camera manufacturer', |
| 2507 | | -'exif-model' =>'Camera model', |
| 2508 | | -'exif-software' =>'Software used', |
| 2509 | | -'exif-artist' =>'Author', |
| 2510 | | -'exif-copyright' =>'Copyright holder', |
| 2511 | | -'exif-exifversion' =>'Exif version', |
| 2512 | | -'exif-flashpixversion' =>'Supported Flashpix version', |
| 2513 | | -'exif-colorspace' =>'Color space', |
| 2514 | | -'exif-componentsconfiguration' =>'Meaning of each component', |
| 2515 | | -'exif-compressedbitsperpixel' =>'Image compression mode', |
| 2516 | | -'exif-pixelydimension' =>'Valid image width', |
| 2517 | | -'exif-pixelxdimension' =>'Valid image height', |
| 2518 | | -'exif-makernote' =>'Manufacturer notes', |
| 2519 | | -'exif-usercomment' =>'User comments', |
| 2520 | | -'exif-relatedsoundfile' =>'Related audio file', |
| 2521 | | -'exif-datetimeoriginal' =>'Date and time of data generation', |
| 2522 | | -'exif-datetimedigitized' =>'Date and time of digitizing', |
| 2523 | | -'exif-subsectime' =>'DateTime subseconds', |
| 2524 | | -'exif-subsectimeoriginal' =>'DateTimeOriginal subseconds', |
| 2525 | | -'exif-subsectimedigitized' =>'DateTimeDigitized subseconds', |
| 2526 | | -'exif-exposuretime' =>'Exposure time', |
| 2527 | | -'exif-exposuretime-format' => '$1 sec ($2)', |
| 2528 | | -'exif-fnumber' =>'F Number', |
| 2529 | | -'exif-fnumber-format' =>'f/$1', |
| 2530 | | -'exif-exposureprogram' =>'Exposure Program', |
| 2531 | | -'exif-spectralsensitivity' =>'Spectral sensitivity', |
| 2532 | | -'exif-isospeedratings' =>'ISO speed rating', |
| 2533 | | -'exif-oecf' =>'Optoelectronic conversion factor', |
| 2534 | | -'exif-shutterspeedvalue' =>'Shutter speed', |
| 2535 | | -'exif-aperturevalue' =>'Aperture', |
| 2536 | | -'exif-brightnessvalue' =>'Brightness', |
| 2537 | | -'exif-exposurebiasvalue' =>'Exposure bias', |
| 2538 | | -'exif-maxaperturevalue' =>'Maximum land aperture', |
| 2539 | | -'exif-subjectdistance' =>'Subject distance', |
| 2540 | | -'exif-meteringmode' =>'Metering mode', |
| 2541 | | -'exif-lightsource' =>'Light source', |
| 2542 | | -'exif-flash' =>'Flash', |
| 2543 | | -'exif-focallength' =>'Lens focal length', |
| 2544 | | -'exif-focallength-format' =>'$1 mm', |
| 2545 | | -'exif-subjectarea' =>'Subject area', |
| 2546 | | -'exif-flashenergy' =>'Flash energy', |
| 2547 | | -'exif-spatialfrequencyresponse' =>'Spatial frequency response', |
| 2548 | | -'exif-focalplanexresolution' =>'Focal plane X resolution', |
| 2549 | | -'exif-focalplaneyresolution' =>'Focal plane Y resolution', |
| 2550 | | -'exif-focalplaneresolutionunit' =>'Focal plane resolution unit', |
| 2551 | | -'exif-subjectlocation' =>'Subject location', |
| 2552 | | -'exif-exposureindex' =>'Exposure index', |
| 2553 | | -'exif-sensingmethod' =>'Sensing method', |
| 2554 | | -'exif-filesource' =>'File source', |
| 2555 | | -'exif-scenetype' =>'Scene type', |
| 2556 | | -'exif-cfapattern' =>'CFA pattern', |
| 2557 | | -'exif-customrendered' =>'Custom image processing', |
| 2558 | | -'exif-exposuremode' =>'Exposure mode', |
| 2559 | | -'exif-whitebalance' =>'White Balance', |
| 2560 | | -'exif-digitalzoomratio' =>'Digital zoom ratio', |
| 2561 | | -'exif-focallengthin35mmfilm' =>'Focal length in 35 mm film', |
| 2562 | | -'exif-scenecapturetype' =>'Scene capture type', |
| 2563 | | -'exif-gaincontrol' =>'Scene control', |
| 2564 | | -'exif-contrast' =>'Contrast', |
| 2565 | | -'exif-saturation' =>'Saturation', |
| 2566 | | -'exif-sharpness' =>'Sharpness', |
| 2567 | | -'exif-devicesettingdescription' =>'Device settings description', |
| 2568 | | -'exif-subjectdistancerange' =>'Subject distance range', |
| 2569 | | -'exif-imageuniqueid' =>'Unique image ID', |
| 2570 | | -'exif-gpsversionid' =>'GPS tag version', |
| 2571 | | -'exif-gpslatituderef' =>'North or South Latitude', |
| 2572 | | -'exif-gpslatitude' =>'Latitude', |
| 2573 | | -'exif-gpslongituderef' =>'East or West Longitude', |
| 2574 | | -'exif-gpslongitude' =>'Longitude', |
| 2575 | | -'exif-gpsaltituderef' =>'Altitude reference', |
| 2576 | | -'exif-gpsaltitude' =>'Altitude', |
| 2577 | | -'exif-gpstimestamp' =>'GPS time (atomic clock)', |
| 2578 | | -'exif-gpssatellites' =>'Satellites used for measurement', |
| 2579 | | -'exif-gpsstatus' =>'Receiver status', |
| 2580 | | -'exif-gpsmeasuremode' =>'Measurement mode', |
| 2581 | | -'exif-gpsdop' =>'Measurement precision', |
| 2582 | | -'exif-gpsspeedref' =>'Speed unit', |
| 2583 | | -'exif-gpsspeed' =>'Speed of GPS receiver', |
| 2584 | | -'exif-gpstrackref' =>'Reference for direction of movement', |
| 2585 | | -'exif-gpstrack' =>'Direction of movement', |
| 2586 | | -'exif-gpsimgdirectionref' =>'Reference for direction of image', |
| 2587 | | -'exif-gpsimgdirection' =>'Direction of image', |
| 2588 | | -'exif-gpsmapdatum' =>'Geodetic survey data used', |
| 2589 | | -'exif-gpsdestlatituderef' =>'Reference for latitude of destination', |
| 2590 | | -'exif-gpsdestlatitude' =>'Latitude destination', |
| 2591 | | -'exif-gpsdestlongituderef' =>'Reference for longitude of destination', |
| 2592 | | -'exif-gpsdestlongitude' =>'Longitude of destination', |
| 2593 | | -'exif-gpsdestbearingref' =>'Reference for bearing of destination', |
| 2594 | | -'exif-gpsdestbearing' =>'Bearing of destination', |
| 2595 | | -'exif-gpsdestdistanceref' =>'Reference for distance to destination', |
| 2596 | | -'exif-gpsdestdistance' =>'Distance to destination', |
| 2597 | | -'exif-gpsprocessingmethod' =>'Name of GPS processing method', |
| 2598 | | -'exif-gpsareainformation' =>'Name of GPS area', |
| 2599 | | -'exif-gpsdatestamp' =>'GPS date', |
| 2600 | | -'exif-gpsdifferential' =>'GPS differential correction', |
| | 2461 | +# EXIF tags |
| | 2462 | +'exif-imagewidth' => 'Width', |
| | 2463 | +'exif-imagelength' => 'Height', |
| | 2464 | +'exif-bitspersample' => 'Bits per component', |
| | 2465 | +'exif-compression' => 'Compression scheme', |
| | 2466 | +'exif-photometricinterpretation' => 'Pixel composition', |
| | 2467 | +'exif-orientation' => 'Orientation', |
| | 2468 | +'exif-samplesperpixel' => 'Number of components', |
| | 2469 | +'exif-planarconfiguration' => 'Data arrangement', |
| | 2470 | +'exif-ycbcrsubsampling' => 'Subsampling ratio of Y to C', |
| | 2471 | +'exif-ycbcrpositioning' => 'Y and C positioning', |
| | 2472 | +'exif-xresolution' => 'Horizontal resolution', |
| | 2473 | +'exif-yresolution' => 'Vertical resolution', |
| | 2474 | +'exif-resolutionunit' => 'Unit of X and Y resolution', |
| | 2475 | +'exif-stripoffsets' => 'Image data location', |
| | 2476 | +'exif-rowsperstrip' => 'Number of rows per strip', |
| | 2477 | +'exif-stripbytecounts' => 'Bytes per compressed strip', |
| | 2478 | +'exif-jpeginterchangeformat' => 'Offset to JPEG SOI', |
| | 2479 | +'exif-jpeginterchangeformatlength' => 'Bytes of JPEG data', |
| | 2480 | +'exif-transferfunction' => 'Transfer function', |
| | 2481 | +'exif-whitepoint' => 'White point chromaticity', |
| | 2482 | +'exif-primarychromaticities' => 'Chromaticities of primarities', |
| | 2483 | +'exif-ycbcrcoefficients' => 'Color space transformation matrix coefficients', |
| | 2484 | +'exif-referenceblackwhite' => 'Pair of black and white reference values', |
| | 2485 | +'exif-datetime' => 'File change date and time', |
| | 2486 | +'exif-imagedescription' => 'Image title', |
| | 2487 | +'exif-make' => 'Camera manufacturer', |
| | 2488 | +'exif-model' => 'Camera model', |
| | 2489 | +'exif-software' => 'Software used', |
| | 2490 | +'exif-artist' => 'Author', |
| | 2491 | +'exif-copyright' => 'Copyright holder', |
| | 2492 | +'exif-exifversion' => 'Exif version', |
| | 2493 | +'exif-flashpixversion' => 'Supported Flashpix version', |
| | 2494 | +'exif-colorspace' => 'Color space', |
| | 2495 | +'exif-componentsconfiguration' => 'Meaning of each component', |
| | 2496 | +'exif-compressedbitsperpixel' => 'Image compression mode', |
| | 2497 | +'exif-pixelydimension' => 'Valid image width', |
| | 2498 | +'exif-pixelxdimension' => 'Valid image height', |
| | 2499 | +'exif-makernote' => 'Manufacturer notes', |
| | 2500 | +'exif-usercomment' => 'User comments', |
| | 2501 | +'exif-relatedsoundfile' => 'Related audio file', |
| | 2502 | +'exif-datetimeoriginal' => 'Date and time of data generation', |
| | 2503 | +'exif-datetimedigitized' => 'Date and time of digitizing', |
| | 2504 | +'exif-subsectime' => 'DateTime subseconds', |
| | 2505 | +'exif-subsectimeoriginal' => 'DateTimeOriginal subseconds', |
| | 2506 | +'exif-subsectimedigitized' => 'DateTimeDigitized subseconds', |
| | 2507 | +'exif-exposuretime' => 'Exposure time', |
| | 2508 | +'exif-exposuretime-format' => '$1 sec ($2)', |
| | 2509 | +'exif-fnumber' => 'F Number', |
| | 2510 | +'exif-fnumber-format' => 'f/$1', |
| | 2511 | +'exif-exposureprogram' => 'Exposure Program', |
| | 2512 | +'exif-spectralsensitivity' => 'Spectral sensitivity', |
| | 2513 | +'exif-isospeedratings' => 'ISO speed rating', |
| | 2514 | +'exif-oecf' => 'Optoelectronic conversion factor', |
| | 2515 | +'exif-shutterspeedvalue' => 'Shutter speed', |
| | 2516 | +'exif-aperturevalue' => 'Aperture', |
| | 2517 | +'exif-brightnessvalue' => 'Brightness', |
| | 2518 | +'exif-exposurebiasvalue' => 'Exposure bias', |
| | 2519 | +'exif-maxaperturevalue' => 'Maximum land aperture', |
| | 2520 | +'exif-subjectdistance' => 'Subject distance', |
| | 2521 | +'exif-meteringmode' => 'Metering mode', |
| | 2522 | +'exif-lightsource' => 'Light source', |
| | 2523 | +'exif-flash' => 'Flash', |
| | 2524 | +'exif-focallength' => 'Lens focal length', |
| | 2525 | +'exif-focallength-format' => '$1 mm', |
| | 2526 | +'exif-subjectarea' => 'Subject area', |
| | 2527 | +'exif-flashenergy' => 'Flash energy', |
| | 2528 | +'exif-spatialfrequencyresponse' => 'Spatial frequency response', |
| | 2529 | +'exif-focalplanexresolution' => 'Focal plane X resolution', |
| | 2530 | +'exif-focalplaneyresolution' => 'Focal plane Y resolution', |
| | 2531 | +'exif-focalplaneresolutionunit' => 'Focal plane resolution unit', |
| | 2532 | +'exif-subjectlocation' => 'Subject location', |
| | 2533 | +'exif-exposureindex' => 'Exposure index', |
| | 2534 | +'exif-sensingmethod' => 'Sensing method', |
| | 2535 | +'exif-filesource' => 'File source', |
| | 2536 | +'exif-scenetype' => 'Scene type', |
| | 2537 | +'exif-cfapattern' => 'CFA pattern', |
| | 2538 | +'exif-customrendered' => 'Custom image processing', |
| | 2539 | +'exif-exposuremode' => 'Exposure mode', |
| | 2540 | +'exif-whitebalance' => 'White Balance', |
| | 2541 | +'exif-digitalzoomratio' => 'Digital zoom ratio', |
| | 2542 | +'exif-focallengthin35mmfilm' => 'Focal length in 35 mm film', |
| | 2543 | +'exif-scenecapturetype' => 'Scene capture type', |
| | 2544 | +'exif-gaincontrol' => 'Scene control', |
| | 2545 | +'exif-contrast' => 'Contrast', |
| | 2546 | +'exif-saturation' => 'Saturation', |
| | 2547 | +'exif-sharpness' => 'Sharpness', |
| | 2548 | +'exif-devicesettingdescription' => 'Device settings description', |
| | 2549 | +'exif-subjectdistancerange' => 'Subject distance range', |
| | 2550 | +'exif-imageuniqueid' => 'Unique image ID', |
| | 2551 | +'exif-gpsversionid' => 'GPS tag version', |
| | 2552 | +'exif-gpslatituderef' => 'North or South Latitude', |
| | 2553 | +'exif-gpslatitude' => 'Latitude', |
| | 2554 | +'exif-gpslongituderef' => 'East or West Longitude', |
| | 2555 | +'exif-gpslongitude' => 'Longitude', |
| | 2556 | +'exif-gpsaltituderef' => 'Altitude reference', |
| | 2557 | +'exif-gpsaltitude' => 'Altitude', |
| | 2558 | +'exif-gpstimestamp' => 'GPS time (atomic clock)', |
| | 2559 | +'exif-gpssatellites' => 'Satellites used for measurement', |
| | 2560 | +'exif-gpsstatus' => 'Receiver status', |
| | 2561 | +'exif-gpsmeasuremode' => 'Measurement mode', |
| | 2562 | +'exif-gpsdop' => 'Measurement precision', |
| | 2563 | +'exif-gpsspeedref' => 'Speed unit', |
| | 2564 | +'exif-gpsspeed' => 'Speed of GPS receiver', |
| | 2565 | +'exif-gpstrackref' => 'Reference for direction of movement', |
| | 2566 | +'exif-gpstrack' => 'Direction of movement', |
| | 2567 | +'exif-gpsimgdirectionref' => 'Reference for direction of image', |
| | 2568 | +'exif-gpsimgdirection' => 'Direction of image', |
| | 2569 | +'exif-gpsmapdatum' => 'Geodetic survey data used', |
| | 2570 | +'exif-gpsdestlatituderef' => 'Reference for latitude of destination', |
| | 2571 | +'exif-gpsdestlatitude' => 'Latitude destination', |
| | 2572 | +'exif-gpsdestlongituderef' => 'Reference for longitude of destination', |
| | 2573 | +'exif-gpsdestlongitude' => 'Longitude of destination', |
| | 2574 | +'exif-gpsdestbearingref' => 'Reference for bearing of destination', |
| | 2575 | +'exif-gpsdestbearing' => 'Bearing of destination', |
| | 2576 | +'exif-gpsdestdistanceref' => 'Reference for distance to destination', |
| | 2577 | +'exif-gpsdestdistance' => 'Distance to destination', |
| | 2578 | +'exif-gpsprocessingmethod' => 'Name of GPS processing method', |
| | 2579 | +'exif-gpsareainformation' => 'Name of GPS area', |
| | 2580 | +'exif-gpsdatestamp' => 'GPS date', |
| | 2581 | +'exif-gpsdifferential' => 'GPS differential correction', |
| 2601 | 2582 | |
| 2602 | 2583 | # Make & model, can be wikified in order to link to the camera and model name |
| | 2584 | +'exif-make-value' => '$1', # don't translate or duplicate this message to other languages |
| | 2585 | +'exif-model-value' => '$1', # don't translate or duplicate this message to other languages |
| | 2586 | +'exif-software-value' => '$1', # don't translate or duplicate this message to other languages |
| 2603 | 2587 | |
| 2604 | | -'exif-make-value' => '$1', |
| 2605 | | -'exif-model-value' =>'$1', |
| 2606 | | -'exif-software-value' => '$1', |
| 2607 | | - |
| 2608 | | -# Exif attributes |
| 2609 | | - |
| | 2588 | +# EXIF attributes |
| 2610 | 2589 | 'exif-compression-1' => 'Uncompressed', |
| 2611 | 2590 | 'exif-compression-6' => 'JPEG', |
| 2612 | 2591 | |
| 2613 | | -'exif-unknowndate' => 'Unknown date', |
| 2614 | | - |
| 2615 | 2592 | 'exif-photometricinterpretation-2' => 'RGB', |
| 2616 | 2593 | 'exif-photometricinterpretation-6' => 'YCbCr', |
| 2617 | 2594 | |
| 2618 | | -'exif-orientation-1' => 'Normal', // 0th row: top; 0th column: left |
| 2619 | | -'exif-orientation-2' => 'Flipped horizontally', // 0th row: top; 0th column: right |
| 2620 | | -'exif-orientation-3' => 'Rotated 180°', // 0th row: bottom; 0th column: right |
| 2621 | | -'exif-orientation-4' => 'Flipped vertically', // 0th row: bottom; 0th column: left |
| 2622 | | -'exif-orientation-5' => 'Rotated 90° CCW and flipped vertically', // 0th row: left; 0th column: top |
| 2623 | | -'exif-orientation-6' => 'Rotated 90° CW', // 0th row: right; 0th column: top |
| 2624 | | -'exif-orientation-7' => 'Rotated 90° CW and flipped vertically', // 0th row: right; 0th column: bottom |
| 2625 | | -'exif-orientation-8' => 'Rotated 90° CCW', // 0th row: left; 0th column: bottom |
| | 2595 | +'exif-unknowndate' => 'Unknown date', |
| 2626 | 2596 | |
| | 2597 | +'exif-orientation-1' => 'Normal', # 0th row: top; 0th column: left |
| | 2598 | +'exif-orientation-2' => 'Flipped horizontally', # 0th row: top; 0th column: right |
| | 2599 | +'exif-orientation-3' => 'Rotated 180°', # 0th row: bottom; 0th column: right |
| | 2600 | +'exif-orientation-4' => 'Flipped vertically', # 0th row: bottom; 0th column: left |
| | 2601 | +'exif-orientation-5' => 'Rotated 90° CCW and flipped vertically', # 0th row: left; 0th column: top |
| | 2602 | +'exif-orientation-6' => 'Rotated 90° CW', # 0th row: right; 0th column: top |
| | 2603 | +'exif-orientation-7' => 'Rotated 90° CW and flipped vertically', # 0th row: right; 0th column: bottom |
| | 2604 | +'exif-orientation-8' => 'Rotated 90° CCW', # 0th row: left; 0th column: bottom |
| | 2605 | + |
| 2627 | 2606 | 'exif-planarconfiguration-1' => 'chunky format', |
| 2628 | 2607 | 'exif-planarconfiguration-2' => 'planar format', |
| 2629 | 2608 | |
| 2630 | 2609 | 'exif-xyresolution-i' => '$1 dpi', |
| 2631 | 2610 | 'exif-xyresolution-c' => '$1 dpc', |
| 2632 | 2611 | |
| 2633 | | -'exif-colorspace-1' => 'sRGB', |
| | 2612 | +'exif-colorspace-1' => 'sRGB', |
| 2634 | 2613 | 'exif-colorspace-ffff.h' => 'FFFF.H', |
| 2635 | 2614 | |
| 2636 | 2615 | 'exif-componentsconfiguration-0' => 'does not exist', |
| — | — | @@ -2652,35 +2631,35 @@ |
| 2653 | 2632 | |
| 2654 | 2633 | 'exif-subjectdistance-value' => '$1 metres', |
| 2655 | 2634 | |
| 2656 | | -'exif-meteringmode-0' => 'Unknown', |
| 2657 | | -'exif-meteringmode-1' => 'Average', |
| 2658 | | -'exif-meteringmode-2' => 'CenterWeightedAverage', |
| 2659 | | -'exif-meteringmode-3' => 'Spot', |
| 2660 | | -'exif-meteringmode-4' => 'MultiSpot', |
| 2661 | | -'exif-meteringmode-5' => 'Pattern', |
| 2662 | | -'exif-meteringmode-6' => 'Partial', |
| | 2635 | +'exif-meteringmode-0' => 'Unknown', |
| | 2636 | +'exif-meteringmode-1' => 'Average', |
| | 2637 | +'exif-meteringmode-2' => 'CenterWeightedAverage', |
| | 2638 | +'exif-meteringmode-3' => 'Spot', |
| | 2639 | +'exif-meteringmode-4' => 'MultiSpot', |
| | 2640 | +'exif-meteringmode-5' => 'Pattern', |
| | 2641 | +'exif-meteringmode-6' => 'Partial', |
| 2663 | 2642 | 'exif-meteringmode-255' => 'Other', |
| 2664 | 2643 | |
| 2665 | | -'exif-lightsource-0' => 'Unknown', |
| 2666 | | -'exif-lightsource-1' => 'Daylight', |
| 2667 | | -'exif-lightsource-2' => 'Fluorescent', |
| 2668 | | -'exif-lightsource-3' => 'Tungsten (incandescent light)', |
| 2669 | | -'exif-lightsource-4' => 'Flash', |
| 2670 | | -'exif-lightsource-9' => 'Fine weather', |
| 2671 | | -'exif-lightsource-10' => 'Cloudy weather', |
| 2672 | | -'exif-lightsource-11' => 'Shade', |
| 2673 | | -'exif-lightsource-12' => 'Daylight fluorescent (D 5700 – 7100K)', |
| 2674 | | -'exif-lightsource-13' => 'Day white fluorescent (N 4600 – 5400K)', |
| 2675 | | -'exif-lightsource-14' => 'Cool white fluorescent (W 3900 – 4500K)', |
| 2676 | | -'exif-lightsource-15' => 'White fluorescent (WW 3200 – 3700K)', |
| 2677 | | -'exif-lightsource-17' => 'Standard light A', |
| 2678 | | -'exif-lightsource-18' => 'Standard light B', |
| 2679 | | -'exif-lightsource-19' => 'Standard light C', |
| 2680 | | -'exif-lightsource-20' => 'D55', |
| 2681 | | -'exif-lightsource-21' => 'D65', |
| 2682 | | -'exif-lightsource-22' => 'D75', |
| 2683 | | -'exif-lightsource-23' => 'D50', |
| 2684 | | -'exif-lightsource-24' => 'ISO studio tungsten', |
| | 2644 | +'exif-lightsource-0' => 'Unknown', |
| | 2645 | +'exif-lightsource-1' => 'Daylight', |
| | 2646 | +'exif-lightsource-2' => 'Fluorescent', |
| | 2647 | +'exif-lightsource-3' => 'Tungsten (incandescent light)', |
| | 2648 | +'exif-lightsource-4' => 'Flash', |
| | 2649 | +'exif-lightsource-9' => 'Fine weather', |
| | 2650 | +'exif-lightsource-10' => 'Cloudy weather', |
| | 2651 | +'exif-lightsource-11' => 'Shade', |
| | 2652 | +'exif-lightsource-12' => 'Daylight fluorescent (D 5700 – 7100K)', |
| | 2653 | +'exif-lightsource-13' => 'Day white fluorescent (N 4600 – 5400K)', |
| | 2654 | +'exif-lightsource-14' => 'Cool white fluorescent (W 3900 – 4500K)', |
| | 2655 | +'exif-lightsource-15' => 'White fluorescent (WW 3200 – 3700K)', |
| | 2656 | +'exif-lightsource-17' => 'Standard light A', |
| | 2657 | +'exif-lightsource-18' => 'Standard light B', |
| | 2658 | +'exif-lightsource-19' => 'Standard light C', |
| | 2659 | +'exif-lightsource-20' => 'D55', |
| | 2660 | +'exif-lightsource-21' => 'D65', |
| | 2661 | +'exif-lightsource-22' => 'D75', |
| | 2662 | +'exif-lightsource-23' => 'D50', |
| | 2663 | +'exif-lightsource-24' => 'ISO studio tungsten', |
| 2685 | 2664 | 'exif-lightsource-255' => 'Other light source', |
| 2686 | 2665 | |
| 2687 | 2666 | 'exif-focalplaneresolutionunit-2' => 'inches', |
| — | — | @@ -2735,11 +2714,11 @@ |
| 2736 | 2715 | 'exif-subjectdistancerange-2' => 'Close view', |
| 2737 | 2716 | 'exif-subjectdistancerange-3' => 'Distant view', |
| 2738 | 2717 | |
| 2739 | | -// Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef |
| | 2718 | +# Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef |
| 2740 | 2719 | 'exif-gpslatitude-n' => 'North latitude', |
| 2741 | 2720 | 'exif-gpslatitude-s' => 'South latitude', |
| 2742 | 2721 | |
| 2743 | | -// Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef |
| | 2722 | +# Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef |
| 2744 | 2723 | 'exif-gpslongitude-e' => 'East longitude', |
| 2745 | 2724 | 'exif-gpslongitude-w' => 'West longitude', |
| 2746 | 2725 | |
| — | — | @@ -2749,152 +2728,149 @@ |
| 2750 | 2729 | 'exif-gpsmeasuremode-2' => '2-dimensional measurement', |
| 2751 | 2730 | 'exif-gpsmeasuremode-3' => '3-dimensional measurement', |
| 2752 | 2731 | |
| 2753 | | -// Pseudotags used for GPSSpeedRef and GPSDestDistanceRef |
| | 2732 | +# Pseudotags used for GPSSpeedRef and GPSDestDistanceRef |
| 2754 | 2733 | 'exif-gpsspeed-k' => 'Kilometres per hour', |
| 2755 | 2734 | 'exif-gpsspeed-m' => 'Miles per hour', |
| 2756 | 2735 | 'exif-gpsspeed-n' => 'Knots', |
| 2757 | 2736 | |
| 2758 | | -// Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef |
| | 2737 | +# Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef |
| 2759 | 2738 | 'exif-gpsdirection-t' => 'True direction', |
| 2760 | 2739 | 'exif-gpsdirection-m' => 'Magnetic direction', |
| 2761 | 2740 | |
| 2762 | | -# external editor support |
| 2763 | | -'edit-externally' => 'Edit this file using an external application', |
| | 2741 | +# External editor support |
| | 2742 | +'edit-externally' => 'Edit this file using an external application', |
| 2764 | 2743 | 'edit-externally-help' => 'See the [http://meta.wikimedia.org/wiki/Help:External_editors setup instructions] for more information.', |
| 2765 | 2744 | |
| 2766 | 2745 | # 'all' in various places, this might be different for inflected languages |
| 2767 | 2746 | 'recentchangesall' => 'all', |
| 2768 | | -'imagelistall' => 'all', |
| 2769 | | -'watchlistall1' => 'all', |
| 2770 | | -'watchlistall2' => 'all', |
| 2771 | | -'namespacesall' => 'all', |
| | 2747 | +'imagelistall' => 'all', |
| | 2748 | +'watchlistall1' => 'all', |
| | 2749 | +'watchlistall2' => 'all', |
| | 2750 | +'namespacesall' => 'all', |
| 2772 | 2751 | |
| 2773 | 2752 | # E-mail address confirmation |
| 2774 | | -'confirmemail' => 'Confirm E-mail address', |
| 2775 | | -'confirmemail_noemail' => 'You do not have a valid email address set in your [[Special:Preferences|user preferences]].', |
| 2776 | | -'confirmemail_text' => "This wiki requires that you validate your e-mail address |
| | 2753 | +'confirmemail' => 'Confirm E-mail address', |
| | 2754 | +'confirmemail_noemail' => 'You do not have a valid email address set in your [[Special:Preferences|user preferences]].', |
| | 2755 | +'confirmemail_text' => 'This wiki requires that you validate your e-mail address |
| 2777 | 2756 | before using e-mail features. Activate the button below to send a confirmation |
| 2778 | 2757 | mail to your address. The mail will include a link containing a code; load the |
| 2779 | | -link in your browser to confirm that your e-mail address is valid.", |
| 2780 | | -'confirmemail_pending' => '<div class="error"> |
| | 2758 | +link in your browser to confirm that your e-mail address is valid.', |
| | 2759 | +'confirmemail_pending' => '<div class="error"> |
| 2781 | 2760 | A confirmation code has already been e-mailed to you; if you recently |
| 2782 | 2761 | created your account, you may wish to wait a few minutes for it to |
| 2783 | 2762 | arrive before trying to request a new code. |
| 2784 | 2763 | </div>', |
| 2785 | | -'confirmemail_send' => 'Mail a confirmation code', |
| 2786 | | -'confirmemail_sent' => 'Confirmation e-mail sent.', |
| 2787 | | -'confirmemail_oncreate' => 'A confirmation code was sent to your e-mail address. |
| | 2764 | +'confirmemail_send' => 'Mail a confirmation code', |
| | 2765 | +'confirmemail_sent' => 'Confirmation e-mail sent.', |
| | 2766 | +'confirmemail_oncreate' => 'A confirmation code was sent to your e-mail address. |
| 2788 | 2767 | This code is not required to log in, but you will need to provide it before |
| 2789 | 2768 | enabling any e-mail-based features in the wiki.', |
| 2790 | 2769 | 'confirmemail_sendfailed' => 'Could not send confirmation mail. Check address for invalid characters. |
| 2791 | 2770 | |
| 2792 | 2771 | Mailer returned: $1', |
| 2793 | | -'confirmemail_invalid' => 'Invalid confirmation code. The code may have expired.', |
| 2794 | | -'confirmemail_needlogin' => 'You need to $1 to confirm your email address.', |
| 2795 | | -'confirmemail_success' => 'Your e-mail address has been confirmed. You may now log in and enjoy the wiki.', |
| 2796 | | -'confirmemail_loggedin' => 'Your e-mail address has now been confirmed.', |
| 2797 | | -'confirmemail_error' => 'Something went wrong saving your confirmation.', |
| | 2772 | +'confirmemail_invalid' => 'Invalid confirmation code. The code may have expired.', |
| | 2773 | +'confirmemail_needlogin' => 'You need to $1 to confirm your email address.', |
| | 2774 | +'confirmemail_success' => 'Your e-mail address has been confirmed. You may now log in and enjoy the wiki.', |
| | 2775 | +'confirmemail_loggedin' => 'Your e-mail address has now been confirmed.', |
| | 2776 | +'confirmemail_error' => 'Something went wrong saving your confirmation.', |
| | 2777 | +'confirmemail_subject' => '{{SITENAME}} e-mail address confirmation', |
| | 2778 | +'confirmemail_body' => 'Someone, probably you from IP address $1, has registered an |
| | 2779 | +account "$2" with this e-mail address on {{SITENAME}}. |
| 2798 | 2780 | |
| 2799 | | -'confirmemail_subject' => '{{SITENAME}} e-mail address confirmation', |
| 2800 | | -'confirmemail_body' => "Someone, probably you from IP address $1, has registered an |
| 2801 | | -account \"$2\" with this e-mail address on {{SITENAME}}. |
| 2802 | | - |
| 2803 | 2781 | To confirm that this account really does belong to you and activate |
| 2804 | 2782 | e-mail features on {{SITENAME}}, open this link in your browser: |
| 2805 | 2783 | |
| 2806 | 2784 | $3 |
| 2807 | 2785 | |
| 2808 | | -If this is *not* you, don't follow the link. This confirmation code |
| 2809 | | -will expire at $4.", |
| | 2786 | +If this is *not* you, don\'t follow the link. This confirmation code |
| | 2787 | +will expire at $4.', |
| 2810 | 2788 | |
| 2811 | 2789 | # Inputbox extension, may be useful in other contexts as well |
| 2812 | | -'tryexact' => 'Try exact match', |
| | 2790 | +'tryexact' => 'Try exact match', |
| 2813 | 2791 | 'searchfulltext' => 'Search full text', |
| 2814 | | -'createarticle' => 'Create article', |
| | 2792 | +'createarticle' => 'Create article', |
| 2815 | 2793 | |
| 2816 | 2794 | # Scary transclusion |
| 2817 | 2795 | 'scarytranscludedisabled' => '[Interwiki transcluding is disabled]', |
| 2818 | | -'scarytranscludefailed' => '[Template fetch failed for $1; sorry]', |
| 2819 | | -'scarytranscludetoolong' => '[URL is too long; sorry]', |
| | 2796 | +'scarytranscludefailed' => '[Template fetch failed for $1; sorry]', |
| | 2797 | +'scarytranscludetoolong' => '[URL is too long; sorry]', |
| 2820 | 2798 | |
| 2821 | 2799 | # Trackbacks |
| 2822 | | -'trackbackbox' => '<div id="mw_trackbacks"> |
| | 2800 | +'trackbackbox' => '<div id="mw_trackbacks"> |
| 2823 | 2801 | Trackbacks for this article:<br /> |
| 2824 | 2802 | $1 |
| 2825 | 2803 | </div>', |
| 2826 | | -'trackback' => '; $4$5 : [$2 $1]', |
| 2827 | | -'trackbackexcerpt' => '; $4$5 : [$2 $1]: <nowiki>$3</nowiki>', |
| 2828 | | -'trackbackremove' => ' ([$1 Delete])', |
| 2829 | | -'trackbacklink' => 'Trackback', |
| | 2804 | +'trackback' => '; $4$5 : [$2 $1]', # don't translate or duplicate this message to other languages |
| | 2805 | +'trackbackexcerpt' => '; $4$5 : [$2 $1]: <nowiki>$3</nowiki>', # don't translate or duplicate this message to other languages |
| | 2806 | +'trackbackremove' => ' ([$1 Delete])', |
| | 2807 | +'trackbacklink' => 'Trackback', |
| 2830 | 2808 | 'trackbackdeleteok' => 'The trackback was successfully deleted.', |
| 2831 | 2809 | |
| 2832 | | - |
| 2833 | | -# delete conflict |
| 2834 | | - |
| | 2810 | +# Delete conflict |
| 2835 | 2811 | 'deletedwhileediting' => 'Warning: This page has been deleted after you started editing!', |
| 2836 | | -'confirmrecreate' => 'User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing with reason: |
| 2837 | | -: \'\'$2\'\' |
| 2838 | | -Please confirm that really want to recreate this page.', |
| 2839 | | -'recreate' => 'Recreate', |
| | 2812 | +'confirmrecreate' => "User [[User:$1|$1]] ([[User talk:$1|talk]]) deleted this page after you started editing with reason: |
| | 2813 | +: ''$2'' |
| | 2814 | +Please confirm that really want to recreate this page.", |
| | 2815 | +'recreate' => 'Recreate', |
| 2840 | 2816 | |
| 2841 | | -'unit-pixel' => 'px', |
| | 2817 | +'unit-pixel' => 'px', # only translate this message to other languages if you have to change it |
| 2842 | 2818 | |
| 2843 | 2819 | # HTML dump |
| 2844 | 2820 | 'redirectingto' => 'Redirecting to [[$1]]...', |
| 2845 | 2821 | |
| 2846 | 2822 | # action=purge |
| 2847 | | -'confirm_purge' => "Clear the cache of this page?\n\n$1", |
| | 2823 | +'confirm_purge' => 'Clear the cache of this page? |
| | 2824 | + |
| | 2825 | +$1', |
| 2848 | 2826 | 'confirm_purge_button' => 'OK', |
| 2849 | 2827 | |
| 2850 | | -'youhavenewmessagesmulti' => "You have new messages on $1", |
| 2851 | | -'newtalkseperator' => ',_', |
| | 2828 | +'youhavenewmessagesmulti' => 'You have new messages on $1', |
| | 2829 | +'newtalkseperator' => ',_', # don't translate or duplicate this message to other languages |
| | 2830 | + |
| 2852 | 2831 | 'searchcontaining' => "Search for articles containing ''$1''.", |
| 2853 | | -'searchnamed' => "Search for articles named ''$1''.", |
| 2854 | | -'articletitles' => "Articles starting with ''$1''", |
| 2855 | | -'hideresults' => 'Hide results', |
| | 2832 | +'searchnamed' => "Search for articles named ''$1''.", |
| | 2833 | +'articletitles' => "Articles starting with ''$1''", |
| | 2834 | +'hideresults' => 'Hide results', |
| 2856 | 2835 | |
| 2857 | 2836 | # DISPLAYTITLE |
| 2858 | 2837 | 'displaytitle' => '(Link to this page as [[$1]])', |
| 2859 | 2838 | |
| 2860 | 2839 | # Separator for categories in page lists |
| 2861 | | -# Please don't localise this |
| 2862 | | -'catseparator' => '|', |
| | 2840 | +'catseparator' => '|', # don't translate or duplicate this message to other languages |
| 2863 | 2841 | |
| 2864 | 2842 | 'loginlanguagelabel' => 'Language: $1', |
| 2865 | | - |
| 2866 | | -# Don't duplicate this in translations; defaults should remain consistent |
| 2867 | | -'loginlanguagelinks' => "* Deutsch|de |
| | 2843 | +'loginlanguagelinks' => '* Deutsch|de |
| 2868 | 2844 | * English|en |
| 2869 | 2845 | * Esperanto|eo |
| 2870 | 2846 | * Français|fr |
| 2871 | 2847 | * Español|es |
| 2872 | 2848 | * Italiano|it |
| 2873 | | -* Nederlands|nl", |
| | 2849 | +* Nederlands|nl', # don't translate or duplicate this message to other languages |
| 2874 | 2850 | |
| 2875 | 2851 | # Multipage image navigation |
| 2876 | | -'imgmultipageprev' => '← previous page', |
| 2877 | | -'imgmultipagenext' => 'next page →', |
| 2878 | | -'imgmultigo' => 'Go!', |
| 2879 | | -'imgmultigotopre' => 'Go to page', |
| 2880 | | -'imgmultigotopost' => '', |
| | 2852 | +'imgmultipageprev' => '← previous page', |
| | 2853 | +'imgmultipagenext' => 'next page →', |
| | 2854 | +'imgmultigo' => 'Go!', |
| | 2855 | +'imgmultigotopre' => 'Go to page', |
| | 2856 | +'imgmultigotopost' => '', # only translate this message to other languages if you have to change it |
| 2881 | 2857 | 'imgmultiparseerror' => 'The image file appears to be corrupted or incorrect, so {{SITENAME}} cannot retrieve a list of pages.', |
| 2882 | 2858 | |
| 2883 | 2859 | # Table pager |
| 2884 | | -'ascending_abbrev' => 'asc', |
| 2885 | | -'descending_abbrev' => 'desc', |
| 2886 | | -'table_pager_next' => 'Next page', |
| 2887 | | -'table_pager_prev' => 'Previous page', |
| 2888 | | -'table_pager_first' => 'First page', |
| 2889 | | -'table_pager_last' => 'Last page', |
| 2890 | | -'table_pager_limit' => 'Show $1 items per page', |
| | 2860 | +'ascending_abbrev' => 'asc', |
| | 2861 | +'descending_abbrev' => 'desc', |
| | 2862 | +'table_pager_next' => 'Next page', |
| | 2863 | +'table_pager_prev' => 'Previous page', |
| | 2864 | +'table_pager_first' => 'First page', |
| | 2865 | +'table_pager_last' => 'Last page', |
| | 2866 | +'table_pager_limit' => 'Show $1 items per page', |
| 2891 | 2867 | 'table_pager_limit_submit' => 'Go', |
| 2892 | | -'table_pager_empty' => 'No results', |
| | 2868 | +'table_pager_empty' => 'No results', |
| 2893 | 2869 | |
| 2894 | 2870 | # Auto-summaries |
| 2895 | | -'autosumm-blank' => 'Removing all content from page', |
| 2896 | | -'autosumm-replace' => 'Replacing page with \'$1\'', |
| 2897 | | -'autoredircomment' => 'Redirecting to [[$1]]', # This should be changed to the new naming convention, but existed beforehand. |
| 2898 | | -'autosumm-new' => 'New page: $1', |
| | 2871 | +'autosumm-blank' => 'Removing all content from page', |
| | 2872 | +'autosumm-replace' => "Replacing page with '$1'", |
| | 2873 | +'autoredircomment' => 'Redirecting to [[$1]]', # This should be changed to the new naming convention, but existed beforehand |
| | 2874 | +'autosumm-new' => 'New page: $1', |
| 2899 | 2875 | |
| 2900 | 2876 | # Autoblock whitelist |
| 2901 | 2877 | 'autoblock_whitelist' => 'AOL http://webmaster.info.aol.com/proxyinfo.html |
| — | — | @@ -2918,10 +2894,10 @@ |
| 2919 | 2895 | *205.188.208.0/23 |
| 2920 | 2896 | *205.188.112.0/20 |
| 2921 | 2897 | *205.188.146.144/30 |
| 2922 | | -*207.200.112.0/21', |
| | 2898 | +*207.200.112.0/21', # don't translate or duplicate this message to other languages |
| 2923 | 2899 | |
| 2924 | 2900 | # Size units |
| 2925 | | -'size-bytes' => '$1 B', |
| | 2901 | +'size-bytes' => '$1 B', |
| 2926 | 2902 | 'size-kilobytes' => '$1 KB', |
| 2927 | 2903 | 'size-megabytes' => '$1 MB', |
| 2928 | 2904 | 'size-gigabytes' => '$1 GB', |
| — | — | @@ -2929,12 +2905,14 @@ |
| 2930 | 2906 | # Live preview |
| 2931 | 2907 | 'livepreview-loading' => 'Loading…', |
| 2932 | 2908 | 'livepreview-ready' => 'Loading… Ready!', |
| 2933 | | -'livepreview-failed' => "Live preview failed!\nTry normal preview.", |
| 2934 | | -'livepreview-error' => "Failed to connect: $1 \"$2\"\nTry normal preview.", |
| | 2909 | +'livepreview-failed' => 'Live preview failed! |
| | 2910 | +Try normal preview.', |
| | 2911 | +'livepreview-error' => 'Failed to connect: $1 "$2" |
| | 2912 | +Try normal preview.', |
| 2935 | 2913 | |
| 2936 | 2914 | # Friendlier slave lag warnings |
| 2937 | 2915 | 'lag-warn-normal' => 'Changes newer than $1 seconds may not be shown in this list.', |
| 2938 | | -'lag-warn-high' => 'Due to high database server lag, changes newer than $1 seconds |
| | 2916 | +'lag-warn-high' => 'Due to high database server lag, changes newer than $1 seconds |
| 2939 | 2917 | may not be shown in this list.', |
| 2940 | 2918 | |
| 2941 | 2919 | ); |
| Index: branches/phase3_rev_deleted/includes/Article.php |
| — | — | @@ -609,7 +609,7 @@ |
| 610 | 610 | function view() { |
| 611 | 611 | global $wgUser, $wgOut, $wgRequest, $wgContLang; |
| 612 | 612 | global $wgEnableParserCache, $wgStylePath, $wgUseRCPatrol, $wgParser; |
| 613 | | - global $wgUseTrackbacks, $wgNamespaceRobotPolicies; |
| | 613 | + global $wgUseTrackbacks, $wgNamespaceRobotPolicies, $wgArticleRobotPolicies; |
| 614 | 614 | $sk = $wgUser->getSkin(); |
| 615 | 615 | |
| 616 | 616 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -637,6 +637,8 @@ |
| 638 | 638 | # Discourage indexing of printable versions, but encourage following |
| 639 | 639 | if( $wgOut->isPrintable() ) { |
| 640 | 640 | $policy = 'noindex,follow'; |
| | 641 | + } elseif ( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) { |
| | 642 | + $policy = $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()]; |
| 641 | 643 | } elseif( isset( $wgNamespaceRobotPolicies[$ns] ) ) { |
| 642 | 644 | # Honour customised robot policies for this namespace |
| 643 | 645 | $policy = $wgNamespaceRobotPolicies[$ns]; |
| — | — | @@ -780,10 +782,10 @@ |
| 781 | 783 | # XXX: use $this->mTitle->usCssJsSubpage() when php is fixed/ a workaround is found |
| 782 | 784 | if ( |
| 783 | 785 | $ns == NS_USER && |
| 784 | | - preg_match('/\\/[\\w]+\\.(?:css|js)$/', $this->mTitle->getDBkey()) |
| | 786 | + preg_match('!/[\w]+\.(css|js)$!', $this->mTitle->getDBkey(), $matches) |
| 785 | 787 | ) { |
| 786 | 788 | $wgOut->addWikiText( wfMsg('clearyourcache')); |
| 787 | | - $wgOut->addHTML( '<pre>'.htmlspecialchars($this->mContent)."\n</pre>" ); |
| | 789 | + $wgOut->addHTML( "<pre class=\"mw-user-{$matches[1]}\" dir=\"ltr\">".htmlspecialchars($this->mContent)."\n</pre>" ); |
| 788 | 790 | } else if ( $rt = Title::newFromRedirect( $text ) ) { |
| 789 | 791 | # Display redirect |
| 790 | 792 | $imageDir = $wgContLang->isRTL() ? 'rtl' : 'ltr'; |
| — | — | @@ -1696,7 +1698,13 @@ |
| 1697 | 1699 | } |
| 1698 | 1700 | |
| 1699 | 1701 | # Prepare a null revision to be added to the history |
| 1700 | | - $comment = $wgContLang->ucfirst( wfMsgForContent( $protect ? 'protectedarticle' : 'unprotectedarticle', $this->mTitle->getPrefixedText() ) ); |
| | 1702 | + $modified = $current != '' && $protect; |
| | 1703 | + if ( $protect ) { |
| | 1704 | + $comment_type = $modified ? 'modifiedarticleprotection' : 'protectedarticle'; |
| | 1705 | + } else { |
| | 1706 | + $comment_type = 'unprotectedarticle'; |
| | 1707 | + } |
| | 1708 | + $comment = $wgContLang->ucfirst( wfMsgForContent( $comment_type, $this->mTitle->getPrefixedText() ) ); |
| 1701 | 1709 | |
| 1702 | 1710 | foreach( $limit as $action => $restrictions ) { |
| 1703 | 1711 | # Check if the group level required to edit also can protect pages |
| — | — | @@ -1756,7 +1764,7 @@ |
| 1757 | 1765 | } |
| 1758 | 1766 | |
| 1759 | 1767 | if( $protect ) { |
| 1760 | | - $log->addEntry( 'protect', $this->mTitle, trim( $reason . " [$updated]$cascade_description$expiry_description" ) ); |
| | 1768 | + $log->addEntry( $modified ? 'modify' : 'protect', $this->mTitle, trim( $reason . " [$updated]$cascade_description$expiry_description" ) ); |
| 1761 | 1769 | } else { |
| 1762 | 1770 | $log->addEntry( 'unprotect', $this->mTitle, $reason ); |
| 1763 | 1771 | } |
| — | — | @@ -2016,11 +2024,10 @@ |
| 2017 | 2025 | |
| 2018 | 2026 | |
| 2019 | 2027 | /** |
| 2020 | | - * Fetch deletion log |
| | 2028 | + * Show relevant lines from the deletion log |
| 2021 | 2029 | */ |
| 2022 | | - function showLogExtract( &$out ) { |
| 2023 | | - # Show relevant lines from the deletion log: |
| 2024 | | - $out->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" ); |
| | 2030 | + function showLogExtract( $out ) { |
| | 2031 | + $out->addHtml( '<h2>' . htmlspecialchars( LogPage::logName( 'delete' ) ) . '</h2>' ); |
| 2025 | 2032 | $logViewer = new LogViewer( |
| 2026 | 2033 | new LogReader( |
| 2027 | 2034 | new FauxRequest( |
| Index: branches/phase3_rev_deleted/includes/SpecialVersion.php |
| — | — | @@ -250,7 +250,10 @@ |
| 251 | 251 | * @return mixed |
| 252 | 252 | */ |
| 253 | 253 | function arrayToString( $list ) { |
| 254 | | - if ( ! is_array( $list ) ) { |
| | 254 | + if( is_object( $list ) ) { |
| | 255 | + $class = get_class( $list ); |
| | 256 | + return "($class)"; |
| | 257 | + } elseif ( ! is_array( $list ) ) { |
| 255 | 258 | return $list; |
| 256 | 259 | } else { |
| 257 | 260 | $class = get_class( $list[0] ); |
| Index: branches/phase3_rev_deleted/includes/GlobalFunctions.php |
| — | — | @@ -327,6 +327,20 @@ |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | /** |
| | 331 | + * Get a message in the user interface language and replace wiki |
| | 332 | + * links with clickable ones, escaping other HTML |
| | 333 | + * |
| | 334 | + * @param string $key Message key |
| | 335 | + * @return string |
| | 336 | + */ |
| | 337 | +function wfMsgWithLinks( $key ) { |
| | 338 | + global $wgUser; |
| | 339 | + $args = func_get_args(); |
| | 340 | + return $wgUser->getSkin()->formatLinksInComment( htmlspecialchars( |
| | 341 | + call_user_func_array( 'wfMsg', $args ) ) ); |
| | 342 | +} |
| | 343 | + |
| | 344 | +/** |
| 331 | 345 | * Same as above except doesn't transform the message |
| 332 | 346 | */ |
| 333 | 347 | function wfMsgNoTrans( $key ) { |
| — | — | @@ -369,6 +383,19 @@ |
| 370 | 384 | } |
| 371 | 385 | |
| 372 | 386 | /** |
| | 387 | + * Get a message in the content language and replace wiki |
| | 388 | + * links with clickable ones, escaping other HTML |
| | 389 | + * |
| | 390 | + * @param string $key Message key |
| | 391 | + * @return string |
| | 392 | + */ |
| | 393 | +function wfMsgForContentWithLinks( $key ) { |
| | 394 | + global $wgUser; |
| | 395 | + return $wgUser->getSkin()->formatLinksInComment( htmlspecialchars( |
| | 396 | + call_user_func_array( 'wfMsgForContent', func_get_args() ) ) ); |
| | 397 | +} |
| | 398 | + |
| | 399 | +/** |
| 373 | 400 | * Same as above except doesn't transform the message |
| 374 | 401 | */ |
| 375 | 402 | function wfMsgForContentNoTrans( $key ) { |
| Index: branches/phase3_rev_deleted/includes/ObjectCache.php |
| — | — | @@ -70,6 +70,8 @@ |
| 71 | 71 | $wgCaches[CACHE_ACCEL] = new eAccelBagOStuff; |
| 72 | 72 | } elseif ( function_exists( 'apc_fetch') ) { |
| 73 | 73 | $wgCaches[CACHE_ACCEL] = new APCBagOStuff; |
| | 74 | + } elseif( function_exists( 'xcache_get' ) ) { |
| | 75 | + $wgCaches[CACHE_ACCEL] = new XCacheBagOStuff(); |
| 74 | 76 | } elseif ( function_exists( 'mmcache_get' ) ) { |
| 75 | 77 | $wgCaches[CACHE_ACCEL] = new TurckBagOStuff; |
| 76 | 78 | } else { |
| Index: branches/phase3_rev_deleted/includes/ExternalStore.php |
| — | — | @@ -41,10 +41,9 @@ |
| 42 | 42 | return false; |
| 43 | 43 | |
| 44 | 44 | $class='ExternalStore'.ucfirst($proto); |
| 45 | | - /* Preloaded modules might exist, especially ones serving multiple protocols */ |
| | 45 | + /* Any custom modules should be added to $wgAutoLoadClasses for on-demand loading */ |
| 46 | 46 | if (!class_exists($class)) { |
| 47 | | - if (!include_once($class.'.php')) |
| 48 | | - return false; |
| | 47 | + return false; |
| 49 | 48 | } |
| 50 | 49 | $store=new $class(); |
| 51 | 50 | return $store; |
| Index: branches/phase3_rev_deleted/includes/SpecialBooksources.php |
| — | — | @@ -14,14 +14,14 @@ |
| 15 | 15 | * ISBN passed to the page, if any |
| 16 | 16 | */ |
| 17 | 17 | private $isbn = ''; |
| 18 | | - |
| | 18 | + |
| 19 | 19 | /** |
| 20 | 20 | * Constructor |
| 21 | 21 | */ |
| 22 | 22 | public function __construct() { |
| 23 | 23 | parent::__construct( 'Booksources' ); |
| 24 | 24 | } |
| 25 | | - |
| | 25 | + |
| 26 | 26 | /** |
| 27 | 27 | * Show the special page |
| 28 | 28 | * |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | if( strlen( $this->isbn ) > 0 ) |
| 38 | 38 | $this->showList(); |
| 39 | 39 | } |
| 40 | | - |
| | 40 | + |
| 41 | 41 | /** |
| 42 | 42 | * Trim ISBN and remove characters which aren't required |
| 43 | 43 | * |
| — | — | @@ -46,7 +46,7 @@ |
| 47 | 47 | private function cleanIsbn( $isbn ) { |
| 48 | 48 | return trim( preg_replace( '![^0-9X]!', '', $isbn ) ); |
| 49 | 49 | } |
| 50 | | - |
| | 50 | + |
| 51 | 51 | /** |
| 52 | 52 | * Generate a form to allow users to enter an ISBN |
| 53 | 53 | * |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | $form .= '</fieldset>'; |
| 66 | 66 | return $form; |
| 67 | 67 | } |
| 68 | | - |
| | 68 | + |
| 69 | 69 | /** |
| 70 | 70 | * Determine where to get the list of book sources from, |
| 71 | 71 | * format and output them |
| — | — | @@ -73,19 +73,19 @@ |
| 74 | 74 | */ |
| 75 | 75 | private function showList() { |
| 76 | 76 | global $wgOut, $wgContLang; |
| 77 | | - |
| | 77 | + |
| 78 | 78 | # Hook to allow extensions to insert additional HTML, |
| 79 | 79 | # e.g. for API-interacting plugins and so on |
| 80 | 80 | wfRunHooks( 'BookInformation', array( $this->isbn, &$wgOut ) ); |
| 81 | | - |
| | 81 | + |
| 82 | 82 | # Check for a local page such as Project:Book_sources and use that if available |
| 83 | | - $title = Title::makeTitleSafe( NS_PROJECT, wfMsg( 'booksources' ) ); # Should this be wfMsgForContent()? -- RC |
| | 83 | + $title = Title::makeTitleSafe( NS_PROJECT, wfMsgForContent( 'booksources' ) ); # Show list in content language |
| 84 | 84 | if( is_object( $title ) && $title->exists() ) { |
| 85 | 85 | $rev = Revision::newFromTitle( $title ); |
| 86 | 86 | $wgOut->addWikiText( str_replace( 'MAGICNUMBER', $this->isbn, $rev->getText() ) ); |
| 87 | 87 | return true; |
| 88 | 88 | } |
| 89 | | - |
| | 89 | + |
| 90 | 90 | # Fall back to the defaults given in the language file |
| 91 | 91 | $wgOut->addWikiText( wfMsgNoTrans( 'booksources-text' ) ); |
| 92 | 92 | $wgOut->addHtml( '<ul>' ); |
| Index: branches/phase3_rev_deleted/includes/SpecialWantedpages.php |
| — | — | @@ -63,46 +63,49 @@ |
| 64 | 64 | $db->dataSeek( $res, 0 ); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | | - |
| 68 | | - function formatResult( $skin, $result ) { |
| | 67 | + /** |
| | 68 | + * Format an individual result |
| | 69 | + * |
| | 70 | + * @param Skin $skin Skin to use for UI elements |
| | 71 | + * @param object $result Result row |
| | 72 | + * @return string |
| | 73 | + */ |
| | 74 | + public function formatResult( $skin, $result ) { |
| 69 | 75 | global $wgLang; |
| 70 | | - |
| 71 | 76 | $title = Title::makeTitleSafe( $result->namespace, $result->title ); |
| 72 | | - |
| 73 | | - if( $this->isCached() ) { |
| 74 | | - # Check existence; which is stored in the link cache |
| 75 | | - if( !$title->exists() ) { |
| 76 | | - # Make a redlink |
| | 77 | + if( $title instanceof Title ) { |
| | 78 | + if( $this->isCached() ) { |
| | 79 | + $pageLink = $title->exists() |
| | 80 | + ? '<s>' . $skin->makeLinkObj( $title ) . '</s>' |
| | 81 | + : $skin->makeBrokenLinkObj( $title ); |
| | 82 | + } else { |
| 77 | 83 | $pageLink = $skin->makeBrokenLinkObj( $title ); |
| 78 | | - } else { |
| 79 | | - # Make a a struck-out normal link |
| 80 | | - $pageLink = "<s>" . $skin->makeLinkObj( $title ) . "</s>"; |
| 81 | | - } |
| | 84 | + } |
| | 85 | + return wfSpecialList( $pageLink, $this->makeWlhLink( $title, $skin, $result ) ); |
| 82 | 86 | } else { |
| 83 | | - # Not cached? Don't bother checking existence; it can't |
| 84 | | - $pageLink = $skin->makeBrokenLinkObj( $title ); |
| | 87 | + $tsafe = htmlspecialchars( $result->title ); |
| | 88 | + return "Invalid title in result set; {$tsafe}"; |
| 85 | 89 | } |
| 86 | | - |
| 87 | | - # Make a link to "what links here" if it's required |
| 88 | | - $wlhLink = $this->nlinks |
| 89 | | - ? $this->makeWlhLink( $title, $skin, |
| 90 | | - wfMsgExt( 'nlinks', array( 'parsemag', 'escape'), |
| 91 | | - $wgLang->formatNum( $result->value ) ) ) |
| 92 | | - : null; |
| 93 | | - |
| 94 | | - return wfSpecialList($pageLink, $wlhLink); |
| 95 | 90 | } |
| 96 | 91 | |
| 97 | 92 | /** |
| 98 | | - * Make a "what links here" link for a specified title |
| 99 | | - * @param $title Title to make the link for |
| 100 | | - * @param $skin Skin to use |
| 101 | | - * @param $text Link text |
| | 93 | + * Make a "what links here" link for a specified result if required |
| | 94 | + * |
| | 95 | + * @param Title $title Title to make the link for |
| | 96 | + * @param Skin $skin Skin to use |
| | 97 | + * @param object $result Result row |
| 102 | 98 | * @return string |
| 103 | 99 | */ |
| 104 | | - function makeWlhLink( &$title, &$skin, $text ) { |
| 105 | | - $wlhTitle = SpecialPage::getTitleFor( 'Whatlinkshere' ); |
| 106 | | - return $skin->makeKnownLinkObj( $wlhTitle, $text, 'target=' . $title->getPrefixedUrl() ); |
| | 100 | + private function makeWlhLink( $title, $skin, $result ) { |
| | 101 | + global $wgLang; |
| | 102 | + if( $this->nlinks ) { |
| | 103 | + $wlh = SpecialPage::getTitleFor( 'Whatlinkshere' ); |
| | 104 | + $label = wfMsgExt( 'nlinks', array( 'parsemag', 'escape' ), |
| | 105 | + $wgLang->formatNum( $result->value ) ); |
| | 106 | + return $skin->makeKnownLinkObj( $wlh, $label, 'target=' . $title->getPrefixedUrl() ); |
| | 107 | + } else { |
| | 108 | + return null; |
| | 109 | + } |
| 107 | 110 | } |
| 108 | 111 | |
| 109 | 112 | } |
| Index: branches/phase3_rev_deleted/includes/IP.php |
| — | — | @@ -22,7 +22,12 @@ |
| 23 | 23 | define( 'RE_IPV6_ADD', '(:(:' . RE_IPV6_WORD . '){1,7}|' . RE_IPV6_WORD . '(:{1,2}' . RE_IPV6_WORD . '|::$){1,7})' );
|
| 24 | 24 | define( 'RE_IPV6_BLOCK', RE_IPV6_ADD . '\/' . RE_IPV6_PREFIX );
|
| 25 | 25 | // This might be useful for regexps used elsewhere, matches any IPv6 or IPv6 address or network
|
| 26 | | -define( 'IP_ADDRESS_STRING', RE_IP_ADD . '(\/' . RE_IP_PREFIX . '|)|' . RE_IPV6_ADD . '(\/' . RE_IPV6_PREFIX . '|)');
|
| | 26 | +define( 'IP_ADDRESS_STRING',
|
| | 27 | + '(?:' .
|
| | 28 | + RE_IP_ADD . '(\/' . RE_IP_PREFIX . '|)' .
|
| | 29 | + '|' .
|
| | 30 | + RE_IPV6_ADD . '(\/' . RE_IPV6_PREFIX . '|)' .
|
| | 31 | + ')' );
|
| 27 | 32 |
|
| 28 | 33 | /**
|
| 29 | 34 | * A collection of public static functions to play with IP address
|
| Index: branches/phase3_rev_deleted/includes/SpecialEmailuser.php |
| — | — | @@ -45,6 +45,13 @@ |
| 46 | 46 | return; |
| 47 | 47 | } |
| 48 | 48 | |
| | 49 | + if ( $wgUser->isBlockedFromEmailUser() ) { |
| | 50 | + // User has been blocked from sending e-mail. Show the std blocked form. |
| | 51 | + wfDebug( "User is blocked from sending e-mail.\n" ); |
| | 52 | + $wgOut->blockedPage(); |
| | 53 | + return; |
| | 54 | + } |
| | 55 | + |
| 49 | 56 | $f = new EmailUserForm( $nu ); |
| 50 | 57 | |
| 51 | 58 | if ( "success" == $action ) { |
| Index: branches/phase3_rev_deleted/includes/Block.php |
| — | — | @@ -15,7 +15,8 @@ |
| 16 | 16 | class Block |
| 17 | 17 | { |
| 18 | 18 | /* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry, |
| 19 | | - $mRangeStart, $mRangeEnd, $mAnonOnly, $mEnableAutoblock, $mHideName; |
| | 19 | + $mRangeStart, $mRangeEnd, $mAnonOnly, $mEnableAutoblock, $mHideName, |
| | 20 | + $mBlockEmail; |
| 20 | 21 | /* private */ var $mNetworkBits, $mIntegerAddr, $mForUpdate, $mFromMaster, $mByName; |
| 21 | 22 | |
| 22 | 23 | const EB_KEEP_EXPIRED = 1; |
| — | — | @@ -24,7 +25,7 @@ |
| 25 | 26 | |
| 26 | 27 | function __construct( $address = '', $user = 0, $by = 0, $reason = '', |
| 27 | 28 | $timestamp = '' , $auto = 0, $expiry = '', $anonOnly = 0, $createAccount = 0, $enableAutoblock = 0, |
| 28 | | - $hideName = 0 ) |
| | 29 | + $hideName = 0, $blockEmail = 0 ) |
| 29 | 30 | { |
| 30 | 31 | $this->mId = 0; |
| 31 | 32 | # Expand valid IPv6 addresses |
| — | — | @@ -40,7 +41,7 @@ |
| 41 | 42 | $this->mExpiry = self::decodeExpiry( $expiry ); |
| 42 | 43 | $this->mEnableAutoblock = $enableAutoblock; |
| 43 | 44 | $this->mHideName = $hideName; |
| 44 | | - |
| | 45 | + $this->mBlockEmail = $blockEmail; |
| 45 | 46 | $this->mForUpdate = false; |
| 46 | 47 | $this->mFromMaster = false; |
| 47 | 48 | $this->mByName = false; |
| — | — | @@ -76,7 +77,7 @@ |
| 77 | 78 | $this->mAddress = $this->mReason = $this->mTimestamp = ''; |
| 78 | 79 | $this->mId = $this->mAnonOnly = $this->mCreateAccount = |
| 79 | 80 | $this->mEnableAutoblock = $this->mAuto = $this->mUser = |
| 80 | | - $this->mBy = $this->mHideName = 0; |
| | 81 | + $this->mBy = $this->mHideName = $this->mBlockEmail = 0; |
| 81 | 82 | $this->mByName = false; |
| 82 | 83 | } |
| 83 | 84 | |
| — | — | @@ -262,6 +263,7 @@ |
| 263 | 264 | $this->mAnonOnly = $row->ipb_anon_only; |
| 264 | 265 | $this->mCreateAccount = $row->ipb_create_account; |
| 265 | 266 | $this->mEnableAutoblock = $row->ipb_enable_autoblock; |
| | 267 | + $this->mBlockEmail = $row->ipb_block_email; |
| 266 | 268 | $this->mHideName = $row->ipb_deleted; |
| 267 | 269 | $this->mId = $row->ipb_id; |
| 268 | 270 | $this->mExpiry = self::decodeExpiry( $row->ipb_expiry ); |
| — | — | @@ -371,6 +373,7 @@ |
| 372 | 374 | # Unset ipb_enable_autoblock for IP blocks, makes no sense |
| 373 | 375 | if ( !$this->mUser ) { |
| 374 | 376 | $this->mEnableAutoblock = 0; |
| | 377 | + $this->mBlockEmail = 0; //Same goes for email... |
| 375 | 378 | } |
| 376 | 379 | |
| 377 | 380 | # Don't collide with expired blocks |
| — | — | @@ -392,7 +395,8 @@ |
| 393 | 396 | 'ipb_expiry' => self::encodeExpiry( $this->mExpiry, $dbw ), |
| 394 | 397 | 'ipb_range_start' => $this->mRangeStart, |
| 395 | 398 | 'ipb_range_end' => $this->mRangeEnd, |
| 396 | | - 'ipb_deleted' => $this->mHideName |
| | 399 | + 'ipb_deleted' => $this->mHideName, |
| | 400 | + 'ipb_block_email' => $this->mBlockEmail |
| 397 | 401 | ), 'Block::insert', array( 'IGNORE' ) |
| 398 | 402 | ); |
| 399 | 403 | $affected = $dbw->affectedRows(); |
| Index: branches/phase3_rev_deleted/includes/DatabaseOracle.php |
| — | — | @@ -675,10 +675,19 @@ |
| 676 | 676 | } |
| 677 | 677 | |
| 678 | 678 | function ping() { |
| 679 | | - wfDebug( "Function ping() not written for DatabasePostgres.php yet"); |
| | 679 | + wfDebug( "Function ping() not written for DatabaseOracle.php yet"); |
| 680 | 680 | return true; |
| 681 | 681 | } |
| 682 | 682 | |
| | 683 | + /** |
| | 684 | + * How lagged is this slave? |
| | 685 | + * |
| | 686 | + * @return int |
| | 687 | + */ |
| | 688 | + public function getLag() { |
| | 689 | + # Not implemented for Oracle |
| | 690 | + return 0; |
| | 691 | + } |
| 683 | 692 | |
| 684 | 693 | } // end DatabaseOracle class |
| 685 | 694 | |
| Index: branches/phase3_rev_deleted/includes/QueryPage.php |
| — | — | @@ -25,6 +25,7 @@ |
| 26 | 26 | array( 'MostcategoriesPage', 'Mostcategories' ), |
| 27 | 27 | array( 'MostimagesPage', 'Mostimages' ), |
| 28 | 28 | array( 'MostlinkedCategoriesPage', 'Mostlinkedcategories' ), |
| | 29 | + array( 'SpecialMostlinkedtemplates', 'Mostlinkedtemplates' ), |
| 29 | 30 | array( 'MostlinkedPage', 'Mostlinked' ), |
| 30 | 31 | array( 'MostrevisionsPage', 'Mostrevisions' ), |
| 31 | 32 | array( 'FewestrevisionsPage', 'Fewestrevisions' ), |
| — | — | @@ -33,6 +34,7 @@ |
| 34 | 35 | array( 'UncategorizedCategoriesPage', 'Uncategorizedcategories' ), |
| 35 | 36 | array( 'UncategorizedPagesPage', 'Uncategorizedpages' ), |
| 36 | 37 | array( 'UncategorizedImagesPage', 'Uncategorizedimages' ), |
| | 38 | + array( 'UncategorizedTemplatesPage', 'Uncategorizedtemplates' ), |
| 37 | 39 | array( 'UnusedCategoriesPage', 'Unusedcategories' ), |
| 38 | 40 | array( 'UnusedimagesPage', 'Unusedimages' ), |
| 39 | 41 | array( 'WantedCategoriesPage', 'Wantedcategories' ), |
| Index: branches/phase3_rev_deleted/includes/MacBinary.php |
| — | — | @@ -100,7 +100,7 @@ |
| 101 | 101 | |
| 102 | 102 | fseek( $this->handle, 0 ); |
| 103 | 103 | $head = fread( $this->handle, 128 ); |
| 104 | | - $this->hexdump( $head ); |
| | 104 | + #$this->hexdump( $head ); |
| 105 | 105 | |
| 106 | 106 | if( strlen( $head ) < 128 ) { |
| 107 | 107 | wfDebug( "$fname: couldn't read full MacBinary header\n" ); |
| Index: branches/phase3_rev_deleted/includes/ProtectionForm.php |
| — | — | @@ -27,6 +27,7 @@ |
| 28 | 28 | var $mRestrictions = array(); |
| 29 | 29 | var $mReason = ''; |
| 30 | 30 | var $mCascade = false; |
| | 31 | + var $mFileOnly = false; |
| 31 | 32 | var $mExpiry = null; |
| 32 | 33 | |
| 33 | 34 | function __construct( &$article ) { |
| — | — | @@ -42,6 +43,14 @@ |
| 43 | 44 | // Fixme: this form currently requires individual selections, |
| 44 | 45 | // but the db allows multiples separated by commas. |
| 45 | 46 | $this->mRestrictions[$action] = implode( '', $this->mTitle->getRestrictions( $action ) ); |
| | 47 | + // For Images only, see if only the file is protected... |
| | 48 | + // We want to list EITHER the edit OR upload rights in the db, |
| | 49 | + // otherwise ProtectedPages may show dups when 'Upload' is selected |
| | 50 | + if( $action=='edit' && !$this->mRestrictions['edit'] && $this->mTitle->getRestrictions('upload') ) { |
| | 51 | + $this->mFileOnly = true; |
| | 52 | + // Show these under the edit box, for viewing purposes only |
| | 53 | + $this->mRestrictions['edit'] = implode( '', $this->mTitle->getRestrictions( 'upload' ) ); |
| | 54 | + } |
| 46 | 55 | } |
| 47 | 56 | |
| 48 | 57 | $this->mCascade = $this->mTitle->areRestrictionsCascading(); |
| — | — | @@ -65,6 +74,7 @@ |
| 66 | 75 | $this->mReason = $wgRequest->getText( 'mwProtect-reason' ); |
| 67 | 76 | $this->mCascade = $wgRequest->getBool( 'mwProtect-cascade' ); |
| 68 | 77 | $this->mExpiry = $wgRequest->getText( 'mwProtect-expiry' ); |
| | 78 | + $this->mFileOnly = $wgRequest->getText( 'mwProtect-fileonly' ); |
| 69 | 79 | |
| 70 | 80 | foreach( $wgRestrictionTypes as $action ) { |
| 71 | 81 | $val = $wgRequest->getVal( "mwProtect-level-$action" ); |
| — | — | @@ -184,10 +194,25 @@ |
| 185 | 195 | |
| 186 | 196 | } |
| 187 | 197 | |
| | 198 | + // For images, the edit right is more general than the upload right |
| | 199 | + if( $this->mTitle->getNamespace()==NS_IMAGE ) { |
| | 200 | + if( $this->mFileOnly ) { |
| | 201 | + $this->mRestrictions['upload'] = $this->mRestrictions['edit']; |
| | 202 | + $this->mRestrictions['edit'] = ''; |
| | 203 | + } |
| | 204 | + } |
| | 205 | + |
| 188 | 206 | $ok = $this->mArticle->updateRestrictions( $this->mRestrictions, $this->mReason, $this->mCascade, $expiry ); |
| 189 | 207 | if( !$ok ) { |
| 190 | 208 | throw new FatalError( "Unknown error at restriction save time." ); |
| 191 | 209 | } |
| | 210 | + |
| | 211 | + if( $wgRequest->getCheck( 'mwProtectWatch' ) ) { |
| | 212 | + $this->mArticle->doWatch(); |
| | 213 | + } elseif( $this->mTitle->userIsWatching() ) { |
| | 214 | + $this->mArticle->doUnwatch(); |
| | 215 | + } |
| | 216 | + |
| 192 | 217 | return $ok; |
| 193 | 218 | } |
| 194 | 219 | |
| — | — | @@ -232,13 +257,19 @@ |
| 233 | 258 | $out .= "</tbody>\n"; |
| 234 | 259 | $out .= "</table>\n"; |
| 235 | 260 | |
| | 261 | + $out .= "<table>\n"; |
| | 262 | + $out .= "<tbody>\n"; |
| | 263 | + |
| 236 | 264 | global $wgEnableCascadingProtection; |
| | 265 | + |
| | 266 | + if( $this->mTitle->getNamespace() == NS_IMAGE ) |
| | 267 | + $out .= '<p>' . $this->buildUploadInput() . '</p>'; |
| 237 | 268 | |
| 238 | 269 | if ($wgEnableCascadingProtection) |
| 239 | | - $out .= $this->buildCascadeInput(); |
| | 270 | + $out .= '<tr><td></td><td>' . $this->buildCascadeInput() . "</td></tr>\n"; |
| 240 | 271 | |
| 241 | | - $out .= "<table>\n"; |
| 242 | | - $out .= "<tbody>\n"; |
| | 272 | + if( !$this->disabled ) |
| | 273 | + $out .= '<tr><td></td><td>' . $this->buildWatchInput() . "</td></tr>\n"; |
| 243 | 274 | |
| 244 | 275 | $out .= $this->buildExpiryInput(); |
| 245 | 276 | |
| — | — | @@ -302,6 +333,12 @@ |
| 303 | 334 | 'value' => $this->mReason ) ); |
| 304 | 335 | } |
| 305 | 336 | |
| | 337 | + function buildUploadInput() { |
| | 338 | + $id = 'mwProtect-fileonly'; |
| | 339 | + $ci = wfCheckLabel( wfMsg( 'protect-fileonly' ), $id, $id, $this->mFileOnly, $this->disabledAttrib); |
| | 340 | + return $ci; |
| | 341 | + } |
| | 342 | + |
| 306 | 343 | function buildCascadeInput() { |
| 307 | 344 | $id = 'mwProtect-cascade'; |
| 308 | 345 | $ci = wfCheckLabel( wfMsg( 'protect-cascade' ), $id, $id, $this->mCascade, $this->disabledAttrib); |
| — | — | @@ -309,23 +346,22 @@ |
| 310 | 347 | } |
| 311 | 348 | |
| 312 | 349 | function buildExpiryInput() { |
| 313 | | - $id = 'mwProtect-expiry'; |
| 314 | | - |
| 315 | | - $ci = "<tr> <td align=\"right\">"; |
| 316 | | - $ci .= wfElement( 'label', array ( |
| 317 | | - 'id' => "$id-label", |
| 318 | | - 'for' => $id ), |
| 319 | | - wfMsg( 'protectexpiry' ) ); |
| 320 | | - $ci .= "</td> <td align=\"left\">"; |
| 321 | | - $ci .= wfElement( 'input', array( |
| 322 | | - 'size' => 60, |
| 323 | | - 'name' => $id, |
| 324 | | - 'id' => $id, |
| 325 | | - 'value' => $this->mExpiry ) + $this->disabledAttrib ); |
| 326 | | - $ci .= "</td></tr>"; |
| 327 | | - |
| 328 | | - return $ci; |
| | 350 | + $attribs = array( 'id' => 'expires' ) + $this->disabledAttrib; |
| | 351 | + return '<tr>' |
| | 352 | + . '<td><label for="expires">' . wfMsgWithLinks( 'protectexpiry' ) . '</label></td>' |
| | 353 | + . '<td>' . Xml::input( 'mwProtect-expiry', 60, $this->mExpiry, $attribs ) . '</td>' |
| | 354 | + . '</tr>'; |
| 329 | 355 | } |
| | 356 | + |
| | 357 | + function buildWatchInput() { |
| | 358 | + global $wgUser; |
| | 359 | + return Xml::checkLabel( |
| | 360 | + wfMsg( 'watchthis' ), |
| | 361 | + 'mwProtectWatch', |
| | 362 | + 'mwProtectWatch', |
| | 363 | + $this->mTitle->userIsWatching() || $wgUser->getOption( 'watchdefault' ) |
| | 364 | + ); |
| | 365 | + } |
| 330 | 366 | |
| 331 | 367 | function buildSubmit() { |
| 332 | 368 | return wfElement( 'input', array( |
| — | — | @@ -360,7 +396,7 @@ |
| 361 | 397 | * @access private |
| 362 | 398 | */ |
| 363 | 399 | function showLogExtract( &$out ) { |
| 364 | | - # Show relevant lines from the deletion log: |
| | 400 | + # Show relevant lines from the protection log: |
| 365 | 401 | $out->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'protect' ) ) . "</h2>\n" ); |
| 366 | 402 | $logViewer = new LogViewer( |
| 367 | 403 | new LogReader( |
| Index: branches/phase3_rev_deleted/includes/DifferenceEngine.php |
| — | — | @@ -47,7 +47,7 @@ |
| 48 | 48 | # Show diff between revision $old and the previous one. |
| 49 | 49 | # Get previous one from DB. |
| 50 | 50 | # |
| 51 | | - $this->mNewid = intval($old); |
| | 51 | + $this->mNewid = intval($old); |
| 52 | 52 | |
| 53 | 53 | $this->mOldid = $this->mTitle->getPreviousRevisionID( $this->mNewid ); |
| 54 | 54 | |
| — | — | @@ -63,6 +63,13 @@ |
| 64 | 64 | $this->mNewid = 0; |
| 65 | 65 | } |
| 66 | 66 | |
| | 67 | + } else if( 'cur' === $new ) { |
| | 68 | + # Show diff between revision $old and the current one. |
| | 69 | + # Get previous one from DB. |
| | 70 | + # |
| | 71 | + $this->mNewid = $this->mTitle->getLatestRevID(); |
| | 72 | + |
| | 73 | + $this->mOldid = intval($old); |
| 67 | 74 | } else { |
| 68 | 75 | $this->mOldid = intval($old); |
| 69 | 76 | $this->mNewid = intval($new); |
| — | — | @@ -333,11 +340,22 @@ |
| 334 | 341 | $wgOut->addWikitext( wfMsg( 'missingarticle', "<nowiki>(fixme, bug)</nowiki>" ) ); |
| 335 | 342 | return false; |
| 336 | 343 | } else { |
| 337 | | - $wgOut->addStyle( 'common/diff.css' ); |
| | 344 | + $this->showDiffStyle(); |
| 338 | 345 | $wgOut->addHTML( $diff ); |
| 339 | 346 | return true; |
| 340 | 347 | } |
| 341 | 348 | } |
| | 349 | + |
| | 350 | + /** |
| | 351 | + * Add style sheets and supporting JS for diff display. |
| | 352 | + */ |
| | 353 | + function showDiffStyle() { |
| | 354 | + global $wgStylePath, $wgStyleVersion, $wgOut; |
| | 355 | + $wgOut->addStyle( 'common/diff.css' ); |
| | 356 | + |
| | 357 | + // JS is needed to detect old versions of Mozilla to work around an annoyance bug. |
| | 358 | + $wgOut->addScript( "<script type=\"text/javascript\" src=\"$wgStylePath/common/diff.js?$wgStyleVersion\"></script>" ); |
| | 359 | + } |
| 342 | 360 | |
| 343 | 361 | /** |
| 344 | 362 | * Get diff table, including header |
| — | — | @@ -588,6 +606,8 @@ |
| 589 | 607 | if( is_null( $this->mNewRev ) ) { |
| 590 | 608 | return false; |
| 591 | 609 | } |
| | 610 | + |
| | 611 | + $this->mNewid = $this->mNewRev->getId(); // Make this explicit, for undo links |
| 592 | 612 | |
| 593 | 613 | // Set assorted variables |
| 594 | 614 | $timestamp = $wgLang->timeanddate( $this->mNewRev->getTimestamp(), true ); |
| Index: branches/phase3_rev_deleted/includes/DatabasePostgres.php |
| — | — | @@ -601,13 +601,9 @@ |
| 602 | 602 | if ( !$res ) { |
| 603 | 603 | return NULL; |
| 604 | 604 | } |
| 605 | | - |
| 606 | 605 | while ( $row = $this->fetchObject( $res ) ) { |
| 607 | 606 | if ( $row->indexname == $index ) { |
| 608 | 607 | return $row; |
| 609 | | - |
| 610 | | - // BUG: !!!! This code needs to be synced up with database.php |
| 611 | | - |
| 612 | 608 | } |
| 613 | 609 | } |
| 614 | 610 | return false; |
| — | — | @@ -923,7 +919,7 @@ |
| 924 | 920 | $count = $res ? pg_num_rows($res) : 0; |
| 925 | 921 | if ($res) |
| 926 | 922 | $this->freeResult( $res ); |
| 927 | | - return $count; |
| | 923 | + return $count ? true : false; |
| 928 | 924 | } |
| 929 | 925 | |
| 930 | 926 | /* |
| — | — | @@ -1102,10 +1098,10 @@ |
| 1103 | 1099 | $this->doQuery("COMMIT"); |
| 1104 | 1100 | } |
| 1105 | 1101 | |
| 1106 | | - function encodeBlob($b) { |
| | 1102 | + function encodeBlob( $b ) { |
| 1107 | 1103 | return array('bytea',pg_escape_bytea($b)); |
| 1108 | 1104 | } |
| 1109 | | - function decodeBlob($b) { |
| | 1105 | + function decodeBlob( $b ) { |
| 1110 | 1106 | return pg_unescape_bytea( $b ); |
| 1111 | 1107 | } |
| 1112 | 1108 | |
| — | — | @@ -1177,8 +1173,17 @@ |
| 1178 | 1174 | wfDebug( "Function ping() not written for DatabasePostgres.php yet"); |
| 1179 | 1175 | return true; |
| 1180 | 1176 | } |
| | 1177 | + |
| | 1178 | + /** |
| | 1179 | + * How lagged is this slave? |
| | 1180 | + * |
| | 1181 | + * @return int |
| | 1182 | + */ |
| | 1183 | + public function getLag() { |
| | 1184 | + # Not implemented for PostgreSQL |
| | 1185 | + return 0; |
| | 1186 | + } |
| 1181 | 1187 | |
| 1182 | | - |
| 1183 | 1188 | } // end DatabasePostgres class |
| 1184 | 1189 | |
| 1185 | 1190 | ?> |
| Index: branches/phase3_rev_deleted/includes/SkinTemplate.php |
| — | — | @@ -440,7 +440,8 @@ |
| 441 | 441 | // XXX: attach this from javascript, same with section editing |
| 442 | 442 | if($this->iseditable && $wgUser->getOption("editondblclick") ) |
| 443 | 443 | { |
| 444 | | - $tpl->set('body_ondblclick', 'document.location = "' .$content_actions['edit']['href'] .'";'); |
| | 444 | + $encEditUrl = wfEscapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) ); |
| | 445 | + $tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";'); |
| 445 | 446 | } else { |
| 446 | 447 | $tpl->set('body_ondblclick', false); |
| 447 | 448 | } |
| Index: branches/phase3_rev_deleted/includes/SpecialConfirmemail.php |
| — | — | @@ -1,31 +1,30 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | | - * Main execution point |
| 6 | | - * |
| 7 | | - * @param $par Parameters passed to the page |
| 8 | | - */ |
| 9 | | -function wfSpecialConfirmemail( $par ) { |
| 10 | | - $form = new EmailConfirmation(); |
| 11 | | - $form->execute( $par ); |
| 12 | | -} |
| 13 | | - |
| 14 | | -/** |
| 15 | 5 | * Special page allows users to request email confirmation message, and handles |
| 16 | 6 | * processing of the confirmation code when the link in the email is followed |
| 17 | 7 | * |
| 18 | 8 | * @addtogroup SpecialPage |
| | 9 | + * @author Brion Vibber |
| 19 | 10 | * @author Rob Church <robchur@gmail.com> |
| 20 | 11 | */ |
| 21 | | -class EmailConfirmation extends SpecialPage { |
| | 12 | +class EmailConfirmation extends UnlistedSpecialPage { |
| 22 | 13 | |
| 23 | 14 | /** |
| | 15 | + * Constructor |
| | 16 | + */ |
| | 17 | + public function __construct() { |
| | 18 | + parent::__construct( 'Confirmemail' ); |
| | 19 | + } |
| | 20 | + |
| | 21 | + /** |
| 24 | 22 | * Main execution point |
| 25 | 23 | * |
| 26 | 24 | * @param $code Confirmation code passed to the page |
| 27 | 25 | */ |
| 28 | 26 | function execute( $code ) { |
| 29 | 27 | global $wgUser, $wgOut; |
| | 28 | + $this->setHeaders(); |
| 30 | 29 | if( empty( $code ) ) { |
| 31 | 30 | if( $wgUser->isLoggedIn() ) { |
| 32 | 31 | if( User::isValidEmailAddr( $wgUser->getEmail() ) ) { |
| Index: branches/phase3_rev_deleted/includes/SpecialSearch.php |
| — | — | @@ -185,6 +185,7 @@ |
| 186 | 186 | } else { |
| 187 | 187 | $wgOut->addWikiText( '==' . wfMsg( 'notitlematches' ) . "==\n" ); |
| 188 | 188 | } |
| | 189 | + $titleMatches->free(); |
| 189 | 190 | } |
| 190 | 191 | |
| 191 | 192 | if( $textMatches ) { |
| — | — | @@ -195,6 +196,7 @@ |
| 196 | 197 | # Don't show the 'no text matches' if we received title matches |
| 197 | 198 | $wgOut->addWikiText( '==' . wfMsg( 'notextmatches' ) . "==\n" ); |
| 198 | 199 | } |
| | 200 | + $textMatches->free(); |
| 199 | 201 | } |
| 200 | 202 | |
| 201 | 203 | if ( $num == 0 ) { |
| Index: branches/phase3_rev_deleted/includes/Linker.php |
| — | — | @@ -437,6 +437,7 @@ |
| 438 | 438 | * @param boolean $thumb shows image as thumbnail in a frame |
| 439 | 439 | * @param string $manual_thumb image name for the manual thumbnail |
| 440 | 440 | * @param string $valign vertical alignment: baseline, sub, super, top, text-top, middle, bottom, text-bottom |
| | 441 | + * @param string $timestamp: revision time |
| 441 | 442 | * @return string |
| 442 | 443 | */ |
| 443 | 444 | function makeImageLinkObj( $nt, $label, $alt, $align = '', $params = array(), $framed = false, |
| — | — | @@ -627,34 +628,38 @@ |
| 628 | 629 | } |
| 629 | 630 | |
| 630 | 631 | /** |
| 631 | | - * Pass a title object, not a title string |
| | 632 | + * Make a "broken" link to an image |
| | 633 | + * |
| | 634 | + * @param Title $title Image title |
| | 635 | + * @param string $text Link label |
| | 636 | + * @param string $query Query string |
| | 637 | + * @param string $trail Link trail |
| | 638 | + * @param string $prefix Link prefix |
| | 639 | + * @return string |
| 632 | 640 | */ |
| 633 | | - function makeBrokenImageLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) { |
| 634 | | - # Fail gracefully |
| 635 | | - if ( ! isset($nt) ) { |
| 636 | | - # throw new MWException(); |
| | 641 | + public function makeBrokenImageLinkObj( $title, $text = '', $query = '', $trail = '', $prefix = '' ) { |
| | 642 | + global $wgEnableUploads; |
| | 643 | + if( $title instanceof Title ) { |
| | 644 | + wfProfileIn( __METHOD__ ); |
| | 645 | + if( $wgEnableUploads ) { |
| | 646 | + $upload = SpecialPage::getTitleFor( 'Upload' ); |
| | 647 | + if( $text == '' ) |
| | 648 | + $text = htmlspecialchars( $title->getPrefixedText() ); |
| | 649 | + $q = 'wpDestFile=' . $title->getPartialUrl(); |
| | 650 | + if( $query != '' ) |
| | 651 | + $q .= '&' . $query; |
| | 652 | + list( $inside, $trail ) = self::splitTrail( $trail ); |
| | 653 | + $style = $this->getInternalLinkAttributesObj( $title, $text, 'yes' ); |
| | 654 | + wfProfileOut( __METHOD__ ); |
| | 655 | + return '<a href="' . $upload->escapeLocalUrl( $q ) . '"' |
| | 656 | + . $style . '>' . $prefix . $text . $inside . '</a>' . $trail; |
| | 657 | + } else { |
| | 658 | + wfProfileOut( __METHOD__ ); |
| | 659 | + return $this->makeKnownLinkObj( $title, $text, $query, $trail, $prefix ); |
| | 660 | + } |
| | 661 | + } else { |
| 637 | 662 | return "<!-- ERROR -->{$prefix}{$text}{$trail}"; |
| 638 | 663 | } |
| 639 | | - |
| 640 | | - $fname = 'Linker::makeBrokenImageLinkObj'; |
| 641 | | - wfProfileIn( $fname ); |
| 642 | | - |
| 643 | | - $q = 'wpDestFile=' . urlencode( $nt->getDBkey() ); |
| 644 | | - if ( '' != $query ) { |
| 645 | | - $q .= "&$query"; |
| 646 | | - } |
| 647 | | - $uploadTitle = SpecialPage::getTitleFor( 'Upload' ); |
| 648 | | - $url = $uploadTitle->escapeLocalURL( $q ); |
| 649 | | - |
| 650 | | - if ( '' == $text ) { |
| 651 | | - $text = htmlspecialchars( $nt->getPrefixedText() ); |
| 652 | | - } |
| 653 | | - $style = $this->getInternalLinkAttributesObj( $nt, $text, "yes" ); |
| 654 | | - list( $inside, $trail ) = Linker::splitTrail( $trail ); |
| 655 | | - $s = "<a href=\"{$url}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}"; |
| 656 | | - |
| 657 | | - wfProfileOut( $fname ); |
| 658 | | - return $s; |
| 659 | 664 | } |
| 660 | 665 | |
| 661 | 666 | /** @deprecated use Linker::makeMediaLinkObj() */ |
| — | — | @@ -684,7 +689,7 @@ |
| 685 | 690 | $class = 'internal'; |
| 686 | 691 | } else { |
| 687 | 692 | $upload = SpecialPage::getTitleFor( 'Upload' ); |
| 688 | | - $url = $upload->getLocalUrl( 'wpDestFile=' . urlencode( $title->getText() ) ); |
| | 693 | + $url = $upload->getLocalUrl( 'wpDestFile=' . urlencode( $title->getDbKey() ) ); |
| 689 | 694 | $class = 'new'; |
| 690 | 695 | } |
| 691 | 696 | $alt = htmlspecialchars( $title->getText() ); |
| — | — | @@ -855,26 +860,6 @@ |
| 856 | 861 | } |
| 857 | 862 | |
| 858 | 863 | /** |
| 859 | | - * Generate a user link if the current user is allowed to view it |
| 860 | | - * @param File $file |
| 861 | | - * @param $isPublic, bool, show only if all users can see it |
| 862 | | - * @return string HTML |
| 863 | | - */ |
| 864 | | - function fileUserLink( $file, $isPublic = false ) { |
| 865 | | - if( $file->isDeleted( File::DELETED_USER ) && $isPublic ) { |
| 866 | | - $link = wfMsgHtml( 'rev-deleted-user' ); |
| 867 | | - } else if( $file->userCan( File::DELETED_USER ) ) { |
| 868 | | - $link = $this->userLink( $file->user, $file->userText ); |
| 869 | | - } else { |
| 870 | | - $link = wfMsgHtml( 'rev-deleted-user' ); |
| 871 | | - } |
| 872 | | - if( $file->isDeleted( File::DELETED_USER ) ) { |
| 873 | | - return '<span class="history-deleted">' . $link . '</span>'; |
| 874 | | - } |
| 875 | | - return $link; |
| 876 | | - } |
| 877 | | - |
| 878 | | - /** |
| 879 | 864 | * Generate a user tool link cluster if the current user is allowed to view it |
| 880 | 865 | * @param $rev Revision object. |
| 881 | 866 | * @param $isPublic, bool, show only if all users can see it |
| — | — | @@ -921,27 +906,6 @@ |
| 922 | 907 | } |
| 923 | 908 | return $link; |
| 924 | 909 | } |
| 925 | | - |
| 926 | | - /** |
| 927 | | - * Generate a user tool link cluster if the current user is allowed to view it |
| 928 | | - * @param File $file |
| 929 | | - * @param $isPublic, bool, show only if all users can see it |
| 930 | | - * @return string HTML |
| 931 | | - */ |
| 932 | | - function fileUserTools( $file, $isPublic = false ) { |
| 933 | | - if( $file->isDeleted( Revision::DELETED_USER ) && $isPublic ) { |
| 934 | | - $link = wfMsgHtml( 'rev-deleted-user' ); |
| 935 | | - } else if( $file->userCan( Revision::DELETED_USER ) ) { |
| 936 | | - $link = $this->userLink( $file->user, $file->userText ) . |
| 937 | | - $this->userToolLinks( $file->user, $file->userText ); |
| 938 | | - } else { |
| 939 | | - $link = wfMsgHtml( 'rev-deleted-user' ); |
| 940 | | - } |
| 941 | | - if( $file->isDeleted( Revision::DELETED_USER ) ) { |
| 942 | | - return '<span class="history-deleted">' . $link . '</span>'; |
| 943 | | - } |
| 944 | | - return $link; |
| 945 | | - } |
| 946 | 910 | |
| 947 | 911 | /** |
| 948 | 912 | * This function is called by all recent changes variants, by the page history, |
| — | — | @@ -1024,12 +988,13 @@ |
| 1025 | 989 | } |
| 1026 | 990 | |
| 1027 | 991 | /** |
| 1028 | | - * Format regular and media links - all other wiki formatting is ignored |
| 1029 | | - * Called by Linker::formatComment. |
| 1030 | | - * @param $comment The comment text. |
| 1031 | | - * @return Comment text with links using HTML. |
| | 992 | + * Formats wiki links and media links in text; all other wiki formatting |
| | 993 | + * is ignored |
| | 994 | + * |
| | 995 | + * @param string $comment Text to format links in |
| | 996 | + * @return string |
| 1032 | 997 | */ |
| 1033 | | - private function formatLinksInComment( $comment ) { |
| | 998 | + public function formatLinksInComment( $comment ) { |
| 1034 | 999 | global $wgContLang; |
| 1035 | 1000 | |
| 1036 | 1001 | $medians = '(?:' . preg_quote( Namespace::getCanonicalName( NS_MEDIA ), '/' ) . '|'; |
| — | — | @@ -1131,27 +1096,6 @@ |
| 1132 | 1097 | return $block; |
| 1133 | 1098 | } |
| 1134 | 1099 | |
| 1135 | | - /** |
| 1136 | | - * Wrap and format the given file's comment block, if the current |
| 1137 | | - * user is allowed to view it. |
| 1138 | | - * |
| 1139 | | - * @param File $file |
| 1140 | | - * @return string HTML |
| 1141 | | - */ |
| 1142 | | - function fileComment( $file, $isPublic = false ) { |
| 1143 | | - if( $file->isDeleted( File::DELETED_COMMENT ) && $isPublic ) { |
| 1144 | | - $block = ' ' . wfMsgHtml( 'rev-deleted-comment' ); |
| 1145 | | - } else if( $file->userCan( File::DELETED_COMMENT ) ) { |
| 1146 | | - $block = $this->commentBlock( $file->description ); |
| 1147 | | - } else { |
| 1148 | | - $block = ' ' . wfMsgHtml( 'rev-deleted-comment' ); |
| 1149 | | - } |
| 1150 | | - if( $file->isDeleted( File::DELETED_COMMENT ) ) { |
| 1151 | | - return "<span class=\"history-deleted\">$block</span>"; |
| 1152 | | - } |
| 1153 | | - return $block; |
| 1154 | | - } |
| 1155 | | - |
| 1156 | 1100 | /** @todo document */ |
| 1157 | 1101 | function tocIndent() { |
| 1158 | 1102 | return "\n<ul>"; |
| — | — | @@ -1200,13 +1144,14 @@ |
| 1201 | 1145 | /** @todo document */ |
| 1202 | 1146 | public function editSectionLinkForOther( $title, $section ) { |
| 1203 | 1147 | global $wgContLang; |
| 1204 | | - |
| 1205 | 1148 | $title = Title::newFromText( $title ); |
| 1206 | 1149 | $editurl = '§ion='.$section; |
| 1207 | 1150 | $url = $this->makeKnownLinkObj( $title, wfMsg('editsection'), 'action=edit'.$editurl ); |
| 1208 | | - |
| 1209 | | - return "<span class=\"editsection\">[".$url."]</span>"; |
| 1210 | | - |
| | 1151 | + $result = null; |
| | 1152 | + wfRunHooks( 'EditSectionLinkForOther', array( &$this, $title, $section, $url, &$result ) ); |
| | 1153 | + return is_null( $result ) |
| | 1154 | + ? "<span class=\"editsection\">[{$url}]</span>" |
| | 1155 | + : "<span class=\"editsection\">[{$result}]</span>"; |
| 1211 | 1156 | } |
| 1212 | 1157 | |
| 1213 | 1158 | /** |
| — | — | @@ -1216,12 +1161,14 @@ |
| 1217 | 1162 | */ |
| 1218 | 1163 | public function editSectionLink( $nt, $section, $hint='' ) { |
| 1219 | 1164 | global $wgContLang; |
| 1220 | | - |
| 1221 | 1165 | $editurl = '§ion='.$section; |
| 1222 | 1166 | $hint = ( $hint=='' ) ? '' : ' title="' . wfMsgHtml( 'editsectionhint', htmlspecialchars( $hint ) ) . '"'; |
| 1223 | 1167 | $url = $this->makeKnownLinkObj( $nt, wfMsg('editsection'), 'action=edit'.$editurl, '', '', '', $hint ); |
| 1224 | | - |
| 1225 | | - return "<span class=\"editsection\">[".$url."]</span>"; |
| | 1168 | + $result = null; |
| | 1169 | + wfRunHooks( 'EditSectionLink', array( &$this, $nt, $section, $hint, $url, &$result ) ); |
| | 1170 | + return is_null( $result ) |
| | 1171 | + ? "<span class=\"editsection\">[{$url}]</span>" |
| | 1172 | + : "<span class=\"editsection\">[{$result}]</span>"; |
| 1226 | 1173 | } |
| 1227 | 1174 | |
| 1228 | 1175 | /** |
| Index: branches/phase3_rev_deleted/includes/Parser.php |
| — | — | @@ -2431,17 +2431,17 @@ |
| 2432 | 2432 | |
| 2433 | 2433 | switch ( $index ) { |
| 2434 | 2434 | case 'currentmonth': |
| 2435 | | - return $varCache[$index] = $wgContLang->formatNum( date( 'm', $ts ) ); |
| | 2435 | + return $varCache[$index] = $wgContLang->formatNum( gmdate( 'm', $ts ) ); |
| 2436 | 2436 | case 'currentmonthname': |
| 2437 | | - return $varCache[$index] = $wgContLang->getMonthName( date( 'n', $ts ) ); |
| | 2437 | + return $varCache[$index] = $wgContLang->getMonthName( gmdate( 'n', $ts ) ); |
| 2438 | 2438 | case 'currentmonthnamegen': |
| 2439 | | - return $varCache[$index] = $wgContLang->getMonthNameGen( date( 'n', $ts ) ); |
| | 2439 | + return $varCache[$index] = $wgContLang->getMonthNameGen( gmdate( 'n', $ts ) ); |
| 2440 | 2440 | case 'currentmonthabbrev': |
| 2441 | | - return $varCache[$index] = $wgContLang->getMonthAbbreviation( date( 'n', $ts ) ); |
| | 2441 | + return $varCache[$index] = $wgContLang->getMonthAbbreviation( gmdate( 'n', $ts ) ); |
| 2442 | 2442 | case 'currentday': |
| 2443 | | - return $varCache[$index] = $wgContLang->formatNum( date( 'j', $ts ) ); |
| | 2443 | + return $varCache[$index] = $wgContLang->formatNum( gmdate( 'j', $ts ) ); |
| 2444 | 2444 | case 'currentday2': |
| 2445 | | - return $varCache[$index] = $wgContLang->formatNum( date( 'd', $ts ) ); |
| | 2445 | + return $varCache[$index] = $wgContLang->formatNum( gmdate( 'd', $ts ) ); |
| 2446 | 2446 | case 'localmonth': |
| 2447 | 2447 | return $varCache[$index] = $wgContLang->formatNum( $localMonth ); |
| 2448 | 2448 | case 'localmonthname': |
| — | — | @@ -2515,19 +2515,19 @@ |
| 2516 | 2516 | case 'subjectspacee': |
| 2517 | 2517 | return( wfUrlencode( $this->mTitle->getSubjectNsText() ) ); |
| 2518 | 2518 | case 'currentdayname': |
| 2519 | | - return $varCache[$index] = $wgContLang->getWeekdayName( date( 'w', $ts ) + 1 ); |
| | 2519 | + return $varCache[$index] = $wgContLang->getWeekdayName( gmdate( 'w', $ts ) + 1 ); |
| 2520 | 2520 | case 'currentyear': |
| 2521 | | - return $varCache[$index] = $wgContLang->formatNum( date( 'Y', $ts ), true ); |
| | 2521 | + return $varCache[$index] = $wgContLang->formatNum( gmdate( 'Y', $ts ), true ); |
| 2522 | 2522 | case 'currenttime': |
| 2523 | 2523 | return $varCache[$index] = $wgContLang->time( wfTimestamp( TS_MW, $ts ), false, false ); |
| 2524 | 2524 | case 'currenthour': |
| 2525 | | - return $varCache[$index] = $wgContLang->formatNum( date( 'H', $ts ), true ); |
| | 2525 | + return $varCache[$index] = $wgContLang->formatNum( gmdate( 'H', $ts ), true ); |
| 2526 | 2526 | case 'currentweek': |
| 2527 | 2527 | // @bug 4594 PHP5 has it zero padded, PHP4 does not, cast to |
| 2528 | 2528 | // int to remove the padding |
| 2529 | | - return $varCache[$index] = $wgContLang->formatNum( (int)date( 'W', $ts ) ); |
| | 2529 | + return $varCache[$index] = $wgContLang->formatNum( (int)gmdate( 'W', $ts ) ); |
| 2530 | 2530 | case 'currentdow': |
| 2531 | | - return $varCache[$index] = $wgContLang->formatNum( date( 'w', $ts ) ); |
| | 2531 | + return $varCache[$index] = $wgContLang->formatNum( gmdate( 'w', $ts ) ); |
| 2532 | 2532 | case 'localdayname': |
| 2533 | 2533 | return $varCache[$index] = $wgContLang->getWeekdayName( $localDayOfWeek + 1 ); |
| 2534 | 2534 | case 'localyear': |
| — | — | @@ -3277,7 +3277,7 @@ |
| 3278 | 3278 | |
| 3279 | 3279 | if( $skip ) { |
| 3280 | 3280 | $text = false; |
| 3281 | | - $this->mOutput->addTemplate( $title, $title->getArticleID(), 0 ); |
| | 3281 | + $this->mOutput->addTemplate( $title, $title->getArticleID(), null ); |
| 3282 | 3282 | break; |
| 3283 | 3283 | } |
| 3284 | 3284 | $rev = $id ? Revision::newFromId( $id ) : Revision::newFromTitle( $title ); |
| — | — | @@ -3405,7 +3405,13 @@ |
| 3406 | 3406 | } |
| 3407 | 3407 | |
| 3408 | 3408 | /** |
| 3409 | | - * Detect __TOC__ magic word and set a placeholder |
| | 3409 | + * Find the first __TOC__ magic word and set a <!--MWTOC--> |
| | 3410 | + * placeholder that will then be replaced by the real TOC in |
| | 3411 | + * ->formatHeadings, this works because at this points real |
| | 3412 | + * comments will have already been discarded by the sanitizer. |
| | 3413 | + * |
| | 3414 | + * Any additional __TOC__ magic words left over will be discarded |
| | 3415 | + * as there can only be one TOC on the page. |
| 3410 | 3416 | */ |
| 3411 | 3417 | function stripToc( $text ) { |
| 3412 | 3418 | # if the string __NOTOC__ (not case-sensitive) occurs in the HTML, |
| — | — | @@ -3797,11 +3803,16 @@ |
| 3798 | 3804 | * @private |
| 3799 | 3805 | */ |
| 3800 | 3806 | function getUserSig( &$user ) { |
| | 3807 | + global $wgMaxSigChars; |
| | 3808 | + |
| 3801 | 3809 | $username = $user->getName(); |
| 3802 | 3810 | $nickname = $user->getOption( 'nickname' ); |
| 3803 | 3811 | $nickname = $nickname === '' ? $username : $nickname; |
| 3804 | | - |
| 3805 | | - if( $user->getBoolOption( 'fancysig' ) !== false ) { |
| | 3812 | + |
| | 3813 | + if( strlen( $nickname ) > $wgMaxSigChars ) { |
| | 3814 | + $nickname = $username; |
| | 3815 | + wfDebug( __METHOD__ . ": $username has overlong signature.\n" ); |
| | 3816 | + } elseif( $user->getBoolOption( 'fancysig' ) !== false ) { |
| 3806 | 3817 | # Sig. might contain markup; validate this |
| 3807 | 3818 | if( $this->validateSig( $nickname ) !== false ) { |
| 3808 | 3819 | # Validated; clean up (if needed) and return it |
| — | — | @@ -4379,7 +4390,7 @@ |
| 4380 | 4391 | $ig->setHeights( $params['heights'] ); |
| 4381 | 4392 | } |
| 4382 | 4393 | |
| 4383 | | - wfRunHooks( 'parserBeforerenderImageGallery', array( &$this, &$ig ) ); |
| | 4394 | + wfRunHooks( 'BeforeParserrenderImageGallery', array( &$this, &$ig ) ); |
| 4384 | 4395 | |
| 4385 | 4396 | $lines = explode( "\n", $text ); |
| 4386 | 4397 | foreach ( $lines as $line ) { |
| — | — | @@ -4529,7 +4540,7 @@ |
| 4530 | 4541 | $alt = Sanitizer::stripAllTags( $alt ); |
| 4531 | 4542 | |
| 4532 | 4543 | # Give extensions a chance to select the file revision for us |
| 4533 | | - $link = $skip = $time = false; |
| | 4544 | + $skip = $time = false; |
| 4534 | 4545 | wfRunHooks( 'BeforeParserMakeImageLinkObj', array( &$this, &$nt, &$skip, &$time ) ); |
| 4535 | 4546 | |
| 4536 | 4547 | # Linker does the rest |
| Index: branches/phase3_rev_deleted/includes/Skin.php |
| — | — | @@ -300,7 +300,7 @@ |
| 301 | 301 | |
| 302 | 302 | $ns = $wgTitle->getNamespace(); |
| 303 | 303 | $nsname = isset( $wgCanonicalNamespaceNames[ $ns ] ) ? $wgCanonicalNamespaceNames[ $ns ] : $wgTitle->getNsText(); |
| 304 | | - |
| | 304 | + |
| 305 | 305 | $vars = array( |
| 306 | 306 | 'skin' => $data['skinname'], |
| 307 | 307 | 'stylepath' => $wgStylePath, |
| — | — | @@ -313,6 +313,8 @@ |
| 314 | 314 | 'wgPageName' => $wgTitle->getPrefixedDBKey(), |
| 315 | 315 | 'wgTitle' => $wgTitle->getText(), |
| 316 | 316 | 'wgAction' => $wgRequest->getText( 'action', 'view' ), |
| | 317 | + 'wgRestrictionEdit' => $wgTitle->getRestrictions( 'edit' ), |
| | 318 | + 'wgRestrictionMove' => $wgTitle->getRestrictions( 'move' ), |
| 317 | 319 | 'wgArticleId' => $wgTitle->getArticleId(), |
| 318 | 320 | 'wgIsArticle' => $wgOut->isArticle(), |
| 319 | 321 | 'wgUserName' => $wgUser->isAnon() ? NULL : $wgUser->getName(), |
| — | — | @@ -386,7 +388,8 @@ |
| 387 | 389 | function getUserStylesheet() { |
| 388 | 390 | global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion; |
| 389 | 391 | $sheet = $this->getStylesheet(); |
| 390 | | - $s = "@import \"$wgStylePath/common/common.css?$wgStyleVersion\";\n"; |
| | 392 | + $s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n"; |
| | 393 | + $s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n"; |
| 391 | 394 | $s .= "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n"; |
| 392 | 395 | if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\n"; |
| 393 | 396 | |
| Index: branches/phase3_rev_deleted/includes/ChangesList.php |
| — | — | @@ -557,7 +557,7 @@ |
| 558 | 558 | $r .= ' '.$this->recentChangesFlags( $isnew, false, $unpatrolled, ' ', $bot ); |
| 559 | 559 | |
| 560 | 560 | # Timestamp |
| 561 | | - $r .= ' '.$block[0]->timestamp.' </td><td>'; |
| | 561 | + $r .= ' '.$block[0]->timestamp.' </td><td>'; |
| 562 | 562 | |
| 563 | 563 | # Article link |
| 564 | 564 | if ( $namehidden ) |
| Index: branches/phase3_rev_deleted/includes/SpecialUndelete.php |
| — | — | @@ -532,8 +532,8 @@ |
| 533 | 533 | $this->mTargetObj = NULL; |
| 534 | 534 | } |
| 535 | 535 | if( $this->mRestore ) { |
| 536 | | - $this->mFileTimestamp = $request->getInt('imgrestorepoint'); |
| 537 | | - $this->mPageTimestamp = $request->getInt('restorepoint'); |
| | 536 | + $this->mFileTimestamp = $request->getVal('imgrestorepoint'); |
| | 537 | + $this->mPageTimestamp = $request->getVal('restorepoint'); |
| 538 | 538 | } |
| 539 | 539 | $this->preCacheMessages(); |
| 540 | 540 | } |
| — | — | @@ -811,6 +811,8 @@ |
| 812 | 812 | } else { |
| 813 | 813 | $wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) ); |
| 814 | 814 | } |
| | 815 | + |
| | 816 | + $wgOut->addWikiText( wfMsgHtml( 'undeletepagetitle', $this->mTargetObj->getPrefixedText()) ); |
| 815 | 817 | |
| 816 | 818 | $archive = new PageArchive( $this->mTargetObj ); |
| 817 | 819 | |
| — | — | @@ -847,24 +849,6 @@ |
| 848 | 850 | $wgOut->addHtml( $top ); |
| 849 | 851 | } |
| 850 | 852 | |
| 851 | | - # Show relevant lines from the deletion log: |
| 852 | | - $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" ); |
| 853 | | - $logViewer = new LogViewer( |
| 854 | | - new LogReader( |
| 855 | | - new FauxRequest( |
| 856 | | - array( 'page' => $this->mTargetObj->getPrefixedText(), |
| 857 | | - 'type' => 'delete' ) ) ) ); |
| 858 | | - $logViewer->showList( $wgOut ); |
| 859 | | - # Show relevant lines from the oversight log if user is allowed to see it: |
| 860 | | - if( $wgUser->isAllowed( 'oversight' ) ) { |
| 861 | | - $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'oversight' ) ) . "</h2>\n" ); |
| 862 | | - $logViewer = new LogViewer( |
| 863 | | - new LogReader( |
| 864 | | - new FauxRequest( |
| 865 | | - array( 'page' => $this->mTargetObj->getPrefixedText(), |
| 866 | | - 'type' => 'oversight' ) ) ) ); |
| 867 | | - $logViewer->showList( $wgOut ); |
| 868 | | - } |
| 869 | 853 | if( $this->mAllowed && ( $haveRevisions || $haveFiles ) ) { |
| 870 | 854 | # Format the user-visible controls (comment field, submission button) |
| 871 | 855 | # in a nice little table |
| — | — | @@ -945,6 +929,25 @@ |
| 946 | 930 | $wgOut->addHTML( "</ul>" ); |
| 947 | 931 | } |
| 948 | 932 | |
| | 933 | + # Show relevant lines from the deletion log: |
| | 934 | + $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" ); |
| | 935 | + $logViewer = new LogViewer( |
| | 936 | + new LogReader( |
| | 937 | + new FauxRequest( |
| | 938 | + array( 'page' => $this->mTargetObj->getPrefixedText(), |
| | 939 | + 'type' => 'delete' ) ) ) ); |
| | 940 | + $logViewer->showList( $wgOut ); |
| | 941 | + # Show relevant lines from the oversight log if user is allowed to see it: |
| | 942 | + if( $wgUser->isAllowed( 'oversight' ) ) { |
| | 943 | + $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'oversight' ) ) . "</h2>\n" ); |
| | 944 | + $logViewer = new LogViewer( |
| | 945 | + new LogReader( |
| | 946 | + new FauxRequest( |
| | 947 | + array( 'page' => $this->mTargetObj->getPrefixedText(), |
| | 948 | + 'type' => 'oversight' ) ) ) ); |
| | 949 | + $logViewer->showList( $wgOut ); |
| | 950 | + } |
| | 951 | + |
| 949 | 952 | if( $this->mAllowed ) { |
| 950 | 953 | # Slip in the hidden controls here |
| 951 | 954 | $misc = wfHidden( 'target', $this->mTarget ); |
| — | — | @@ -1193,9 +1196,10 @@ |
| 1194 | 1197 | # Give some pointers to make (last) links |
| 1195 | 1198 | $this->mForm->prevId = array(); |
| 1196 | 1199 | while( $row = $this->mResult->fetchObject() ) { |
| 1197 | | - $rev_id = isset($rev_id) ? $rev_id : $row->ar_rev_id; |
| 1198 | 1200 | $batch->addObj( Title::makeTitleSafe( NS_USER, $row->ar_user_text ) ); |
| 1199 | 1201 | $batch->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->ar_user_text ) ); |
| | 1202 | + |
| | 1203 | + $rev_id = isset($rev_id) ? $rev_id : $row->ar_rev_id; |
| 1200 | 1204 | if( $rev_id > $row->ar_rev_id ) |
| 1201 | 1205 | $this->mForm->prevId[$rev_id] = $row->ar_rev_id; |
| 1202 | 1206 | else if( $rev_id < $row->ar_rev_id ) |
| Index: branches/phase3_rev_deleted/includes/SpecialNewpages.php |
| — | — | @@ -36,12 +36,19 @@ |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| | 40 | + private function makeNamespaceWhere() { |
| | 41 | + return $this->namespace !== 'all' |
| | 42 | + ? ' AND rc_namespace = ' . intval( $this->namespace ) |
| | 43 | + : ''; |
| | 44 | + } |
| | 45 | + |
| 40 | 46 | function getSQL() { |
| 41 | 47 | global $wgUser, $wgUseRCPatrol; |
| 42 | 48 | $usepatrol = ( $wgUseRCPatrol && $wgUser->isAllowed( 'patrol' ) ) ? 1 : 0; |
| 43 | 49 | $dbr = wfGetDB( DB_SLAVE ); |
| 44 | 50 | list( $recentchanges, $page ) = $dbr->tableNamesN( 'recentchanges', 'page' ); |
| 45 | 51 | |
| | 52 | + $nsfilter = $this->makeNamespaceWhere(); |
| 46 | 53 | $uwhere = $this->makeUserWhere( $dbr ); |
| 47 | 54 | |
| 48 | 55 | # FIXME: text will break with compression |
| — | — | @@ -62,7 +69,8 @@ |
| 63 | 70 | page_latest as rev_id |
| 64 | 71 | FROM $recentchanges,$page |
| 65 | 72 | WHERE rc_cur_id=page_id AND rc_new=1 |
| 66 | | - AND rc_namespace=" . $this->namespace . " AND page_is_redirect=0 |
| | 73 | + {$nsfilter} |
| | 74 | + AND page_is_redirect = 0 |
| 67 | 75 | {$uwhere}"; |
| 68 | 76 | } |
| 69 | 77 | |
| — | — | @@ -134,7 +142,7 @@ |
| 135 | 143 | $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) ); |
| 136 | 144 | # Namespace selector |
| 137 | 145 | $form .= '<table><tr><td align="right">' . Xml::label( wfMsg( 'namespace' ), 'namespace' ) . '</td>'; |
| 138 | | - $form .= '<td>' . Xml::namespaceSelector( $this->namespace ) . '</td></tr>'; |
| | 146 | + $form .= '<td>' . Xml::namespaceSelector( $this->namespace, 'all' ) . '</td></tr>'; |
| 139 | 147 | # Username filter |
| 140 | 148 | $form .= '<tr><td align="right">' . Xml::label( wfMsg( 'newpages-username' ), 'mw-np-username' ) . '</td>'; |
| 141 | 149 | $form .= '<td>' . Xml::input( 'username', 30, $this->username, array( 'id' => 'mw-np-username' ) ) . '</td></tr>'; |
| — | — | @@ -186,7 +194,7 @@ |
| 187 | 195 | } |
| 188 | 196 | } |
| 189 | 197 | } else { |
| 190 | | - if( $ns = $wgRequest->getInt( 'namespace', 0 ) ) |
| | 198 | + if( $ns = $wgRequest->getText( 'namespace', NS_MAIN ) ) |
| 191 | 199 | $namespace = $ns; |
| 192 | 200 | if( $un = $wgRequest->getText( 'username' ) ) |
| 193 | 201 | $username = $un; |
| Index: branches/phase3_rev_deleted/includes/BagOStuff.php |
| — | — | @@ -172,7 +172,7 @@ |
| 173 | 173 | */ |
| 174 | 174 | var $bag; |
| 175 | 175 | |
| 176 | | - function HashBagOStuff() { |
| | 176 | + function __construct() { |
| 177 | 177 | $this->bag = array(); |
| 178 | 178 | } |
| 179 | 179 | |
| — | — | @@ -222,7 +222,7 @@ |
| 223 | 223 | var $table; |
| 224 | 224 | var $lastexpireall = 0; |
| 225 | 225 | |
| 226 | | - function SqlBagOStuff($tablename = 'objectcache') { |
| | 226 | + function __construct($tablename = 'objectcache') { |
| 227 | 227 | $this->table = $tablename; |
| 228 | 228 | } |
| 229 | 229 | |
| — | — | @@ -253,6 +253,9 @@ |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | function set($key,$value,$exptime=0) { |
| | 257 | + if ( wfReadOnly() ) { |
| | 258 | + return false; |
| | 259 | + } |
| 257 | 260 | $exptime = intval($exptime); |
| 258 | 261 | if($exptime < 0) $exptime = 0; |
| 259 | 262 | if($exptime == 0) { |
| — | — | @@ -272,6 +275,9 @@ |
| 273 | 276 | } |
| 274 | 277 | |
| 275 | 278 | function delete($key,$time=0) { |
| | 279 | + if ( wfReadOnly() ) { |
| | 280 | + return false; |
| | 281 | + } |
| 276 | 282 | $this->_query( |
| 277 | 283 | "DELETE FROM $0 WHERE keyname='$1'", $key ); |
| 278 | 284 | return true; /* ? */ |
| — | — | @@ -339,12 +345,18 @@ |
| 340 | 346 | |
| 341 | 347 | function expireall() { |
| 342 | 348 | /* Remove any items that have expired */ |
| | 349 | + if ( wfReadOnly() ) { |
| | 350 | + return false; |
| | 351 | + } |
| 343 | 352 | $now = $this->_fromunixtime( time() ); |
| 344 | 353 | $this->_query( "DELETE FROM $0 WHERE exptime < '$now'" ); |
| 345 | 354 | } |
| 346 | 355 | |
| 347 | 356 | function deleteall() { |
| 348 | 357 | /* Clear *all* items from cache table */ |
| | 358 | + if ( wfReadOnly() ) { |
| | 359 | + return false; |
| | 360 | + } |
| 349 | 361 | $this->_query( "DELETE FROM $0" ); |
| 350 | 362 | } |
| 351 | 363 | |
| — | — | @@ -553,6 +565,52 @@ |
| 554 | 566 | } |
| 555 | 567 | |
| 556 | 568 | /** |
| | 569 | + * Wrapper for XCache object caching functions; identical interface |
| | 570 | + * to the APC wrapper |
| | 571 | + */ |
| | 572 | +class XCacheBagOStuff extends APCBagOStuff { |
| | 573 | + |
| | 574 | + /** |
| | 575 | + * Get a value from the XCache object cache |
| | 576 | + * |
| | 577 | + * @param string $key Cache key |
| | 578 | + * @return mixed |
| | 579 | + */ |
| | 580 | + public function get( $key ) { |
| | 581 | + $val = xcache_get( $key ); |
| | 582 | + if( is_string( $val ) ) |
| | 583 | + $val = unserialize( $val ); |
| | 584 | + return $val; |
| | 585 | + } |
| | 586 | + |
| | 587 | + /** |
| | 588 | + * Store a value in the XCache object cache |
| | 589 | + * |
| | 590 | + * @param string $key Cache key |
| | 591 | + * @param mixed $value Object to store |
| | 592 | + * @param int $expire Expiration time |
| | 593 | + * @return bool |
| | 594 | + */ |
| | 595 | + public function set( $key, $value, $expire = 0 ) { |
| | 596 | + xcache_set( $key, serialize( $value ), $expire ); |
| | 597 | + return true; |
| | 598 | + } |
| | 599 | + |
| | 600 | + /** |
| | 601 | + * Remove a value from the XCache object cache |
| | 602 | + * |
| | 603 | + * @param string $key Cache key |
| | 604 | + * @param int $time Not used in this implementation |
| | 605 | + * @return bool |
| | 606 | + */ |
| | 607 | + public function delete( $key, $time = 0 ) { |
| | 608 | + xcache_unset( $key ); |
| | 609 | + return true; |
| | 610 | + } |
| | 611 | + |
| | 612 | +} |
| | 613 | + |
| | 614 | +/** |
| 557 | 615 | * @todo document |
| 558 | 616 | */ |
| 559 | 617 | class DBABagOStuff extends BagOStuff { |
| Index: branches/phase3_rev_deleted/includes/SpecialBlockip.php |
| — | — | @@ -43,6 +43,7 @@ |
| 44 | 44 | */ |
| 45 | 45 | class IPBlockForm { |
| 46 | 46 | var $BlockAddress, $BlockExpiry, $BlockReason; |
| | 47 | +# var $BlockEmail; |
| 47 | 48 | |
| 48 | 49 | function IPBlockForm( $par ) { |
| 49 | 50 | global $wgRequest, $wgUser; |
| — | — | @@ -60,6 +61,7 @@ |
| 61 | 62 | $this->BlockAnonOnly = $wgRequest->getBool( 'wpAnonOnly', $byDefault ); |
| 62 | 63 | $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', $byDefault ); |
| 63 | 64 | $this->BlockEnableAutoblock = $wgRequest->getBool( 'wpEnableAutoblock', $byDefault ); |
| | 65 | + $this->BlockEmail = $wgRequest->getBool( 'wpEmailBan', false ); |
| 64 | 66 | # Re-check user's rights to hide names, very serious, defaults to 0 |
| 65 | 67 | $this->BlockHideName = ( $wgRequest->getBool( 'wpHideName', 0 ) && $wgUser->isAllowed( 'hideuser' ) ) ? 1 : 0; |
| 66 | 68 | } |
| — | — | @@ -225,10 +227,25 @@ |
| 226 | 228 | </td> |
| 227 | 229 | </tr> |
| 228 | 230 | "); |
| | 231 | + |
| | 232 | + global $wgSysopEmailBans; |
| | 233 | + if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) { |
| | 234 | + $wgOut->addHTML(" |
| | 235 | + <tr> |
| | 236 | + <td> </td> |
| | 237 | + <td> |
| | 238 | + " . wfCheckLabel( wfMsgHtml( 'ipbemailban' ), |
| | 239 | + 'wpEmailBan', 'wpEmailBan', $this->BlockEmail, |
| | 240 | + array( 'tabindex' => '10' )) . " |
| | 241 | + </td> |
| | 242 | + </tr> |
| | 243 | + "); |
| | 244 | + } |
| | 245 | + |
| 229 | 246 | // Allow some users to hide name from block log, blocklist and listusers |
| 230 | 247 | if ( $wgUser->isAllowed( 'hideuser' ) ) { |
| 231 | 248 | $wgOut->addHTML(" |
| 232 | | - <tr> |
| | 249 | + <tr id='wpEnableEmailBan'> |
| 233 | 250 | <td> </td> |
| 234 | 251 | <td> |
| 235 | 252 | " . wfCheckLabel( wfMsgHtml( 'ipbhidename' ), |
| — | — | @@ -238,12 +255,13 @@ |
| 239 | 256 | </tr> |
| 240 | 257 | "); |
| 241 | 258 | } |
| | 259 | + |
| 242 | 260 | $wgOut->addHTML(" |
| 243 | 261 | <tr> |
| 244 | 262 | <td style='padding-top: 1em'> </td> |
| 245 | 263 | <td style='padding-top: 1em'> |
| 246 | 264 | " . Xml::submitButton( wfMsg( 'ipbsubmit' ), |
| 247 | | - array( 'name' => 'wpBlock', 'tabindex' => '10' ) ) . " |
| | 265 | + array( 'name' => 'wpBlock', 'tabindex' => '11' ) ) . " |
| 248 | 266 | </td> |
| 249 | 267 | </tr> |
| 250 | 268 | </table>" . |
| — | — | @@ -356,10 +374,10 @@ |
| 357 | 375 | |
| 358 | 376 | # Create block |
| 359 | 377 | # Note: for a user block, ipb_address is only for display purposes |
| 360 | | - |
| 361 | 378 | $block = new Block( $this->BlockAddress, $userId, $wgUser->getID(), |
| 362 | 379 | $reasonstr, wfTimestampNow(), 0, $expiry, $this->BlockAnonOnly, |
| 363 | | - $this->BlockCreateAccount, $this->BlockEnableAutoblock, $this->BlockHideName); |
| | 380 | + $this->BlockCreateAccount, $this->BlockEnableAutoblock, $this->BlockHideName, |
| | 381 | + $this->BlockEmail); |
| 364 | 382 | |
| 365 | 383 | if (wfRunHooks('BlockIp', array(&$block, &$wgUser))) { |
| 366 | 384 | |
| — | — | @@ -420,6 +438,8 @@ |
| 421 | 439 | $flags[] = 'nocreate'; |
| 422 | 440 | if( !$this->BlockEnableAutoblock ) |
| 423 | 441 | $flags[] = 'noautoblock'; |
| | 442 | + if ( $this->BlockEmail ) |
| | 443 | + $flags[] = 'noemail'; |
| 424 | 444 | return implode( ',', $flags ); |
| 425 | 445 | } |
| 426 | 446 | |
| Index: branches/phase3_rev_deleted/includes/Math.php |
| — | — | @@ -157,8 +157,8 @@ |
| 158 | 158 | $dbw = wfGetDB( DB_MASTER ); |
| 159 | 159 | $dbw->replace( 'math', array( 'math_inputhash' ), |
| 160 | 160 | array( |
| 161 | | - 'math_inputhash' => $md5_sql, |
| 162 | | - 'math_outputhash' => $outmd5_sql, |
| | 161 | + 'math_inputhash' => $dbw->encodeBlob($md5_sql), |
| | 162 | + 'math_outputhash' => $dbw->encodeBlob($outmd5_sql), |
| 163 | 163 | 'math_html_conservativeness' => $this->conservativeness, |
| 164 | 164 | 'math_html' => $this->html, |
| 165 | 165 | 'math_mathml' => $this->mathml, |
| — | — | @@ -186,13 +186,13 @@ |
| 187 | 187 | $dbr = wfGetDB( DB_SLAVE ); |
| 188 | 188 | $rpage = $dbr->selectRow( 'math', |
| 189 | 189 | array( 'math_outputhash','math_html_conservativeness','math_html','math_mathml' ), |
| 190 | | - array( 'math_inputhash' => pack("H32", $this->md5)), # Binary packed, not hex |
| | 190 | + array( 'math_inputhash' => $dbr->encodeBlob(pack("H32", $this->md5))), # Binary packed, not hex |
| 191 | 191 | $fname |
| 192 | 192 | ); |
| 193 | 193 | |
| 194 | 194 | if( $rpage !== false ) { |
| 195 | 195 | # Tailing 0x20s can get dropped by the database, add it back on if necessary: |
| 196 | | - $xhash = unpack( 'H32md5', $rpage->math_outputhash . " " ); |
| | 196 | + $xhash = unpack( 'H32md5', $dbr->decodeBlob($rpage->math_outputhash) . " " ); |
| 197 | 197 | $this->hash = $xhash ['md5']; |
| 198 | 198 | |
| 199 | 199 | $this->conservativeness = $rpage->math_html_conservativeness; |
| Index: branches/phase3_rev_deleted/includes/OutputPage.php |
| — | — | @@ -792,7 +792,11 @@ |
| 793 | 793 | $msg = 'blockedtext'; |
| 794 | 794 | } |
| 795 | 795 | |
| 796 | | - $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry ) ); |
| | 796 | + /* $ip returns who *is* being blocked, $intended contains who was meant to be blocked. |
| | 797 | + * This could be a username, an ip range, or a single ip. */ |
| | 798 | + $intended = $wgUser->mBlock->mAddress; |
| | 799 | + |
| | 800 | + $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended ) ); |
| 797 | 801 | |
| 798 | 802 | # Don't auto-return to special pages |
| 799 | 803 | if( $return ) { |
| Index: branches/phase3_rev_deleted/includes/SpecialSpecialpages.php |
| — | — | @@ -17,7 +17,10 @@ |
| 18 | 18 | wfSpecialSpecialpages_gen( SpecialPage::getRegularPages(), 'spheading', $sk, false ); |
| 19 | 19 | |
| 20 | 20 | /** Restricted special pages */ |
| 21 | | - wfSpecialSpecialpages_gen( SpecialPage::getRestrictedPages(), 'restrictedpheading', $sk, true ); |
| | 21 | + wfSpecialSpecialpages_gen( SpecialPage::getRestrictedPages(), 'restrictedpheading', $sk, false ); |
| | 22 | + |
| | 23 | + /** Restricted logs */ |
| | 24 | + wfSpecialSpecialpages_gen( SpecialPage::getRestrictedLogs(), 'restrictedlheading', $sk, true ); |
| 22 | 25 | } |
| 23 | 26 | |
| 24 | 27 | /** |
| — | — | @@ -25,10 +28,10 @@ |
| 26 | 29 | * @param $pages the list of pages |
| 27 | 30 | * @param $heading header to be used |
| 28 | 31 | * @param $sk skin object ??? |
| 29 | | - * @param $restricted, restricted pages or not |
| | 32 | + * @param $islog, is this for a list of log types? |
| 30 | 33 | */ |
| 31 | | -function wfSpecialSpecialpages_gen($pages,$heading,$sk,$restricted) { |
| 32 | | - global $wgOut, $wgUser, $wgSortSpecialPages, $wgLogRestrictions, $wgLogNames; |
| | 34 | +function wfSpecialSpecialpages_gen( $pages, $heading, $sk, $islog=false ) { |
| | 35 | + global $wgOut, $wgUser, $wgSortSpecialPages; |
| 33 | 36 | |
| 34 | 37 | if( count( $pages ) == 0 ) { |
| 35 | 38 | # Yeah, that was pointless. Thanks for coming. |
| — | — | @@ -37,19 +40,12 @@ |
| 38 | 41 | |
| 39 | 42 | /** Put them into a sortable array */ |
| 40 | 43 | $sortedPages = array(); |
| 41 | | - foreach ( $pages as $page ) { |
| 42 | | - if ( $page->isListed() ) { |
| 43 | | - $sortedPages[$page->getDescription()] = $page->getTitle(); |
| 44 | | - } |
| 45 | | - } |
| 46 | | - |
| 47 | | - # Add private logs |
| 48 | | - if ( $restricted && isset($wgLogRestrictions) ) { |
| 49 | | - foreach ( $wgLogRestrictions as $type => $restriction ) { |
| 50 | | - $page = SpecialPage::getTitleFor( 'Log', $type ); |
| 51 | | - if ( $restriction != '' && $wgUser->isAllowed( $restriction ) ) { |
| 52 | | - $name = wfMsgHtml( $wgLogNames[$type] ); |
| 53 | | - $sortedPages[$name] = $page; |
| | 44 | + if( $islog ) { |
| | 45 | + $sortedPages = $pages; |
| | 46 | + } else { |
| | 47 | + foreach ( $pages as $page ) { |
| | 48 | + if ( $page->isListed() ) { |
| | 49 | + $sortedPages[$page->getDescription()] = $page->getTitle(); |
| 54 | 50 | } |
| 55 | 51 | } |
| 56 | 52 | } |
| Index: branches/phase3_rev_deleted/includes/ImageGallery.php |
| — | — | @@ -147,6 +147,10 @@ |
| 148 | 148 | * @param $html String: Additional HTML text to be shown. The name and size of the image are always shown. |
| 149 | 149 | */ |
| 150 | 150 | function insert( $title, $html='' ) { |
| | 151 | + if ( $title instanceof File ) { |
| | 152 | + // Old calling convention |
| | 153 | + $title = $title->getTitle(); |
| | 154 | + } |
| 151 | 155 | array_unshift( $this->mImages, array( &$title, $html ) ); |
| 152 | 156 | } |
| 153 | 157 | |
| Index: branches/phase3_rev_deleted/includes/DefaultSettings.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | * Create a site configuration object |
| 29 | 29 | * Not used for much in a default install |
| 30 | 30 | */ |
| 31 | | -require_once( 'includes/SiteConfiguration.php' ); |
| | 31 | +require_once( "$IP/includes/SiteConfiguration.php" ); |
| 32 | 32 | $wgConf = new SiteConfiguration; |
| 33 | 33 | |
| 34 | 34 | /** MediaWiki version number */ |
| — | — | @@ -209,6 +209,10 @@ |
| 210 | 210 | * thumbScriptUrl The URL for thumb.php (optional, not recommended) |
| 211 | 211 | * transformVia404 Whether to skip media file transformation on parse and rely on a 404 |
| 212 | 212 | * handler instead. |
| | 213 | + * initialCapital Equivalent to $wgCapitalLinks, determines whether filenames implicitly |
| | 214 | + * start with a capital letter. The current implementation may give incorrect |
| | 215 | + * description page links when the local $wgCapitalLinks and initialCapital |
| | 216 | + * are mismatched. |
| 213 | 217 | * |
| 214 | 218 | * These settings describe a foreign MediaWiki installation. They are optional, and will be ignored |
| 215 | 219 | * for local repositories: |
| — | — | @@ -310,34 +314,34 @@ |
| 311 | 315 | * |
| 312 | 316 | * @global array $wgAntivirusSetup |
| 313 | 317 | */ |
| 314 | | -$wgAntivirusSetup= array( |
| | 318 | +$wgAntivirusSetup = array( |
| 315 | 319 | |
| 316 | 320 | #setup for clamav |
| 317 | 321 | 'clamav' => array ( |
| 318 | 322 | 'command' => "clamscan --no-summary ", |
| 319 | 323 | |
| 320 | | - 'codemap'=> array ( |
| 321 | | - "0"=> AV_NO_VIRUS, #no virus |
| 322 | | - "1"=> AV_VIRUS_FOUND, #virus found |
| 323 | | - "52"=> AV_SCAN_ABORTED, #unsupported file format (probably imune) |
| 324 | | - "*"=> AV_SCAN_FAILED, #else scan failed |
| | 324 | + 'codemap' => array ( |
| | 325 | + "0" => AV_NO_VIRUS, # no virus |
| | 326 | + "1" => AV_VIRUS_FOUND, # virus found |
| | 327 | + "52" => AV_SCAN_ABORTED, # unsupported file format (probably imune) |
| | 328 | + "*" => AV_SCAN_FAILED, # else scan failed |
| 325 | 329 | ), |
| 326 | 330 | |
| 327 | | - 'messagepattern'=> '/.*?:(.*)/sim', |
| | 331 | + 'messagepattern' => '/.*?:(.*)/sim', |
| 328 | 332 | ), |
| 329 | 333 | |
| 330 | 334 | #setup for f-prot |
| 331 | 335 | 'f-prot' => array ( |
| 332 | 336 | 'command' => "f-prot ", |
| 333 | 337 | |
| 334 | | - 'codemap'=> array ( |
| 335 | | - "0"=> AV_NO_VIRUS, #no virus |
| 336 | | - "3"=> AV_VIRUS_FOUND, #virus found |
| 337 | | - "6"=> AV_VIRUS_FOUND, #virus found |
| 338 | | - "*"=> AV_SCAN_FAILED, #else scan failed |
| | 338 | + 'codemap' => array ( |
| | 339 | + "0" => AV_NO_VIRUS, # no virus |
| | 340 | + "3" => AV_VIRUS_FOUND, # virus found |
| | 341 | + "6" => AV_VIRUS_FOUND, # virus found |
| | 342 | + "*" => AV_SCAN_FAILED, # else scan failed |
| 339 | 343 | ), |
| 340 | 344 | |
| 341 | | - 'messagepattern'=> '/.*?Infection:(.*)$/m', |
| | 345 | + 'messagepattern' => '/.*?Infection:(.*)$/m', |
| 342 | 346 | ), |
| 343 | 347 | ); |
| 344 | 348 | |
| — | — | @@ -859,6 +863,7 @@ |
| 860 | 864 | |
| 861 | 865 | $wgShowIPinHeader = true; # For non-logged in users |
| 862 | 866 | $wgMaxNameChars = 255; # Maximum number of bytes in username |
| | 867 | +$wgMaxSigChars = 255; # Maximum number of bytes in signature |
| 863 | 868 | $wgMaxArticleSize = 2048; # Maximum article size in kilobytes |
| 864 | 869 | |
| 865 | 870 | $wgExtraSubtitle = ''; |
| — | — | @@ -973,9 +978,10 @@ |
| 974 | 979 | |
| 975 | 980 | # Basic user rights and block settings |
| 976 | 981 | $wgSysopUserBans = true; # Allow sysops to ban logged-in users |
| 977 | | -$wgSysopRangeBans = true; # Allow sysops to ban IP ranges |
| 978 | | -$wgAutoblockExpiry = 86400; # Number of seconds before autoblock entries expire |
| | 982 | +$wgSysopRangeBans = true; # Allow sysops to ban IP ranges |
| | 983 | +$wgAutoblockExpiry = 86400; # Number of seconds before autoblock entries expire |
| 979 | 984 | $wgBlockAllowsUTEdit = false; # Blocks allow users to edit their own user talk page |
| | 985 | +$wgSysopEmailBans = true; # Allow sysops to ban users from accessing Emailuser |
| 980 | 986 | |
| 981 | 987 | # Pages anonymous user may see as an array, e.g.: |
| 982 | 988 | # array ( "Main Page", "Special:Userlogin", "Wikipedia:Help"); |
| — | — | @@ -1064,6 +1070,7 @@ |
| 1065 | 1071 | $wgGroupPermissions['sysop']['upload_by_url'] = true; |
| 1066 | 1072 | $wgGroupPermissions['sysop']['ipblock-exempt'] = true; |
| 1067 | 1073 | $wgGroupPermissions['sysop']['deleterevision'] = true; |
| | 1074 | +$wgGroupPermissions['sysop']['blockemail'] = true; |
| 1068 | 1075 | |
| 1069 | 1076 | // Permission to change users' group assignments |
| 1070 | 1077 | $wgGroupPermissions['bureaucrat']['userrights'] = true; |
| — | — | @@ -1093,6 +1100,10 @@ |
| 1094 | 1101 | /** |
| 1095 | 1102 | * Set of permission keys that can be selected via action=protect. |
| 1096 | 1103 | * 'autoconfirm' allows all registerd users if $wgAutoConfirmAge is 0. |
| | 1104 | + * |
| | 1105 | + * You can add a new protection level that requires a specific |
| | 1106 | + * permission by manipulating this array. The ordering of elements |
| | 1107 | + * dictates the order on the protection form's lists. |
| 1097 | 1108 | */ |
| 1098 | 1109 | $wgRestrictionLevels = array( '', 'autoconfirmed', 'sysop' ); |
| 1099 | 1110 | |
| — | — | @@ -1183,7 +1194,7 @@ |
| 1184 | 1195 | * to ensure that client-side caches don't keep obsolete copies of global |
| 1185 | 1196 | * styles. |
| 1186 | 1197 | */ |
| 1187 | | -$wgStyleVersion = '73'; |
| | 1198 | +$wgStyleVersion = '76'; |
| 1188 | 1199 | |
| 1189 | 1200 | |
| 1190 | 1201 | # Server-side caching: |
| — | — | @@ -1416,6 +1427,13 @@ |
| 1417 | 1428 | /** |
| 1418 | 1429 | * Show EXIF data, on by default if available. |
| 1419 | 1430 | * Requires PHP's EXIF extension: http://www.php.net/manual/en/ref.exif.php |
| | 1431 | + * |
| | 1432 | + * NOTE FOR WINDOWS USERS: |
| | 1433 | + * To enable EXIF functions, add the folloing lines to the |
| | 1434 | + * "Windows extensions" section of php.ini: |
| | 1435 | + * |
| | 1436 | + * extension=extensions/php_mbstring.dll |
| | 1437 | + * extension=extensions/php_exif.dll |
| 1420 | 1438 | */ |
| 1421 | 1439 | $wgShowEXIF = function_exists( 'exif_read_data' ); |
| 1422 | 1440 | |
| — | — | @@ -1470,7 +1488,7 @@ |
| 1471 | 1489 | /** Files with these extensions will never be allowed as uploads. */ |
| 1472 | 1490 | $wgFileBlacklist = array( |
| 1473 | 1491 | # HTML may contain cookie-stealing JavaScript and web bugs |
| 1474 | | - 'html', 'htm', 'js', 'jsb', |
| | 1492 | + 'html', 'htm', 'js', 'jsb', 'mhtml', 'mht', |
| 1475 | 1493 | # PHP scripts may execute arbitrary code on the server |
| 1476 | 1494 | 'php', 'phtml', 'php3', 'php4', 'php5', 'phps', |
| 1477 | 1495 | # Other types that may be interpreted by some servers |
| — | — | @@ -1526,10 +1544,15 @@ |
| 1527 | 1545 | NS_MAIN => true, |
| 1528 | 1546 | ); |
| 1529 | 1547 | |
| 1530 | | -/** If set, a bold ugly notice will show up at the top of every page. */ |
| | 1548 | +/** |
| | 1549 | + * Site notice shown at the top of each page |
| | 1550 | + * |
| | 1551 | + * This message can contain wiki text, and can also be set through the |
| | 1552 | + * MediaWiki:Sitenotice page. You can also provide a separate message for |
| | 1553 | + * logged-out users using the MediaWiki:Anonnotice page. |
| | 1554 | + */ |
| 1531 | 1555 | $wgSiteNotice = ''; |
| 1532 | 1556 | |
| 1533 | | - |
| 1534 | 1557 | # |
| 1535 | 1558 | # Images settings |
| 1536 | 1559 | # |
| — | — | @@ -2180,7 +2203,7 @@ |
| 2181 | 2204 | * Extensions with custom log types may add to this array. |
| 2182 | 2205 | */ |
| 2183 | 2206 | $wgLogNames = array( |
| 2184 | | - '' => 'log', |
| | 2207 | + '' => 'all-logs-page', |
| 2185 | 2208 | 'block' => 'blocklogpage', |
| 2186 | 2209 | 'protect' => 'protectlogpage', |
| 2187 | 2210 | 'rights' => 'rightslog', |
| — | — | @@ -2221,6 +2244,7 @@ |
| 2222 | 2245 | 'block/block' => 'blocklogentry', |
| 2223 | 2246 | 'block/unblock' => 'unblocklogentry', |
| 2224 | 2247 | 'protect/protect' => 'protectedarticle', |
| | 2248 | + 'protect/modify' => 'modifiedarticleprotection', |
| 2225 | 2249 | 'protect/unprotect' => 'unprotectedarticle', |
| 2226 | 2250 | 'rights/rights' => 'rightslogentry', |
| 2227 | 2251 | 'delete/delete' => 'deletedarticle', |
| — | — | @@ -2291,6 +2315,16 @@ |
| 2292 | 2316 | $wgNamespaceRobotPolicies = array(); |
| 2293 | 2317 | |
| 2294 | 2318 | /** |
| | 2319 | + * Robot policies per article. |
| | 2320 | + * These override the per-namespace robot policies. |
| | 2321 | + * Must be in the form of an array where the key part is a properly |
| | 2322 | + * canonicalised text form title and the value is a robot policy. |
| | 2323 | + * Example: |
| | 2324 | + * $wgArticleRobotPolicies = array( 'Main Page' => 'noindex' ); |
| | 2325 | + */ |
| | 2326 | +$wgArticleRobotPolicies = array(); |
| | 2327 | + |
| | 2328 | +/** |
| 2295 | 2329 | * Specifies the minimal length of a user password. If set to |
| 2296 | 2330 | * 0, empty passwords are allowed. |
| 2297 | 2331 | */ |
| Index: branches/phase3_rev_deleted/includes/ImagePage.php |
| — | — | @@ -274,7 +274,7 @@ |
| 275 | 275 | if ( $page > 1 ) { |
| 276 | 276 | $label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false ); |
| 277 | 277 | $link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page-1) ); |
| 278 | | - $thumb1 = $sk->makeThumbLinkObj( $this->img, $link, $label, 'none', |
| | 278 | + $thumb1 = $sk->makeThumbLinkObj( $this->mTitle, $this->img, $link, $label, 'none', |
| 279 | 279 | array( 'page' => $page - 1 ) ); |
| 280 | 280 | } else { |
| 281 | 281 | $thumb1 = ''; |
| — | — | @@ -283,7 +283,7 @@ |
| 284 | 284 | if ( $page < $count ) { |
| 285 | 285 | $label = wfMsg( 'imgmultipagenext' ); |
| 286 | 286 | $link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page+1) ); |
| 287 | | - $thumb2 = $sk->makeThumbLinkObj( $this->img, $link, $label, 'none', |
| | 287 | + $thumb2 = $sk->makeThumbLinkObj( $this->mTitle, $this->img, $link, $label, 'none', |
| 288 | 288 | array( 'page' => $page + 1 ) ); |
| 289 | 289 | } else { |
| 290 | 290 | $thumb2 = ''; |
| — | — | @@ -503,6 +503,12 @@ |
| 504 | 504 | { |
| 505 | 505 | global $wgUser, $wgOut, $wgRequest; |
| 506 | 506 | |
| | 507 | + if ( !$this->img->exists() || !$this->img->isLocal() ) { |
| | 508 | + # Use standard article deletion |
| | 509 | + Article::delete(); |
| | 510 | + return; |
| | 511 | + } |
| | 512 | + |
| 507 | 513 | $confirm = $wgRequest->wasPosted(); |
| 508 | 514 | $reason = $wgRequest->getVal( 'wpReason' ); |
| 509 | 515 | $image = $wgRequest->getVal( 'image' ); |
| — | — | @@ -536,7 +542,7 @@ |
| 537 | 543 | # Deleting old images doesn't require confirmation |
| 538 | 544 | if ( !is_null( $oldimage ) || $confirm ) { |
| 539 | 545 | if( $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ), $oldimage ) ) { |
| 540 | | - $this->doDelete( $reason, $suppress ); |
| | 546 | + $this->doDeleteImage( $reason ); |
| 541 | 547 | } else { |
| 542 | 548 | $wgOut->showFatalError( wfMsg( 'sessionfailure' ) ); |
| 543 | 549 | } |
| — | — | @@ -555,9 +561,12 @@ |
| 556 | 562 | |
| 557 | 563 | /* |
| 558 | 564 | * Delete an image. |
| | 565 | + * Called doDeleteImage() not doDelete() so that Article::delete() doesn't |
| | 566 | + * call back to here. |
| | 567 | + * |
| 559 | 568 | * @param $reason User provided reason for deletion. |
| 560 | 569 | */ |
| 561 | | - function doDelete( $reason, $suppress=false ) { |
| | 570 | + function doDeleteImage( $reason ) { |
| 562 | 571 | global $wgOut, $wgRequest; |
| 563 | 572 | |
| 564 | 573 | $oldimage = $wgRequest->getVal( 'oldimage' ); |
| — | — | @@ -644,7 +653,7 @@ |
| 645 | 654 | $wgOut->showErrorPage( 'uploadnologin', 'uploadnologintext' ); |
| 646 | 655 | return; |
| 647 | 656 | } |
| 648 | | - if ( ! $this->mTitle->userCan( 'edit' ) ) { |
| | 657 | + if ( !$this->mTitle->userCan( 'edit' ) || !$this->mTitle->userCan( 'upload' ) ) { |
| 649 | 658 | $wgOut->readOnlyPage( $this->getContent(), true ); |
| 650 | 659 | return; |
| 651 | 660 | } |
| — | — | @@ -658,7 +667,8 @@ |
| 659 | 668 | } |
| 660 | 669 | |
| 661 | 670 | $sourcePath = $this->img->getArchiveVirtualUrl( $oldimage ); |
| 662 | | - $result = $this->img->publish( $sourcePath ); |
| | 671 | + $comment = wfMsg( "reverted" ); |
| | 672 | + $result = $this->img->upload( $sourcePath, $comment, $comment ); |
| 663 | 673 | |
| 664 | 674 | if ( WikiError::isError( $result ) ) { |
| 665 | 675 | $this->showError( $result ); |
| — | — | @@ -753,7 +763,7 @@ |
| 754 | 764 | } |
| 755 | 765 | } else { |
| 756 | 766 | $url = htmlspecialchars( $this->img->getArchiveUrl( $img ) ); |
| 757 | | - if( $local && $wgUser->getID() != 0 && $wgTitle->userCan( 'edit' ) ) { |
| | 767 | + if( $local && $wgUser->getID() != 0 && $wgTitle->userCan( 'edit' ) && $wgTitle->userCan( 'upload' ) ) { |
| 758 | 768 | # Revert link, for public files only |
| 759 | 769 | if ( $deleted ) { |
| 760 | 770 | $rlink = wfMsgHtml( 'revertimg' ); |
| — | — | @@ -867,7 +877,7 @@ |
| 868 | 878 | if( ($bitfield & $field) == $field ) { |
| 869 | 879 | // images |
| 870 | 880 | global $wgUser; |
| 871 | | - $permission = ( $bitfield & Image::DELETED_RESTRICTED ) == Image::DELETED_RESTRICTED |
| | 881 | + $permission = ( $bitfield & File::DELETED_RESTRICTED ) == File::DELETED_RESTRICTED |
| 872 | 882 | ? 'hiderevision' |
| 873 | 883 | : 'deleterevision'; |
| 874 | 884 | wfDebug( "Checking for $permission due to $field match on $bitfield\n" ); |
| Index: branches/phase3_rev_deleted/includes/SpecialRevisiondelete.php |
| — | — | @@ -6,7 +6,7 @@ |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | function wfSpecialRevisiondelete( $par = null ) { |
| 10 | | - global $wgOut, $wgRequest; |
| | 10 | + global $wgOut, $wgRequest, $wgUser; |
| 11 | 11 | |
| 12 | 12 | $target = $wgRequest->getText( 'target' ); |
| 13 | 13 | // Handle our many different possible input types |
| — | — | @@ -42,6 +42,25 @@ |
| 43 | 43 | } else if( $fileid || $image ) { |
| 44 | 44 | $form->showImages( $wgRequest ); |
| 45 | 45 | } |
| | 46 | + |
| | 47 | + # Show relevant lines from the deletion log: |
| | 48 | + $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" ); |
| | 49 | + $logViewer = new LogViewer( |
| | 50 | + new LogReader( |
| | 51 | + new FauxRequest( |
| | 52 | + array( 'page' => $page->getPrefixedText(), |
| | 53 | + 'type' => 'delete' ) ) ) ); |
| | 54 | + $logViewer->showList( $wgOut ); |
| | 55 | + # Show relevant lines from the oversight log if user is allowed to see it: |
| | 56 | + if( $wgUser->isAllowed( 'oversight' ) ) { |
| | 57 | + $wgOut->addHTML( "<h2>" . htmlspecialchars( LogPage::logName( 'oversight' ) ) . "</h2>\n" ); |
| | 58 | + $logViewer = new LogViewer( |
| | 59 | + new LogReader( |
| | 60 | + new FauxRequest( |
| | 61 | + array( 'page' => $page->getPrefixedText(), |
| | 62 | + 'type' => 'oversight' ) ) ) ); |
| | 63 | + $logViewer->showList( $wgOut ); |
| | 64 | + } |
| 46 | 65 | } |
| 47 | 66 | |
| 48 | 67 | /** |
| — | — | @@ -67,6 +86,7 @@ |
| 68 | 87 | // For reviewing deleted files |
| 69 | 88 | if ( $file ) { |
| 70 | 89 | $oimage = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $page, $file ); |
| | 90 | + $oimage->load(); |
| 71 | 91 | // Check if user is allowed to see this file |
| 72 | 92 | if( !$oimage->userCan(File::DELETED_FILE) ) { |
| 73 | 93 | $wgOut->permissionRequired( 'hiderevision' ); |
| — | — | @@ -99,7 +119,8 @@ |
| 100 | 120 | $hide_content_name = array( 'revdelete-hide-name', 'wpHideName', LogViewer::DELETED_ACTION ); |
| 101 | 121 | $this->deletetype='logid'; |
| 102 | 122 | } |
| 103 | | - // Our checkbox messages depends one what we are doing |
| | 123 | + // Our checkbox messages depends one what we are doing, |
| | 124 | + // e.g. we don't hide "text" for logs or images |
| 104 | 125 | $this->checks = array( |
| 105 | 126 | $hide_content_name, |
| 106 | 127 | array( 'revdelete-hide-comment', 'wpHideComment', Revision::DELETED_COMMENT ), |
| — | — | @@ -141,7 +162,7 @@ |
| 142 | 163 | $bitfields = 0; |
| 143 | 164 | $wgOut->addHtml( "<ul>" ); |
| 144 | 165 | // Live revisions... |
| 145 | | - if( $this->deletetype=='oldid') { |
| | 166 | + if( $this->deletetype=='oldid' ) { |
| 146 | 167 | foreach( $this->revisions as $revid ) { |
| 147 | 168 | $rev = Revision::newFromTitle( $this->page, $revid ); |
| 148 | 169 | // Hiding top revisison is bad |
| — | — | @@ -154,7 +175,7 @@ |
| 155 | 176 | $wgOut->permissionRequired( 'hiderevision' ); |
| 156 | 177 | return; |
| 157 | 178 | } |
| 158 | | - $UserAllowed=false; |
| | 179 | + $UserAllowed = false; |
| 159 | 180 | } |
| 160 | 181 | $wgOut->addHtml( $this->historyLine( $rev ) ); |
| 161 | 182 | $bitfields |= $rev->mDeleted; |
| — | — | @@ -173,7 +194,7 @@ |
| 174 | 195 | $wgOut->permissionRequired( 'hiderevision' ); |
| 175 | 196 | return; |
| 176 | 197 | } |
| 177 | | - $UserAllowed=false; |
| | 198 | + $UserAllowed = false; |
| 178 | 199 | } |
| 179 | 200 | $wgOut->addHtml( $this->historyLine( $rev ) ); |
| 180 | 201 | $bitfields |= $rev->mDeleted; |
| — | — | @@ -238,27 +259,55 @@ |
| 239 | 260 | |
| 240 | 261 | $bitfields = 0; |
| 241 | 262 | $wgOut->addHtml( "<ul>" ); |
| 242 | | - // Live revisions... |
| | 263 | + // Live old revisions... |
| 243 | 264 | if( $this->deletetype=='oldimage' ) { |
| | 265 | + $where = $filesObjs = array(); |
| | 266 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 267 | + // Run through and pull all our data in one query |
| 244 | 268 | foreach( $this->ofiles as $name ) { |
| 245 | 269 | // Our image may be hidden, if so it's name is formated as <time>!<key> |
| 246 | 270 | // Otherwise, it will be <time>!<image> and the URL only needs to pass the time |
| 247 | 271 | $archivename = ( strpos($name,'!')==false ) ? $name.'!'.$this->page->getDbKey() : $name; |
| | 272 | + $where[] = $dbr->addQuotes($archivename); |
| | 273 | + } |
| | 274 | + $whereClause = 'oi_archive_name IN(' . implode(',',$where) . ')'; |
| | 275 | + // Pull all of the requested images |
| | 276 | + $result = $dbr->select( 'oldimage', array('oi_archive_name', 'oi_size', 'oi_width', 'oi_height', |
| | 277 | + 'oi_description', 'oi_user', 'oi_user_text', 'oi_timestamp', 'oi_deleted'), |
| | 278 | + array( 'oi_name' => $this->page->getDbKey(), $whereClause ), |
| | 279 | + __METHOD__ ); |
| | 280 | + while( $s = $dbr->fetchObject( $result ) ) { |
| | 281 | + $filesObjs[$s->oi_archive_name] = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->page, $archivename ); |
| | 282 | + // Load in fields directly, weeee! |
| | 283 | + $filesObjs[$s->oi_archive_name]->size = $s->oi_size; |
| | 284 | + $filesObjs[$s->oi_archive_name]->width = $s->oi_width; |
| | 285 | + $filesObjs[$s->oi_archive_name]->height = $s->oi_height; |
| | 286 | + $filesObjs[$s->oi_archive_name]->description = $s->oi_description; |
| | 287 | + $filesObjs[$s->oi_archive_name]->user = $s->oi_user; |
| | 288 | + $filesObjs[$s->oi_archive_name]->userText = $s->oi_user_text; |
| | 289 | + $filesObjs[$s->oi_archive_name]->timestamp = $s->oi_timestamp; |
| | 290 | + $filesObjs[$s->oi_archive_name]->deleted = $s->oi_deleted; |
| | 291 | + } |
| | 292 | + // Check through our images |
| | 293 | + foreach( $this->ofiles as $name ) { |
| | 294 | + // Our image may be hidden, if so it's name is formated as <time>!<key> |
| | 295 | + // Otherwise, it will be <time>!<image> and the URL only needs to pass the time |
| | 296 | + $archivename = ( strpos($name,'!')==false ) ? $name.'!'.$this->page->getDbKey() : $name; |
| 248 | 297 | |
| 249 | | - $oimage = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->page, $archivename ); |
| 250 | | - if( !$oimage->exists() ) { |
| | 298 | + if( !isset($filesObjs[$archivename]) ) { |
| 251 | 299 | $wgOut->showErrorPage( 'revdelete-nooldid-title', 'revdelete-nooldid-text' ); |
| 252 | 300 | return; |
| 253 | | - } else if( !$oimage->userCan(File::DELETED_RESTRICTED) ) { |
| | 301 | + } else if( !$filesObjs[$archivename]->userCan(File::DELETED_RESTRICTED) ) { |
| 254 | 302 | // If a rev is hidden from sysops |
| 255 | 303 | if( $action != 'submit' ) { |
| 256 | 304 | $wgOut->permissionRequired( 'hiderevision' ); |
| 257 | 305 | return; |
| 258 | 306 | } |
| 259 | | - $UserAllowed=false; |
| | 307 | + $UserAllowed = false; |
| 260 | 308 | } |
| 261 | | - $wgOut->addHtml( $this->uploadLine( $oimage ) ); |
| 262 | | - $bitfields |= $oimage->deleted; |
| | 309 | + // Inject history info |
| | 310 | + $wgOut->addHtml( $this->uploadLine( $filesObjs[$archivename] ) ); |
| | 311 | + $bitfields |= $filesObjs[$archivename]->deleted; |
| 263 | 312 | } |
| 264 | 313 | // Archived files... |
| 265 | 314 | } else { |
| — | — | @@ -273,7 +322,7 @@ |
| 274 | 323 | $wgOut->permissionRequired( 'hiderevision' ); |
| 275 | 324 | return; |
| 276 | 325 | } |
| 277 | | - $UserAllowed=false; |
| | 326 | + $UserAllowed = false; |
| 278 | 327 | } |
| 279 | 328 | $wgOut->addHtml( $this->uploadLine( $file ) ); |
| 280 | 329 | $bitfields |= $file->deleted; |
| — | — | @@ -332,26 +381,26 @@ |
| 333 | 382 | global $wgOut, $wgUser, $action; |
| 334 | 383 | |
| 335 | 384 | $UserAllowed = true; |
| 336 | | - $wgOut->addWikiText( wfMsgExt( 'logdelete-selected', array('parsemag'), $this->page->getPrefixedText(), count($this->events) ) ); |
| | 385 | + $wgOut->addWikiText( wfMsgExt( 'logdelete-selected', array('parsemag'), |
| | 386 | + $this->page->getPrefixedText(), count($this->events) ) ); |
| 337 | 387 | |
| 338 | 388 | $bitfields = 0; |
| 339 | 389 | $wgOut->addHtml( "<ul>" ); |
| 340 | 390 | foreach( $this->events as $logid ) { |
| 341 | | - $log = new LogViewer( $wgRequest ); |
| 342 | | - $event = LogReader::newFromTitle( $this->page, $logid ); |
| | 391 | + $event = LogReader::newRowFromTitle( $this->page, $logid ); |
| 343 | 392 | // Don't hide from oversight log!!! |
| 344 | 393 | if( !isset( $event ) || $event->log_type=='oversight' ) { |
| 345 | 394 | $wgOut->showErrorPage( 'revdelete-nooldid-title', 'revdelete-nooldid-text' ); |
| 346 | 395 | return; |
| 347 | | - } else if( !$log->userCan($event,Revision::DELETED_RESTRICTED) ) { |
| | 396 | + } else if( !LogViewer::userCan($event,Revision::DELETED_RESTRICTED) ) { |
| 348 | 397 | // If an event is hidden from sysops |
| 349 | 398 | if( $action != 'submit') { |
| 350 | 399 | $wgOut->permissionRequired( 'hiderevision' ); |
| 351 | 400 | return; |
| 352 | 401 | } |
| 353 | | - $UserAllowed=false; |
| | 402 | + $UserAllowed = false; |
| 354 | 403 | } |
| 355 | | - $wgOut->addHtml( $this->logLine( $log, $event ) ); |
| | 404 | + $wgOut->addHtml( $this->logLine( $event ) ); |
| 356 | 405 | $bitfields |= $event->log_deleted; |
| 357 | 406 | } |
| 358 | 407 | $wgOut->addHtml( "</ul>" ); |
| — | — | @@ -430,7 +479,7 @@ |
| 431 | 480 | } |
| 432 | 481 | |
| 433 | 482 | /** |
| 434 | | - * @param OldLocalImage or ArchivedFile $file |
| | 483 | + * @param File $file |
| 435 | 484 | * This can work for old or archived revisions |
| 436 | 485 | * @returns string |
| 437 | 486 | */ |
| — | — | @@ -453,7 +502,7 @@ |
| 454 | 503 | if( !$file->userCan(File::DELETED_FILE) ) { |
| 455 | 504 | $pageLink = $date; |
| 456 | 505 | } else { |
| 457 | | - $pageLink = $this->skin->makeKnownLinkObj( $wgTitle, $date, "target=$target&file=$file->mArchiveName" ); |
| | 506 | + $pageLink = $this->skin->makeKnownLinkObj( $wgTitle, $date, "target=$target&file=$file->archive_name" ); |
| 458 | 507 | } |
| 459 | 508 | $pageLink = '<span class="history-deleted">' . $pageLink . '</span>'; |
| 460 | 509 | # Regular files... |
| — | — | @@ -464,19 +513,18 @@ |
| 465 | 514 | } |
| 466 | 515 | |
| 467 | 516 | $data = wfMsgHtml( 'widthheight', |
| 468 | | - $wgContLang->formatNum( $file->width ), |
| 469 | | - $wgContLang->formatNum( $file->height ) ) . |
| 470 | | - ' (' . wfMsgHtml( 'nbytes', $wgContLang->formatNum( $file->size ) ) . ')'; |
| | 517 | + $wgContLang->formatNum( $file->width ), |
| | 518 | + $wgContLang->formatNum( $file->height ) ) . |
| | 519 | + ' (' . wfMsgHtml( 'nbytes', $wgContLang->formatNum( $file->size ) ) . ')'; |
| 471 | 520 | |
| 472 | | - #return "<li> $pageLink " . $this->skin->fileUserLink( $file ) . " $data " . $this->skin->fileComment( $file ) . "$del</li>"; |
| 473 | | - return "<li> $pageLink $data $del</li>"; |
| | 521 | + return "<li> $pageLink " . $this->fileUserLink( $file ) . " $data " . $this->fileComment( $file ) . "$del</li>"; |
| 474 | 522 | } |
| 475 | 523 | |
| 476 | 524 | /** |
| 477 | | - * @param Revision $rev |
| | 525 | + * @param Array $event row |
| 478 | 526 | * @returns string |
| 479 | 527 | */ |
| 480 | | - function logLine( $log, $event ) { |
| | 528 | + function logLine( $event ) { |
| 481 | 529 | global $wgContLang; |
| 482 | 530 | |
| 483 | 531 | $date = $wgContLang->timeanddate( $event->log_timestamp ); |
| — | — | @@ -494,6 +542,68 @@ |
| 495 | 543 | } |
| 496 | 544 | |
| 497 | 545 | /** |
| | 546 | + * Generate a user link if the current user is allowed to view it |
| | 547 | + * @param ArchivedFile $file |
| | 548 | + * @param $isPublic, bool, show only if all users can see it |
| | 549 | + * @return string HTML |
| | 550 | + */ |
| | 551 | + function fileUserLink( $file, $isPublic = false ) { |
| | 552 | + if( $file->isDeleted( File::DELETED_USER ) && $isPublic ) { |
| | 553 | + $link = wfMsgHtml( 'rev-deleted-user' ); |
| | 554 | + } else if( $file->userCan( File::DELETED_USER ) ) { |
| | 555 | + $link = $this->skin->userLink( $file->user, $file->userText ); |
| | 556 | + } else { |
| | 557 | + $link = wfMsgHtml( 'rev-deleted-user' ); |
| | 558 | + } |
| | 559 | + if( $file->isDeleted( File::DELETED_USER ) ) { |
| | 560 | + return '<span class="history-deleted">' . $link . '</span>'; |
| | 561 | + } |
| | 562 | + return $link; |
| | 563 | + } |
| | 564 | + |
| | 565 | + /** |
| | 566 | + * Generate a user tool link cluster if the current user is allowed to view it |
| | 567 | + * @param ArchivedFile $file |
| | 568 | + * @param $isPublic, bool, show only if all users can see it |
| | 569 | + * @return string HTML |
| | 570 | + */ |
| | 571 | + function fileUserTools( $file, $isPublic = false ) { |
| | 572 | + if( $file->isDeleted( Revision::DELETED_USER ) && $isPublic ) { |
| | 573 | + $link = wfMsgHtml( 'rev-deleted-user' ); |
| | 574 | + } else if( $file->userCan( Revision::DELETED_USER ) ) { |
| | 575 | + $link = $this->skin->userLink( $file->user, $file->userText ) . |
| | 576 | + $this->userToolLinks( $file->user, $file->userText ); |
| | 577 | + } else { |
| | 578 | + $link = wfMsgHtml( 'rev-deleted-user' ); |
| | 579 | + } |
| | 580 | + if( $file->isDeleted( Revision::DELETED_USER ) ) { |
| | 581 | + return '<span class="history-deleted">' . $link . '</span>'; |
| | 582 | + } |
| | 583 | + return $link; |
| | 584 | + } |
| | 585 | + |
| | 586 | + /** |
| | 587 | + * Wrap and format the given file's comment block, if the current |
| | 588 | + * user is allowed to view it. |
| | 589 | + * |
| | 590 | + * @param ArchivedFile $file |
| | 591 | + * @return string HTML |
| | 592 | + */ |
| | 593 | + function fileComment( $file, $isPublic = false ) { |
| | 594 | + if( $file->isDeleted( File::DELETED_COMMENT ) && $isPublic ) { |
| | 595 | + $block = ' ' . wfMsgHtml( 'rev-deleted-comment' ); |
| | 596 | + } else if( $file->userCan( File::DELETED_COMMENT ) ) { |
| | 597 | + $block = $this->skin->commentBlock( $file->description ); |
| | 598 | + } else { |
| | 599 | + $block = ' ' . wfMsgHtml( 'rev-deleted-comment' ); |
| | 600 | + } |
| | 601 | + if( $file->isDeleted( File::DELETED_COMMENT ) ) { |
| | 602 | + return "<span class=\"history-deleted\">$block</span>"; |
| | 603 | + } |
| | 604 | + return $block; |
| | 605 | + } |
| | 606 | + |
| | 607 | + /** |
| 498 | 608 | * @param WebRequest $request |
| 499 | 609 | */ |
| 500 | 610 | function submit( $request ) { |
| — | — | @@ -524,12 +634,19 @@ |
| 525 | 635 | |
| 526 | 636 | $title = Title::newFromURL( $target, true ); |
| 527 | 637 | $name = $title->makeName( $title->getNamespace(), $title->getText() ); |
| 528 | | - |
| | 638 | + # Give a link to the log for this page |
| 529 | 639 | $logtitle = SpecialPage::getTitleFor( 'Log' ); |
| 530 | 640 | $loglink = $this->skin->makeKnownLinkObj( $logtitle, wfMsgHtml( 'viewpagelogs' ), |
| 531 | | - wfArrayToCGI( array('page' => $name ) ) ); |
| 532 | | - $histlink = $this->skin->makeKnownLinkObj( $title, wfMsgHtml( 'revhistory' ), |
| 533 | | - wfArrayToCGI( array('action' => 'history' ) ) ); |
| | 641 | + wfArrayToCGI( array('page' => $name ) ) ); |
| | 642 | + # Give a link to the page history |
| | 643 | + if( $type=='arid' ) { |
| | 644 | + $undelete = SpecialPage::getTitleFor( 'Undelete' ); |
| | 645 | + $histlink = $this->skin->makeKnownLinkObj( $undelete, wfMsgHtml( 'revhistory' ), |
| | 646 | + wfArrayToCGI( array('target' => $title->getPrefixedText() ) ) ); |
| | 647 | + } else { |
| | 648 | + $histlink = $this->skin->makeKnownLinkObj( $title, wfMsgHtml( 'revhistory' ), |
| | 649 | + wfArrayToCGI( array('action' => 'history' ) ) ); |
| | 650 | + } |
| 534 | 651 | |
| 535 | 652 | if( $title->getNamespace() > -1) |
| 536 | 653 | $wgOut->setSubtitle( '<p>'.$histlink.' / '.$loglink.'</p>' ); |
| — | — | @@ -537,10 +654,10 @@ |
| 538 | 655 | if( $type=='logid' ) { |
| 539 | 656 | $wgOut->addWikiText( wfMsgHtml('logdelete-success', $target), false ); |
| 540 | 657 | $this->showEvents( $request ); |
| 541 | | - } else if( $type=='oldid' ) { |
| | 658 | + } else if( $type=='oldid' || $type=='arid' ) { |
| 542 | 659 | $wgOut->addWikiText( wfMsgHtml('revdelete-success', $target), false ); |
| 543 | 660 | $this->showRevs( $request ); |
| 544 | | - } else if( $type=='arid' || $type=='fileid' ) { |
| | 661 | + } else if( $type=='fileid' ) { |
| 545 | 662 | $undelete = SpecialPage::getTitleFor( 'Undelete' ); |
| 546 | 663 | # Redirect out, we already have the deleted history right there |
| 547 | 664 | $wgOut->redirect( $undelete->escapeLocalUrl() . '/' . htmlspecialchars($target) ); |
| — | — | @@ -568,6 +685,11 @@ |
| 569 | 686 | |
| 570 | 687 | function save( $bitfield, $reason, $title ) { |
| 571 | 688 | $dbw = wfGetDB( DB_MASTER ); |
| | 689 | + |
| | 690 | + // Don't allow simply locking the interface for no reason |
| | 691 | + if( $bitfield == Revision::DELETED_RESTRICTED ) |
| | 692 | + $bitfield = 0; |
| | 693 | + |
| 572 | 694 | $deleter = new RevisionDeleter( $dbw ); |
| 573 | 695 | // By this point, only one of the below should be set |
| 574 | 696 | if( isset($this->revisions) ) { |
| — | — | @@ -602,16 +724,17 @@ |
| 603 | 725 | function setRevVisibility( $title, $items, $bitfield, $comment ) { |
| 604 | 726 | global $wgOut; |
| 605 | 727 | |
| 606 | | - $UserAllowedAll = true; |
| | 728 | + $userAllowedAll = $success = true; |
| 607 | 729 | $pages_count = array(); |
| 608 | 730 | $pages_revIds = array(); |
| 609 | 731 | // To work! |
| 610 | 732 | foreach( $items as $revid ) { |
| 611 | 733 | $rev = Revision::newFromTitle( $title, $revid ); |
| 612 | 734 | if( !is_object($rev) || $rev->isCurrent() ) { |
| 613 | | - return false; |
| | 735 | + $success = false; |
| | 736 | + continue; // Must exist |
| 614 | 737 | } else if( !$rev->userCan(Revision::DELETED_RESTRICTED) ) { |
| 615 | | - $UserAllowedAll=false; |
| | 738 | + $userAllowedAll=false; |
| 616 | 739 | continue; |
| 617 | 740 | } |
| 618 | 741 | $pageid = $rev->getPage(); |
| — | — | @@ -640,13 +763,13 @@ |
| 641 | 764 | } |
| 642 | 765 | } |
| 643 | 766 | // Where all revs allowed to be set? |
| 644 | | - if( !$UserAllowedAll ) { |
| | 767 | + if( !$userAllowedAll ) { |
| 645 | 768 | //FIXME: still might be confusing??? |
| 646 | 769 | $wgOut->permissionRequired( 'hiderevision' ); |
| 647 | 770 | return false; |
| 648 | 771 | } |
| 649 | 772 | |
| 650 | | - return true; |
| | 773 | + return $success; |
| 651 | 774 | } |
| 652 | 775 | |
| 653 | 776 | /** |
| — | — | @@ -658,7 +781,7 @@ |
| 659 | 782 | function setArchiveVisibility( $title, $items, $bitfield, $comment ) { |
| 660 | 783 | global $wgOut; |
| 661 | 784 | |
| 662 | | - $UserAllowedAll = true; |
| | 785 | + $userAllowedAll = $success = true; |
| 663 | 786 | $count = 0; |
| 664 | 787 | $Id_set = array(); |
| 665 | 788 | // To work! |
| — | — | @@ -666,9 +789,10 @@ |
| 667 | 790 | foreach( $items as $revid ) { |
| 668 | 791 | $rev = $archive->getRevision( '', $revid ); |
| 669 | 792 | if( !is_object($rev) ) { |
| 670 | | - return false; |
| | 793 | + $success = false; |
| | 794 | + continue; // Must exist |
| 671 | 795 | } else if( !$rev->userCan(Revision::DELETED_RESTRICTED) ) { |
| 672 | | - $UserAllowedAll=false; |
| | 796 | + $userAllowedAll=false; |
| 673 | 797 | continue; |
| 674 | 798 | } |
| 675 | 799 | // Which revisions did we change anything about? |
| — | — | @@ -685,12 +809,12 @@ |
| 686 | 810 | $this->updateLog( $title, $count, $bitfield, $comment, $title, 'arid', $Id_set ); |
| 687 | 811 | } |
| 688 | 812 | // Where all revs allowed to be set? |
| 689 | | - if( !$UserAllowedAll ) { |
| | 813 | + if( !$userAllowedAll ) { |
| 690 | 814 | $wgOut->permissionRequired( 'hiderevision' ); |
| 691 | 815 | return false; |
| 692 | 816 | } |
| 693 | 817 | |
| 694 | | - return true; |
| | 818 | + return $success; |
| 695 | 819 | } |
| 696 | 820 | |
| 697 | 821 | /** |
| — | — | @@ -702,7 +826,7 @@ |
| 703 | 827 | function setOldImgVisibility( $title, $items, $bitfield, $comment ) { |
| 704 | 828 | global $wgOut; |
| 705 | 829 | |
| 706 | | - $UserAllowedAll = true; |
| | 830 | + $userAllowedAll = $success = true; |
| 707 | 831 | $count = 0; |
| 708 | 832 | $set = array(); |
| 709 | 833 | // To work! |
| — | — | @@ -711,10 +835,12 @@ |
| 712 | 836 | // Otherwise, it will be <time>!<image> and the URL only needs to pass the time |
| 713 | 837 | $archivename = ( strpos($name,'!')==false ) ? $name.'!'.$title->getDbKey() : $name; |
| 714 | 838 | $oimage = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $archivename ); |
| 715 | | - if( !$oimage->exists() ) { |
| 716 | | - return false; |
| | 839 | + $oimage->load(); |
| | 840 | + if( !$oimage->timestamp ) { |
| | 841 | + $success = false; |
| | 842 | + continue; // Must exist |
| 717 | 843 | } else if( !$oimage->userCan(File::DELETED_RESTRICTED) ) { |
| 718 | | - $UserAllowedAll=false; |
| | 844 | + $userAllowedAll=false; |
| 719 | 845 | continue; |
| 720 | 846 | } |
| 721 | 847 | |
| — | — | @@ -759,12 +885,12 @@ |
| 760 | 886 | $this->updateLog( $title, $count, $bitfield, $comment, $title, 'oldimage', $set ); |
| 761 | 887 | } |
| 762 | 888 | // Where all revs allowed to be set? |
| 763 | | - if( !$UserAllowedAll ) { |
| | 889 | + if( !$userAllowedAll ) { |
| 764 | 890 | $wgOut->permissionRequired( 'hiderevision' ); |
| 765 | 891 | return false; |
| 766 | 892 | } |
| 767 | 893 | |
| 768 | | - return true; |
| | 894 | + return $success; |
| 769 | 895 | } |
| 770 | 896 | |
| 771 | 897 | /** |
| — | — | @@ -776,20 +902,21 @@ |
| 777 | 903 | function setArchFileVisibility( $title, $items, $bitfield, $comment ) { |
| 778 | 904 | global $wgOut; |
| 779 | 905 | |
| 780 | | - $UserAllowedAll = true; |
| | 906 | + $userAllowedAll = $success = true; |
| 781 | 907 | $count = 0; |
| 782 | 908 | $Id_set = array(); |
| 783 | 909 | // To work! |
| 784 | 910 | foreach( $items as $fileid ) { |
| 785 | 911 | $file = new ArchivedFile( $title, $fileid ); |
| 786 | 912 | if( !isset($file->id) ) { |
| 787 | | - return false; |
| | 913 | + $success = false; |
| | 914 | + continue; // Must exist |
| 788 | 915 | } else if( !$file->userCan(File::DELETED_RESTRICTED) ) { |
| 789 | | - $UserAllowedAll=false; |
| | 916 | + $userAllowedAll=false; |
| 790 | 917 | continue; |
| 791 | 918 | } |
| 792 | 919 | // Which revisions did we change anything about? |
| 793 | | - if( $file->mDeleted != $bitfield ) { |
| | 920 | + if( $file->deleted != $bitfield ) { |
| 794 | 921 | $Id_set[]=$fileid; |
| 795 | 922 | $count++; |
| 796 | 923 | |
| — | — | @@ -802,12 +929,12 @@ |
| 803 | 930 | $this->updateLog( $title, $count, $bitfield, $comment, $title, 'fileid', $Id_set ); |
| 804 | 931 | } |
| 805 | 932 | // Where all revs allowed to be set? |
| 806 | | - if( !$UserAllowedAll ) { |
| | 933 | + if( !$userAllowedAll ) { |
| 807 | 934 | $wgOut->permissionRequired( 'hiderevision' ); |
| 808 | 935 | return false; |
| 809 | 936 | } |
| 810 | 937 | |
| 811 | | - return true; |
| | 938 | + return $success; |
| 812 | 939 | } |
| 813 | 940 | |
| 814 | 941 | /** |
| — | — | @@ -819,17 +946,18 @@ |
| 820 | 947 | function setEventVisibility( $title, $items, $bitfield, $comment ) { |
| 821 | 948 | global $wgOut; |
| 822 | 949 | |
| 823 | | - $UserAllowedAll = true; |
| | 950 | + $userAllowedAll = $success = true; |
| 824 | 951 | $logs_count = array(); |
| 825 | 952 | $logs_Ids = array(); |
| 826 | 953 | // To work! |
| 827 | 954 | foreach( $items as $logid ) { |
| 828 | | - $event = LogReader::newFromTitle( $title, $logid ); |
| | 955 | + $event = LogReader::newRowFromTitle( $title, $logid ); |
| 829 | 956 | if( is_null($event) ) { |
| 830 | | - return false; |
| | 957 | + $success = false; |
| | 958 | + continue; // Must exist |
| 831 | 959 | } else if( !LogViewer::userCan($event, Revision::DELETED_RESTRICTED) || $event->log_type=='oversight' ) { |
| 832 | 960 | // Don't hide from oversight log!!! |
| 833 | | - $UserAllowedAll=false; |
| | 961 | + $userAllowedAll=false; |
| 834 | 962 | continue; |
| 835 | 963 | } |
| 836 | 964 | $logtype = $event->log_type; |
| — | — | @@ -855,12 +983,12 @@ |
| 856 | 984 | } |
| 857 | 985 | } |
| 858 | 986 | // Where all revs allowed to be set? |
| 859 | | - if( !$UserAllowedAll ) { |
| | 987 | + if( !$userAllowedAll ) { |
| 860 | 988 | $wgOut->permissionRequired( 'hiderevision' ); |
| 861 | 989 | return false; |
| 862 | 990 | } |
| 863 | 991 | |
| 864 | | - return true; |
| | 992 | + return $success; |
| 865 | 993 | } |
| 866 | 994 | |
| 867 | 995 | /** |
| — | — | @@ -920,11 +1048,14 @@ |
| 921 | 1049 | __METHOD__ ); |
| 922 | 1050 | } |
| 923 | 1051 | |
| 924 | | - // Use of $timeframe for Image objects can create thumbnails of oldimages |
| 925 | 1052 | $imgtitle = Title::makeTitle( NS_IMAGE, $oimage->name ); |
| 926 | 1053 | $image = new Image( $imgtitle ); |
| 927 | 1054 | $image->purgeCache(); // Clear any thumbnails/purge squid cache |
| 928 | 1055 | |
| | 1056 | + # Invalidate cache for all pages using this file |
| | 1057 | + $update = new HTMLCacheUpdate( $imgtitle, 'imagelinks' ); |
| | 1058 | + $update->doUpdate(); |
| | 1059 | + |
| 929 | 1060 | return "{$timestamp}!{$key}"; |
| 930 | 1061 | } |
| 931 | 1062 | |
| — | — | @@ -987,7 +1118,16 @@ |
| 988 | 1119 | array( 'oi_archive_name' => "{$timestamp}!{$oimage->name}" ), |
| 989 | 1120 | array( 'oi_name' => $oimage->name, 'oi_archive_name' => $oimage->archive_name ), |
| 990 | 1121 | __METHOD__ ); |
| | 1122 | + |
| | 1123 | + // Use of $time for Image objects can create thumbnails of oldimages |
| | 1124 | + $imgtitle = Title::makeTitle( NS_IMAGE, $oimage->name ); |
| | 1125 | + $image = new Image( $imgtitle ); |
| | 1126 | + $image->purgeCache(); // Clear any thumbnails/purge squid cache |
| 991 | 1127 | |
| | 1128 | + # Invalidate cache for all pages using this file |
| | 1129 | + $update = new HTMLCacheUpdate( $imgtitle, 'imagelinks' ); |
| | 1130 | + $update->doUpdate(); |
| | 1131 | + |
| 992 | 1132 | return $timestamp; |
| 993 | 1133 | } |
| 994 | 1134 | |
| — | — | @@ -1106,7 +1246,8 @@ |
| 1107 | 1247 | $logtype = ( $bitfield & Revision::DELETED_RESTRICTED ) ? 'oversight' : 'delete'; |
| 1108 | 1248 | // Add params for effected page and ids |
| 1109 | 1249 | $params = array( $target->getPrefixedText(), $param, implode( ',', $items) ); |
| 1110 | | - $log = new LogPage( $logtype ); |
| | 1250 | + $log = new LogPage( $logtype ); |
| | 1251 | + // XXX: hack, do this better |
| 1111 | 1252 | if( $param=='logid' ) { |
| 1112 | 1253 | $reason = wfMsgExt('logdelete-logaction', array('parsemag'), $count, $bitfield, $target->getPrefixedText() ); |
| 1113 | 1254 | if($comment) $reason .= ": $comment"; |
| Index: branches/phase3_rev_deleted/includes/AutoLoader.php |
| — | — | @@ -22,6 +22,7 @@ |
| 23 | 23 | 'TurckBagOStuff' => 'includes/BagOStuff.php',
|
| 24 | 24 | 'APCBagOStuff' => 'includes/BagOStuff.php',
|
| 25 | 25 | 'eAccelBagOStuff' => 'includes/BagOStuff.php',
|
| | 26 | + 'XCacheBagOStuff' => 'includes/BagOStuff.php',
|
| 26 | 27 | 'DBABagOStuff' => 'includes/BagOStuff.php',
|
| 27 | 28 | 'Block' => 'includes/Block.php',
|
| 28 | 29 | 'HTMLFileCache' => 'includes/HTMLFileCache.php',
|
| — | — | @@ -190,6 +191,7 @@ |
| 191 | 192 | 'MostimagesPage' => 'includes/SpecialMostimages.php',
|
| 192 | 193 | 'MostlinkedPage' => 'includes/SpecialMostlinked.php',
|
| 193 | 194 | 'MostlinkedCategoriesPage' => 'includes/SpecialMostlinkedcategories.php',
|
| | 195 | + 'SpecialMostlinkedtemplates' => 'includes/SpecialMostlinkedtemplates.php',
|
| 194 | 196 | 'MostrevisionsPage' => 'includes/SpecialMostrevisions.php',
|
| 195 | 197 | 'FewestrevisionsPage' => 'includes/SpecialFewestrevisions.php',
|
| 196 | 198 | 'MovePageForm' => 'includes/SpecialMovepage.php',
|
| — | — | @@ -208,6 +210,7 @@ |
| 209 | 211 | 'ShortPagesPage' => 'includes/SpecialShortpages.php',
|
| 210 | 212 | 'UncategorizedCategoriesPage' => 'includes/SpecialUncategorizedcategories.php',
|
| 211 | 213 | 'UncategorizedPagesPage' => 'includes/SpecialUncategorizedpages.php',
|
| | 214 | + 'UncategorizedTemplatesPage' => 'includes/SpecialUncategorizedtemplates.php',
|
| 212 | 215 | 'PageArchive' => 'includes/SpecialUndelete.php',
|
| 213 | 216 | 'UndeleteForm' => 'includes/SpecialUndelete.php',
|
| 214 | 217 | 'DBUnlockForm' => 'includes/SpecialUnlockdb.php',
|
| — | — | @@ -251,6 +254,7 @@ |
| 252 | 255 | # filerepo
|
| 253 | 256 | 'ArchivedFile' => 'includes/filerepo/ArchivedFile.php',
|
| 254 | 257 | 'File' => 'includes/filerepo/File.php',
|
| | 258 | + 'FileRepo' => 'includes/filerepo/FileRepo.php',
|
| 255 | 259 | 'ForeignDBFile' => 'includes/filerepo/ForeignDBFile.php',
|
| 256 | 260 | 'ForeignDBRepo' => 'includes/filerepo/ForeignDBRepo.php',
|
| 257 | 261 | 'FSRepo' => 'includes/filerepo/FSRepo.php',
|
| — | — | @@ -302,6 +306,7 @@ |
| 303 | 307 | 'ApiQueryBase' => 'includes/api/ApiQueryBase.php',
|
| 304 | 308 | 'ApiQueryBacklinks' => 'includes/api/ApiQueryBacklinks.php',
|
| 305 | 309 | 'ApiQueryCategories' => 'includes/api/ApiQueryCategories.php',
|
| | 310 | + 'ApiQueryCategoryMembers' => 'includes/api/ApiQueryCategoryMembers.php',
|
| 306 | 311 | 'ApiQueryContributions' => 'includes/api/ApiQueryUserContributions.php',
|
| 307 | 312 | 'ApiQueryExternalLinks' => 'includes/api/ApiQueryExternalLinks.php',
|
| 308 | 313 | 'ApiQueryImages' => 'includes/api/ApiQueryImages.php',
|
| Index: branches/phase3_rev_deleted/includes/Setup.php |
| — | — | @@ -66,6 +66,7 @@ |
| 67 | 67 | 'hashLevels' => $wgHashedUploadDirectory ? 2 : 0, |
| 68 | 68 | 'thumbScriptUrl' => $wgThumbnailScriptPath, |
| 69 | 69 | 'transformVia404' => !$wgGenerateThumbnailOnParse, |
| | 70 | + 'initialCapital' => $wgCapitalLinks, |
| 70 | 71 | ); |
| 71 | 72 | } |
| 72 | 73 | /** |
| Index: branches/phase3_rev_deleted/includes/PatrolLog.php |
| — | — | @@ -49,11 +49,16 @@ |
| 50 | 50 | list( $cur, /* $prev */, $auto ) = $params;
|
| 51 | 51 | # Standard link to the page in question
|
| 52 | 52 | $link = $skin->makeLinkObj( $title );
|
| 53 | | - # Generate a diff link
|
| 54 | | - $bits[] = 'oldid=' . urlencode( $cur );
|
| 55 | | - $bits[] = 'diff=prev';
|
| 56 | | - $bits = implode( '&', $bits );
|
| 57 | | - $diff = $skin->makeLinkObj( $title, htmlspecialchars( wfMsg( 'patrol-log-diff', $cur ) ), $bits );
|
| | 53 | + if( $title->exists() ) {
|
| | 54 | + # Generate a diff link
|
| | 55 | + $bits[] = 'oldid=' . urlencode( $cur );
|
| | 56 | + $bits[] = 'diff=prev';
|
| | 57 | + $bits = implode( '&', $bits );
|
| | 58 | + $diff = $skin->makeKnownLinkObj( $title, htmlspecialchars( wfMsg( 'patrol-log-diff', $cur ) ), $bits );
|
| | 59 | + } else {
|
| | 60 | + # Don't bother with a diff link, it's useless
|
| | 61 | + $diff = htmlspecialchars( wfMsg( 'patrol-log-diff', $cur ) );
|
| | 62 | + }
|
| 58 | 63 | # Indicate whether or not the patrolling was automatic
|
| 59 | 64 | $auto = $auto ? wfMsgHtml( 'patrol-log-auto' ) : '';
|
| 60 | 65 | # Put it all together
|
| Index: branches/phase3_rev_deleted/includes/SpecialPage.php |
| — | — | @@ -94,12 +94,14 @@ |
| 95 | 95 | 'Uncategorizedpages' => array( 'SpecialPage', 'Uncategorizedpages' ), |
| 96 | 96 | 'Uncategorizedcategories' => array( 'SpecialPage', 'Uncategorizedcategories' ), |
| 97 | 97 | 'Uncategorizedimages' => array( 'SpecialPage', 'Uncategorizedimages' ), |
| | 98 | + 'Uncategorizedtemplates' => array( 'SpecialPage', 'Uncategorizedtemplates' ), |
| 98 | 99 | 'Unusedcategories' => array( 'SpecialPage', 'Unusedcategories' ), |
| 99 | 100 | 'Unusedimages' => array( 'SpecialPage', 'Unusedimages' ), |
| 100 | 101 | 'Wantedpages' => array( 'IncludableSpecialPage', 'Wantedpages' ), |
| 101 | 102 | 'Wantedcategories' => array( 'SpecialPage', 'Wantedcategories' ), |
| 102 | 103 | 'Mostlinked' => array( 'SpecialPage', 'Mostlinked' ), |
| 103 | 104 | 'Mostlinkedcategories' => array( 'SpecialPage', 'Mostlinkedcategories' ), |
| | 105 | + 'Mostlinkedtemplates' => array( 'SpecialPage', 'Mostlinkedtemplates' ), |
| 104 | 106 | 'Mostcategories' => array( 'SpecialPage', 'Mostcategories' ), |
| 105 | 107 | 'Mostimages' => array( 'SpecialPage', 'Mostimages' ), |
| 106 | 108 | 'Mostrevisions' => array( 'SpecialPage', 'Mostrevisions' ), |
| — | — | @@ -177,7 +179,7 @@ |
| 178 | 180 | } |
| 179 | 181 | |
| 180 | 182 | if( $wgEmailAuthentication ) { |
| 181 | | - self::$mList['Confirmemail'] = array( 'UnlistedSpecialPage', 'Confirmemail' ); |
| | 183 | + self::$mList['Confirmemail'] = 'EmailConfirmation'; |
| 182 | 184 | } |
| 183 | 185 | |
| 184 | 186 | # Add extension special pages |
| — | — | @@ -377,6 +379,28 @@ |
| 378 | 380 | } |
| 379 | 381 | return $pages; |
| 380 | 382 | } |
| | 383 | + |
| | 384 | + /** |
| | 385 | + * Return categorised listable log pages which are available |
| | 386 | + * for the current user, but not for everyone |
| | 387 | + * @static |
| | 388 | + */ |
| | 389 | + static function getRestrictedLogs() { |
| | 390 | + global $wgUser, $wgLogRestrictions, $wgLogNames; |
| | 391 | + |
| | 392 | + $pages = array(); |
| | 393 | + |
| | 394 | + if ( isset($wgLogRestrictions) ) { |
| | 395 | + foreach ( $wgLogRestrictions as $type => $restriction ) { |
| | 396 | + $page = SpecialPage::getTitleFor( 'Log', $type ); |
| | 397 | + if ( $restriction !='' && $restriction !='*' && $wgUser->isAllowed( $restriction ) ) { |
| | 398 | + $name = wfMsgHtml( $wgLogNames[$type] ); |
| | 399 | + $pages[$name] = $page; |
| | 400 | + } |
| | 401 | + } |
| | 402 | + } |
| | 403 | + return $pages; |
| | 404 | + } |
| 381 | 405 | |
| 382 | 406 | /** |
| 383 | 407 | * Execute a special page path. |
| Index: branches/phase3_rev_deleted/includes/ParserOutput.php |
| — | — | @@ -103,7 +103,7 @@ |
| 104 | 104 | array('img_name' => $name),
|
| 105 | 105 | __METHOD__ );
|
| 106 | 106 | }
|
| 107 | | - $timestamp = $timestamp ? $timestamp : 0;
|
| | 107 | + $timestamp = $timestamp ? $timestamp : null;
|
| 108 | 108 | $this->mImageTimestamps[$name] = $timestamp; // For versioning
|
| 109 | 109 | }
|
| 110 | 110 |
|
| Index: branches/phase3_rev_deleted/includes/LogPage.php |
| — | — | @@ -72,16 +72,29 @@ |
| 73 | 73 | $newId = $dbw->insertId(); |
| 74 | 74 | |
| 75 | 75 | # And update recentchanges |
| 76 | | - if ( $this->updateRecentChanges ) { |
| 77 | | - # Don't add private logs to RC!!! |
| 78 | | - if ( !isset($wgLogRestrictions[$this->type]) || $wgLogRestrictions[$this->type]=='*' ) { |
| 79 | | - RecentChange::notifyLog( $now, $this->target, $wgUser, $this->actionText, '', |
| 80 | | - $this->type, $this->action, $this->target, $this->comment, $this->params, $newId ); |
| | 76 | + if( $this->updateRecentChanges ) { |
| | 77 | + # Don't add private logs to RC! |
| | 78 | + if( !isset($wgLogRestrictions[$this->type]) || $wgLogRestrictions[$this->type]=='*' ) { |
| | 79 | + $titleObj = SpecialPage::getTitleFor( 'Log', $this->type ); |
| | 80 | + $rcComment = $this->getRcComment(); |
| | 81 | + RecentChange::notifyLog( $now, $titleObj, $wgUser, $rcComment, '', |
| | 82 | + $this->type, $this->action, $this->target, $this->comment, $this->params ); |
| 81 | 83 | } |
| 82 | 84 | } |
| 83 | 85 | return true; |
| 84 | 86 | } |
| 85 | 87 | |
| | 88 | + public function getRcComment() { |
| | 89 | + $rcComment = $this->actionText; |
| | 90 | + if( '' != $this->comment ) { |
| | 91 | + if ($rcComment == '') |
| | 92 | + $rcComment = $this->comment; |
| | 93 | + else |
| | 94 | + $rcComment .= ': ' . $this->comment; |
| | 95 | + } |
| | 96 | + return $rcComment; |
| | 97 | + } |
| | 98 | + |
| 86 | 99 | /** |
| 87 | 100 | * @static |
| 88 | 101 | */ |
| Index: branches/phase3_rev_deleted/includes/User.php |
| — | — | @@ -2149,6 +2149,17 @@ |
| 2150 | 2150 | return $this->mBlock && $this->mBlock->mCreateAccount; |
| 2151 | 2151 | } |
| 2152 | 2152 | |
| | 2153 | + /** |
| | 2154 | + * Determine if the user is blocked from using Special:Emailuser. |
| | 2155 | + * |
| | 2156 | + * @public |
| | 2157 | + * @return boolean |
| | 2158 | + */ |
| | 2159 | + function isBlockedFromEmailuser() { |
| | 2160 | + $this->getBlockedStatus(); |
| | 2161 | + return $this->mBlock && $this->mBlock->mBlockEmail; |
| | 2162 | + } |
| | 2163 | + |
| 2153 | 2164 | function isAllowedToCreateAccount() { |
| 2154 | 2165 | return $this->isAllowed( 'createaccount' ) && !$this->isBlockedFromCreateAccount(); |
| 2155 | 2166 | } |
| Index: branches/phase3_rev_deleted/includes/SpecialIpblocklist.php |
| — | — | @@ -265,7 +265,7 @@ |
| 266 | 266 | if( is_null( $msg ) ) { |
| 267 | 267 | $msg = array(); |
| 268 | 268 | $keys = array( 'infiniteblock', 'expiringblock', 'contribslink', 'unblocklink', |
| 269 | | - 'anononlyblock', 'createaccountblock', 'noautoblockblock' ); |
| | 269 | + 'anononlyblock', 'createaccountblock', 'noautoblockblock', 'emailblock' ); |
| 270 | 270 | foreach( $keys as $key ) { |
| 271 | 271 | $msg[$key] = wfMsgHtml( $key ); |
| 272 | 272 | } |
| — | — | @@ -306,6 +306,10 @@ |
| 307 | 307 | $properties[] = $msg['noautoblockblock']; |
| 308 | 308 | } |
| 309 | 309 | |
| | 310 | + if ( $block->mBlockEmail && $block->mUser ) { |
| | 311 | + $properties[] = $msg['emailblock']; |
| | 312 | + } |
| | 313 | + |
| 310 | 314 | $properties = implode( ', ', $properties ); |
| 311 | 315 | |
| 312 | 316 | $line = wfMsgReplaceArgs( $msg['blocklistline'], array( $formattedTime, $blocker, $target, $properties ) ); |
| Index: branches/phase3_rev_deleted/includes/SpecialLog.php |
| — | — | @@ -50,7 +50,26 @@ |
| 51 | 51 | $this->db = wfGetDB( DB_SLAVE ); |
| 52 | 52 | $this->setupQuery( $request ); |
| 53 | 53 | } |
| | 54 | + |
| | 55 | + /** |
| | 56 | + * Returns a row of log data |
| | 57 | + * @param Title $title |
| | 58 | + * @param integer $logid, optional |
| | 59 | + * @private |
| | 60 | + */ |
| | 61 | + function newRowFromTitle( $title, $logid ) { |
| | 62 | + $fname = 'LogReader::newFromTitle'; |
| 54 | 63 | |
| | 64 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 65 | + $row = $dbr->selectRow( 'logging', array('*'), |
| | 66 | + array('log_id' => intval( $logid ), |
| | 67 | + 'log_namespace' => $title->getNamespace(), |
| | 68 | + 'log_title' => $title->getDBkey() ), |
| | 69 | + $fname ); |
| | 70 | + |
| | 71 | + return $row; |
| | 72 | + } |
| | 73 | + |
| 55 | 74 | /** |
| 56 | 75 | * Basic setup and applies the limiting factors from the WebRequest object. |
| 57 | 76 | * @param WebRequest $request |
| — | — | @@ -74,7 +93,8 @@ |
| 75 | 94 | |
| 76 | 95 | // XXX This all needs to use Pager, ugly hack for now. |
| 77 | 96 | global $wgMiserMode; |
| 78 | | - if ($wgMiserMode && ($this->offset >10000)) $this->offset=10000; |
| | 97 | + if( $wgMiserMode ) |
| | 98 | + $this->offset = min( $this->offset, 10000 ); |
| 79 | 99 | } |
| 80 | 100 | |
| 81 | 101 | /** |
| — | — | @@ -236,29 +256,21 @@ |
| 237 | 257 | } |
| 238 | 258 | |
| 239 | 259 | /** |
| 240 | | - * Returns a row of log data |
| 241 | | - * @param Title $title |
| 242 | | - * @param integer $logid, optional |
| 243 | | - * @private |
| 244 | | - */ |
| 245 | | - function newFromTitle( $title, $logid=0 ) { |
| 246 | | - $fname = 'LogReader::newFromTitle'; |
| | 260 | + * Is there at least one row? |
| | 261 | + * |
| | 262 | + * @return bool |
| | 263 | + */ |
| | 264 | + public function hasRows() { |
| | 265 | + # Little hack... |
| | 266 | + $limit = $this->limit; |
| | 267 | + $this->limit = 1; |
| | 268 | + $res = $this->db->query( $this->getQuery() ); |
| | 269 | + $this->limit = $limit; |
| | 270 | + $ret = $this->db->numRows( $res ) > 0; |
| | 271 | + $this->db->freeResult( $res ); |
| | 272 | + return $ret; |
| | 273 | + } |
| 247 | 274 | |
| 248 | | - $dbr = wfGetDB( DB_SLAVE ); |
| 249 | | - $res = $dbr->select( 'logging', array('*'), |
| 250 | | - array('log_id' => intval( $logid ), |
| 251 | | - 'log_namespace' => $title->getNamespace(), |
| 252 | | - 'log_title' => $title->getDBkey() ), |
| 253 | | - $fname ); |
| 254 | | - |
| 255 | | - if ( $res ) { |
| 256 | | - $ret = $dbr->fetchObject( $res ); |
| 257 | | - if ( $ret ) { |
| 258 | | - return $ret; |
| 259 | | - } |
| 260 | | - } |
| 261 | | - return null; |
| 262 | | - } |
| 263 | 275 | } |
| 264 | 276 | |
| 265 | 277 | /** |
| — | — | @@ -317,33 +329,6 @@ |
| 318 | 330 | } |
| 319 | 331 | } |
| 320 | 332 | |
| 321 | | - /** |
| 322 | | - * Determine if the current user is allowed to view a particular |
| 323 | | - * field of this event, if it's marked as deleted. |
| 324 | | - * @param int $field |
| 325 | | - * @return bool |
| 326 | | - */ |
| 327 | | - function userCan( $event, $field ) { |
| 328 | | - if( ( $event->log_deleted & $field ) == $field ) { |
| 329 | | - global $wgUser; |
| 330 | | - $permission = ( $event->log_deleted & Revision::DELETED_RESTRICTED ) == Revision::DELETED_RESTRICTED |
| 331 | | - ? 'hiderevision' |
| 332 | | - : 'deleterevision'; |
| 333 | | - wfDebug( "Checking for $permission due to $field match on $event->log_deleted\n" ); |
| 334 | | - return $wgUser->isAllowed( $permission ); |
| 335 | | - } else { |
| 336 | | - return true; |
| 337 | | - } |
| 338 | | - } |
| 339 | | - |
| 340 | | - /** |
| 341 | | - * int $field one of DELETED_* bitfield constants |
| 342 | | - * @return bool |
| 343 | | - */ |
| 344 | | - function isDeleted( $event, $field ) { |
| 345 | | - return ($event->log_deleted & $field) == $field; |
| 346 | | - } |
| 347 | | - |
| 348 | 333 | /** |
| 349 | 334 | * Fetch event's user id if it's available to all users |
| 350 | 335 | * @return int |
| — | — | @@ -478,13 +463,25 @@ |
| 479 | 464 | } |
| 480 | 465 | |
| 481 | 466 | function doShowList( &$out, $result ) { |
| | 467 | + global $wgLang; |
| | 468 | + |
| | 469 | + $lastdate = ''; |
| | 470 | + $listopen = false; |
| 482 | 471 | // Rewind result pointer and go through it again, making the HTML |
| 483 | | - $html = "\n<ul>\n"; |
| | 472 | + $html = ''; |
| 484 | 473 | $result->seek( 0 ); |
| 485 | 474 | while( $s = $result->fetchObject() ) { |
| 486 | | - $html .= $this->logLine( $s ); |
| | 475 | + $date = $wgLang->date( $s->log_timestamp, /* adj */ true ); |
| | 476 | + if ( $date != $lastdate ) { |
| | 477 | + if ( $listopen ) { $html .= Xml::closeElement( 'ul' ); } |
| | 478 | + $html .= Xml::element('h4', null, $date) . "\n"; |
| | 479 | + $html .= Xml::openElement( 'ul' ); |
| | 480 | + $listopen = true; |
| | 481 | + $lastdate = $date; |
| | 482 | + } |
| | 483 | + $html .= Xml::tags('li', null, $this->logLine( $s ) ) . "\n"; |
| 487 | 484 | } |
| 488 | | - $html .= "\n</ul>\n"; |
| | 485 | + if ( $listopen ) { $html .= Xml::closeElement( 'ul' ); } |
| 489 | 486 | $out->addHTML( $html ); |
| 490 | 487 | $result->free(); |
| 491 | 488 | } |
| — | — | @@ -503,7 +500,7 @@ |
| 504 | 501 | |
| 505 | 502 | $skin = $wgUser->getSkin(); |
| 506 | 503 | $title = Title::makeTitle( $s->log_namespace, $s->log_title ); |
| 507 | | - $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $s->log_timestamp), true ); |
| | 504 | + $time = $wgLang->time( wfTimestamp(TS_MW, $s->log_timestamp), true ); |
| 508 | 505 | |
| 509 | 506 | // Enter the existence or non-existence of this page into the link cache, |
| 510 | 507 | // for faster makeLinkObj() in LogPage::actionText() |
| — | — | @@ -535,7 +532,7 @@ |
| 536 | 533 | else |
| 537 | 534 | $action = $this->logActionText( $s->log_type, $s->log_action, $title, $this->skin, $paramArray ); |
| 538 | 535 | |
| 539 | | - $out = "<li><tt>$del</tt> $time $userLink $action $comment $revert</li>\n"; |
| | 536 | + $out = "<tt>$del</tt> $time $userLink $action $comment $revert"; |
| 540 | 537 | return $out; |
| 541 | 538 | } |
| 542 | 539 | |
| — | — | @@ -580,7 +577,7 @@ |
| 581 | 578 | if( $s->log_type == 'move' && isset( $paramArray[0] ) ) { |
| 582 | 579 | $destTitle = Title::newFromText( $paramArray[0] ); |
| 583 | 580 | if ( $destTitle ) { |
| 584 | | - $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ), |
| | 581 | + $reviewlink = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ), |
| 585 | 582 | wfMsg( 'revertmove' ), |
| 586 | 583 | 'wpOldTitle=' . urlencode( $destTitle->getPrefixedDBkey() ) . |
| 587 | 584 | '&wpNewTitle=' . urlencode( $title->getPrefixedDBkey() ) . |
| — | — | @@ -598,13 +595,14 @@ |
| 599 | 596 | wfMsg( 'unblocklink' ), |
| 600 | 597 | 'action=unblock&ip=' . urlencode( $s->log_title ) ); |
| 601 | 598 | // show change protection link |
| 602 | | - } elseif( $s->log_action == 'protect' && $wgUser->isAllowed( 'protect' ) ) { |
| | 599 | + } elseif( ($s->log_action == 'protect' || $s->log_action == 'modify') && $wgUser->isAllowed( 'protect' ) ) { |
| | 600 | + $title = Title::makeTitle( $s->log_namespace, $s->log_title ); |
| 603 | 601 | $reviewlink = $this->skin->makeKnownLink( $title->getPrefixedDBkey() , |
| 604 | 602 | wfMsg( 'protect_change' ), |
| 605 | 603 | 'action=unprotect' ); |
| 606 | 604 | // show user tool links for self created users |
| 607 | 605 | } elseif( $s->log_action == 'create2' ) { |
| 608 | | - $revert = $this->skin->userToolLinksRedContribs( $s->log_user, $s->log_title ); |
| | 606 | + $reviewlink = $this->skin->userToolLinksRedContribs( $s->log_user, $s->log_title ); |
| 609 | 607 | // do not show $comment for self created accounts. It includes wrong user tool links: |
| 610 | 608 | // 'blockip' for users w/o block allowance and broken links for very long usernames (bug 4756) |
| 611 | 609 | $comment = ''; |
| — | — | @@ -644,11 +642,11 @@ |
| 645 | 643 | $Ids = explode( ',', $paramArray[2] ); |
| 646 | 644 | foreach ( $Ids as $n => $id ) { |
| 647 | 645 | $reviewlink .= ' '.$this->skin->makeKnownLinkObj( $revdel, '#'.($n+1), |
| 648 | | - wfArrayToCGI( array('target' => $paramArray[0], $paramArray[1] => $id ) ) ); |
| | 646 | + wfArrayToCGI( array('target' => $paramArray[0], $paramArray[1] => $id ) ) ); |
| 649 | 647 | } |
| 650 | 648 | } |
| 651 | 649 | } |
| 652 | | - $reviewlink = ( $reviewlink=='' ) ? "" : " ($reviewlink) "; |
| | 650 | + $reviewlink = ($reviewlink=='') ? "" : " ($reviewlink) "; |
| 653 | 651 | return $reviewlink; |
| 654 | 652 | } |
| 655 | 653 | |
| — | — | @@ -772,6 +770,33 @@ |
| 773 | 771 | $this->numResults < $limit); |
| 774 | 772 | $out->addHTML( '<p>' . $html . '</p>' ); |
| 775 | 773 | } |
| | 774 | + |
| | 775 | + /** |
| | 776 | + * Determine if the current user is allowed to view a particular |
| | 777 | + * field of this event, if it's marked as deleted. |
| | 778 | + * @param int $field |
| | 779 | + * @return bool |
| | 780 | + */ |
| | 781 | + public static function userCan( $event, $field ) { |
| | 782 | + if( ( $event->log_deleted & $field ) == $field ) { |
| | 783 | + global $wgUser; |
| | 784 | + $permission = ( $event->log_deleted & Revision::DELETED_RESTRICTED ) == Revision::DELETED_RESTRICTED |
| | 785 | + ? 'hiderevision' |
| | 786 | + : 'deleterevision'; |
| | 787 | + wfDebug( "Checking for $permission due to $field match on $event->log_deleted\n" ); |
| | 788 | + return $wgUser->isAllowed( $permission ); |
| | 789 | + } else { |
| | 790 | + return true; |
| | 791 | + } |
| | 792 | + } |
| | 793 | + |
| | 794 | + /** |
| | 795 | + * int $field one of DELETED_* bitfield constants |
| | 796 | + * @return bool |
| | 797 | + */ |
| | 798 | + public static function isDeleted( $event, $field ) { |
| | 799 | + return ($event->log_deleted & $field) == $field; |
| | 800 | + } |
| 776 | 801 | } |
| 777 | 802 | |
| 778 | 803 | /** |
| Index: branches/phase3_rev_deleted/includes/SpecialUpload.php |
| — | — | @@ -22,18 +22,19 @@ |
| 23 | 23 | /**#@+ |
| 24 | 24 | * @access private |
| 25 | 25 | */ |
| 26 | | - var $mUploadFile, $mUploadDescription, $mLicense ,$mIgnoreWarning, $mUploadError; |
| 27 | | - var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion; |
| 28 | | - var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload; |
| 29 | | - var $mOname, $mSessionKey, $mStashed, $mDestFile, $mRemoveTempFile, $mSourceType; |
| 30 | | - var $mUploadTempFileSize = 0; |
| 31 | | - var $mImage; |
| | 26 | + var $mComment, $mLicense, $mIgnoreWarning, $mCurlError; |
| | 27 | + var $mDestName, $mTempPath, $mFileSize, $mFileProps; |
| | 28 | + var $mCopyrightStatus, $mCopyrightSource, $mReUpload, $mAction, $mUploadClicked; |
| | 29 | + var $mSrcName, $mSessionKey, $mStashed, $mDesiredDestName, $mRemoveTempFile, $mSourceType; |
| | 30 | + var $mCurlDestHandle; |
| | 31 | + var $mLocalFile; |
| 32 | 32 | |
| 33 | 33 | # Placeholders for text injection by hooks (must be HTML) |
| 34 | 34 | # extensions should take care to _append_ to the present value |
| 35 | 35 | var $uploadFormTextTop; |
| 36 | 36 | var $uploadFormTextAfterSummary; |
| 37 | 37 | |
| | 38 | + const SESSION_VERSION = 1; |
| 38 | 39 | /**#@-*/ |
| 39 | 40 | |
| 40 | 41 | /** |
| — | — | @@ -43,7 +44,7 @@ |
| 44 | 45 | */ |
| 45 | 46 | function UploadForm( &$request ) { |
| 46 | 47 | global $wgAllowCopyUploads; |
| 47 | | - $this->mDestFile = $request->getText( 'wpDestFile' ); |
| | 48 | + $this->mDesiredDestName = $request->getText( 'wpDestFile' ); |
| 48 | 49 | |
| 49 | 50 | if( !$request->wasPosted() ) { |
| 50 | 51 | # GET requests just give the main form; no data except wpDestfile. |
| — | — | @@ -56,21 +57,22 @@ |
| 57 | 58 | |
| 58 | 59 | $this->mIgnoreWarning = $request->getCheck( 'wpIgnoreWarning' ); |
| 59 | 60 | $this->mReUpload = $request->getCheck( 'wpReUpload' ); |
| 60 | | - $this->mUpload = $request->getCheck( 'wpUpload' ); |
| | 61 | + $this->mUploadClicked = $request->getCheck( 'wpUpload' ); |
| 61 | 62 | |
| 62 | | - $this->mUploadDescription = $request->getText( 'wpUploadDescription' ); |
| | 63 | + $this->mComment = $request->getText( 'wpUploadDescription' ); |
| 63 | 64 | $this->mLicense = $request->getText( 'wpLicense' ); |
| 64 | | - $this->mUploadCopyStatus = $request->getText( 'wpUploadCopyStatus' ); |
| 65 | | - $this->mUploadSource = $request->getText( 'wpUploadSource' ); |
| | 65 | + $this->mCopyrightStatus = $request->getText( 'wpUploadCopyStatus' ); |
| | 66 | + $this->mCopyrightSource = $request->getText( 'wpUploadSource' ); |
| 66 | 67 | $this->mWatchthis = $request->getBool( 'wpWatchthis' ); |
| 67 | | - $this->mSourceType = $request->getText( 'wpSourceType' ); |
| | 68 | + $this->mSourceType = $request->getText( 'wpSourceType' ); |
| 68 | 69 | wfDebug( "UploadForm: watchthis is: '$this->mWatchthis'\n" ); |
| 69 | 70 | |
| 70 | 71 | $this->mAction = $request->getVal( 'action' ); |
| 71 | 72 | |
| 72 | 73 | $this->mSessionKey = $request->getInt( 'wpSessionKey' ); |
| 73 | 74 | if( !empty( $this->mSessionKey ) && |
| 74 | | - isset( $_SESSION['wsUploadData'][$this->mSessionKey] ) ) { |
| | 75 | + isset( $_SESSION['wsUploadData'][$this->mSessionKey]['version'] ) && |
| | 76 | + $_SESSION['wsUploadData'][$this->mSessionKey]['version'] == self::SESSION_VERSION ) { |
| 75 | 77 | /** |
| 76 | 78 | * Confirming a temporarily stashed upload. |
| 77 | 79 | * We don't want path names to be forged, so we keep |
| — | — | @@ -78,10 +80,11 @@ |
| 79 | 81 | * an opaque key to the user agent. |
| 80 | 82 | */ |
| 81 | 83 | $data = $_SESSION['wsUploadData'][$this->mSessionKey]; |
| 82 | | - $this->mUploadTempName = $data['mUploadTempName']; |
| 83 | | - $this->mUploadSize = $data['mUploadSize']; |
| 84 | | - $this->mOname = $data['mOname']; |
| 85 | | - $this->mUploadError = 0/*UPLOAD_ERR_OK*/; |
| | 84 | + $this->mTempPath = $data['mTempPath']; |
| | 85 | + $this->mFileSize = $data['mFileSize']; |
| | 86 | + $this->mSrcName = $data['mSrcName']; |
| | 87 | + $this->mFileProps = $data['mFileProps']; |
| | 88 | + $this->mCurlError = 0/*UPLOAD_ERR_OK*/; |
| 86 | 89 | $this->mStashed = true; |
| 87 | 90 | $this->mRemoveTempFile = false; |
| 88 | 91 | } else { |
| — | — | @@ -101,10 +104,11 @@ |
| 102 | 105 | * @access private |
| 103 | 106 | */ |
| 104 | 107 | function initializeFromUpload( $request ) { |
| 105 | | - $this->mUploadTempName = $request->getFileTempName( 'wpUploadFile' ); |
| 106 | | - $this->mUploadSize = $request->getFileSize( 'wpUploadFile' ); |
| 107 | | - $this->mOname = $request->getFileName( 'wpUploadFile' ); |
| 108 | | - $this->mUploadError = $request->getUploadError( 'wpUploadFile' ); |
| | 108 | + $this->mTempPath = $request->getFileTempName( 'wpUploadFile' ); |
| | 109 | + $this->mFileSize = $request->getFileSize( 'wpUploadFile' ); |
| | 110 | + $this->mSrcName = $request->getFileName( 'wpUploadFile' ); |
| | 111 | + $this->mCurlError = $request->getUploadError( 'wpUploadFile' ); |
| | 112 | + $this->mFileProps = File::getPropsFromPath( $this->mTempPath ); |
| 109 | 113 | $this->mSessionKey = false; |
| 110 | 114 | $this->mStashed = false; |
| 111 | 115 | $this->mRemoveTempFile = false; // PHP will handle this |
| — | — | @@ -119,10 +123,10 @@ |
| 120 | 124 | $url = $request->getText( 'wpUploadFileURL' ); |
| 121 | 125 | $local_file = tempnam( $wgTmpDirectory, 'WEBUPLOAD' ); |
| 122 | 126 | |
| 123 | | - $this->mUploadTempName = $local_file; |
| 124 | | - $this->mUploadError = $this->curlCopy( $url, $local_file ); |
| 125 | | - $this->mUploadSize = $this->mUploadTempFileSize; |
| 126 | | - $this->mOname = array_pop( explode( '/', $url ) ); |
| | 127 | + $this->mTempPath = $local_file; |
| | 128 | + $this->mFileSize = 0; # Will be set by curlCopy |
| | 129 | + $this->mCurlError = $this->curlCopy( $url, $local_file ); |
| | 130 | + $this->mSrcName = array_pop( explode( '/', $url ) ); |
| 127 | 131 | $this->mSessionKey = false; |
| 128 | 132 | $this->mStashed = false; |
| 129 | 133 | |
| — | — | @@ -151,8 +155,8 @@ |
| 152 | 156 | } |
| 153 | 157 | |
| 154 | 158 | # Open temporary file |
| 155 | | - $this->mUploadTempFile = @fopen( $this->mUploadTempName, "wb" ); |
| 156 | | - if( $this->mUploadTempFile === false ) { |
| | 159 | + $this->mCurlDestHandle = @fopen( $this->mTempPath, "wb" ); |
| | 160 | + if( $this->mCurlDestHandle === false ) { |
| 157 | 161 | # Could not open temporary file to write in |
| 158 | 162 | $wgOut->errorPage( 'upload-file-error', 'upload-file-error-text'); |
| 159 | 163 | return true; |
| — | — | @@ -170,8 +174,8 @@ |
| 171 | 175 | // if ( $error ) print curl_error ( $ch ) ; # Debugging output |
| 172 | 176 | curl_close( $ch ); |
| 173 | 177 | |
| 174 | | - fclose( $this->mUploadTempFile ); |
| 175 | | - unset( $this->mUploadTempFile ); |
| | 178 | + fclose( $this->mCurlDestHandle ); |
| | 179 | + unset( $this->mCurlDestHandle ); |
| 176 | 180 | if( $error ) { |
| 177 | 181 | unlink( $dest ); |
| 178 | 182 | if( wfEmptyMsg( "upload-curl-error$errornum", wfMsg("upload-curl-error$errornum") ) ) |
| — | — | @@ -192,11 +196,11 @@ |
| 193 | 197 | function uploadCurlCallback( $ch, $data ) { |
| 194 | 198 | global $wgMaxUploadSize; |
| 195 | 199 | $length = strlen( $data ); |
| 196 | | - $this->mUploadTempFileSize += $length; |
| 197 | | - if( $this->mUploadTempFileSize > $wgMaxUploadSize ) { |
| | 200 | + $this->mFileSize += $length; |
| | 201 | + if( $this->mFileSize > $wgMaxUploadSize ) { |
| 198 | 202 | return 0; |
| 199 | 203 | } |
| 200 | | - fwrite( $this->mUploadTempFile, $data ); |
| | 204 | + fwrite( $this->mCurlDestHandle, $data ); |
| 201 | 205 | return $length; |
| 202 | 206 | } |
| 203 | 207 | |
| — | — | @@ -206,11 +210,11 @@ |
| 207 | 211 | */ |
| 208 | 212 | function execute() { |
| 209 | 213 | global $wgUser, $wgOut; |
| 210 | | - global $wgEnableUploads, $wgUploadDirectory; |
| | 214 | + global $wgEnableUploads; |
| 211 | 215 | |
| 212 | 216 | # Check uploading enabled |
| 213 | 217 | if( !$wgEnableUploads ) { |
| 214 | | - $wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext', array( $this->mDestFile ) ); |
| | 218 | + $wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext', array( $this->mDesiredDestName ) ); |
| 215 | 219 | return; |
| 216 | 220 | } |
| 217 | 221 | |
| — | — | @@ -235,18 +239,12 @@ |
| 236 | 240 | return; |
| 237 | 241 | } |
| 238 | 242 | |
| 239 | | - /** Check if the image directory is writeable, this is a common mistake */ |
| 240 | | - if( !is_writeable( $wgUploadDirectory ) ) { |
| 241 | | - $wgOut->addWikiText( wfMsg( 'upload_directory_read_only', $wgUploadDirectory ) ); |
| 242 | | - return; |
| 243 | | - } |
| 244 | | - |
| 245 | 243 | if( $this->mReUpload ) { |
| 246 | 244 | if( !$this->unsaveUploadedFile() ) { |
| 247 | 245 | return; |
| 248 | 246 | } |
| 249 | 247 | $this->mainUploadForm(); |
| 250 | | - } else if( 'submit' == $this->mAction || $this->mUpload ) { |
| | 248 | + } else if( 'submit' == $this->mAction || $this->mUploadClicked ) { |
| 251 | 249 | $this->processUpload(); |
| 252 | 250 | } else { |
| 253 | 251 | $this->mainUploadForm(); |
| — | — | @@ -272,7 +270,7 @@ |
| 273 | 271 | } |
| 274 | 272 | |
| 275 | 273 | /* Check for PHP error if any, requires php 4.2 or newer */ |
| 276 | | - if( $this->mUploadError == 1/*UPLOAD_ERR_INI_SIZE*/ ) { |
| | 274 | + if( $this->mCurlError == 1/*UPLOAD_ERR_INI_SIZE*/ ) { |
| 277 | 275 | $this->mainUploadForm( wfMsgHtml( 'largefileserver' ) ); |
| 278 | 276 | return; |
| 279 | 277 | } |
| — | — | @@ -280,16 +278,16 @@ |
| 281 | 279 | /** |
| 282 | 280 | * If there was no filename or a zero size given, give up quick. |
| 283 | 281 | */ |
| 284 | | - if( trim( $this->mOname ) == '' || empty( $this->mUploadSize ) ) { |
| | 282 | + if( trim( $this->mSrcName ) == '' || empty( $this->mFileSize ) ) { |
| 285 | 283 | $this->mainUploadForm( wfMsgHtml( 'emptyfile' ) ); |
| 286 | 284 | return; |
| 287 | 285 | } |
| 288 | 286 | |
| 289 | 287 | # Chop off any directories in the given filename |
| 290 | | - if( $this->mDestFile ) { |
| 291 | | - $basename = wfBaseName( $this->mDestFile ); |
| | 288 | + if( $this->mDesiredDestName ) { |
| | 289 | + $basename = wfBaseName( $this->mDesiredDestName ); |
| 292 | 290 | } else { |
| 293 | | - $basename = wfBaseName( $this->mOname ); |
| | 291 | + $basename = wfBaseName( $this->mSrcName ); |
| 294 | 292 | } |
| 295 | 293 | |
| 296 | 294 | /** |
| — | — | @@ -321,26 +319,26 @@ |
| 322 | 320 | * out of it. We'll strip some silently that Title would die on. |
| 323 | 321 | */ |
| 324 | 322 | $filtered = preg_replace ( "/[^".Title::legalChars()."]|:/", '-', $basename ); |
| 325 | | - $nt = Title::newFromText( $filtered ); |
| | 323 | + $nt = Title::makeTitleSafe( NS_IMAGE, $filtered ); |
| 326 | 324 | if( is_null( $nt ) ) { |
| 327 | 325 | $this->uploadError( wfMsgWikiHtml( 'illegalfilename', htmlspecialchars( $filtered ) ) ); |
| 328 | 326 | return; |
| 329 | 327 | } |
| 330 | | - $nt =& Title::makeTitle( NS_IMAGE, $nt->getDBkey() ); |
| 331 | | - $this->mUploadSaveName = $nt->getDBkey(); |
| | 328 | + $this->mLocalFile = wfLocalFile( $nt ); |
| | 329 | + $this->mDestName = $this->mLocalFile->getName(); |
| 332 | 330 | |
| 333 | 331 | /** |
| 334 | 332 | * If the image is protected, non-sysop users won't be able |
| 335 | 333 | * to modify it by uploading a new revision. |
| 336 | 334 | */ |
| 337 | | - if( !$nt->userCan( 'edit' ) ) { |
| | 335 | + if( !$nt->userCan( 'edit' ) || !$nt->userCan( 'upload' ) ) { |
| 338 | 336 | return $this->uploadError( wfMsgWikiHtml( 'protectedpage' ) ); |
| 339 | 337 | } |
| 340 | 338 | |
| 341 | 339 | /** |
| 342 | 340 | * In some cases we may forbid overwriting of existing files. |
| 343 | 341 | */ |
| 344 | | - $overwrite = $this->checkOverwrite( $this->mUploadSaveName ); |
| | 342 | + $overwrite = $this->checkOverwrite( $this->mDestName ); |
| 345 | 343 | if( WikiError::isError( $overwrite ) ) { |
| 346 | 344 | return $this->uploadError( $overwrite->toString() ); |
| 347 | 345 | } |
| — | — | @@ -351,9 +349,9 @@ |
| 352 | 350 | if ($finalExt == '') { |
| 353 | 351 | return $this->uploadError( wfMsgExt( 'filetype-missing', array ( 'parseinline' ) ) ); |
| 354 | 352 | } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) || |
| 355 | | - ($wgStrictFileExtensions && |
| 356 | | - !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) { |
| 357 | | - return $this->uploadError( wfMsgExt( 'filetype-badtype', array ( 'parseinline' ), htmlspecialchars( $finalExt ), implode ( ', ', $wgFileExtensions ) ) ); |
| | 353 | + ($wgStrictFileExtensions && !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) { |
| | 354 | + return $this->uploadError( wfMsgExt( 'filetype-badtype', array ( 'parseinline' ), |
| | 355 | + htmlspecialchars( $finalExt ), implode ( ', ', $wgFileExtensions ) ) ); |
| 358 | 356 | } |
| 359 | 357 | |
| 360 | 358 | /** |
| — | — | @@ -363,22 +361,23 @@ |
| 364 | 362 | */ |
| 365 | 363 | if( !$this->mStashed ) { |
| 366 | 364 | $this->checkMacBinary(); |
| 367 | | - $veri = $this->verify( $this->mUploadTempName, $finalExt ); |
| | 365 | + $veri = $this->verify( $this->mTempPath, $finalExt ); |
| 368 | 366 | |
| 369 | 367 | if( $veri !== true ) { //it's a wiki error... |
| 370 | 368 | return $this->uploadError( $veri->toString() ); |
| 371 | 369 | } |
| 372 | | - } |
| 373 | 370 | |
| 374 | | - /** |
| 375 | | - * Provide an opportunity for extensions to add futher checks |
| 376 | | - */ |
| 377 | | - $error = ''; |
| 378 | | - if( !wfRunHooks( 'UploadVerification', |
| 379 | | - array( $this->mUploadSaveName, $this->mUploadTempName, &$error ) ) ) { |
| 380 | | - return $this->uploadError( $error ); |
| | 371 | + /** |
| | 372 | + * Provide an opportunity for extensions to add futher checks |
| | 373 | + */ |
| | 374 | + $error = ''; |
| | 375 | + if( !wfRunHooks( 'UploadVerification', |
| | 376 | + array( $this->mDestName, $this->mTempPath, &$error ) ) ) { |
| | 377 | + return $this->uploadError( $error ); |
| | 378 | + } |
| 381 | 379 | } |
| 382 | 380 | |
| | 381 | + |
| 383 | 382 | /** |
| 384 | 383 | * Check for non-fatal conditions |
| 385 | 384 | */ |
| — | — | @@ -389,31 +388,31 @@ |
| 390 | 389 | if( $wgCapitalLinks ) { |
| 391 | 390 | $filtered = ucfirst( $filtered ); |
| 392 | 391 | } |
| 393 | | - if( $this->mUploadSaveName != $filtered ) { |
| 394 | | - $warning .= '<li>'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>'; |
| | 392 | + if( $this->mDestName != $filtered ) { |
| | 393 | + $warning .= '<li>'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mDestName ) ).'</li>'; |
| 395 | 394 | } |
| 396 | 395 | |
| 397 | 396 | global $wgCheckFileExtensions; |
| 398 | 397 | if ( $wgCheckFileExtensions ) { |
| 399 | 398 | if ( ! $this->checkFileExtension( $finalExt, $wgFileExtensions ) ) { |
| 400 | | - $warning .= '<li>'.wfMsgExt( 'filetype-badtype', array ( 'parseinline' ), htmlspecialchars( $finalExt ), implode ( ', ', $wgFileExtensions ) ).'</li>'; |
| | 399 | + $warning .= '<li>'.wfMsgExt( 'filetype-badtype', array ( 'parseinline' ), |
| | 400 | + htmlspecialchars( $finalExt ), implode ( ', ', $wgFileExtensions ) ).'</li>'; |
| 401 | 401 | } |
| 402 | 402 | } |
| 403 | 403 | |
| 404 | 404 | global $wgUploadSizeWarning; |
| 405 | | - if ( $wgUploadSizeWarning && ( $this->mUploadSize > $wgUploadSizeWarning ) ) { |
| | 405 | + if ( $wgUploadSizeWarning && ( $this->mFileSize > $wgUploadSizeWarning ) ) { |
| 406 | 406 | $skin = $wgUser->getSkin(); |
| 407 | 407 | $wsize = $skin->formatSize( $wgUploadSizeWarning ); |
| 408 | | - $asize = $skin->formatSize( $this->mUploadSize ); |
| | 408 | + $asize = $skin->formatSize( $this->mFileSize ); |
| 409 | 409 | $warning .= '<li>' . wfMsgHtml( 'large-file', $wsize, $asize ) . '</li>'; |
| 410 | 410 | } |
| 411 | | - if ( $this->mUploadSize == 0 ) { |
| | 411 | + if ( $this->mFileSize == 0 ) { |
| 412 | 412 | $warning .= '<li>'.wfMsgHtml( 'emptyfile' ).'</li>'; |
| 413 | 413 | } |
| 414 | 414 | |
| 415 | 415 | global $wgUser; |
| 416 | 416 | $sk = $wgUser->getSkin(); |
| 417 | | - $image = wfLocalFile( $nt ); |
| 418 | 417 | |
| 419 | 418 | // Check for uppercase extension. We allow these filenames but check if an image |
| 420 | 419 | // with lowercase extension exists already |
| — | — | @@ -422,13 +421,15 @@ |
| 423 | 422 | $image_lc = wfLocalFile( $nt_lc ); |
| 424 | 423 | } |
| 425 | 424 | |
| 426 | | - if( $image->exists() ) { |
| | 425 | + if( $this->mLocalFile->exists() ) { |
| 427 | 426 | $dlink = $sk->makeKnownLinkObj( $nt ); |
| 428 | | - if ( $image->allowInlineDisplay() ) { |
| 429 | | - $dlink2 = $sk->makeImageLinkObj( $nt, wfMsgExt( 'fileexists-thumb', 'parseinline', $dlink ), $nt->getText(), 'right', array(), false, true ); |
| 430 | | - } elseif ( !$image->allowInlineDisplay() && $image->isSafeFile() ) { |
| 431 | | - $icon = $image->iconThumb(); |
| 432 | | - $dlink2 = '<div style="float:right" id="mw-media-icon"><a href="' . $image->getURL() . '">' . $icon->toHtml() . '</a><br />' . $dlink . '</div>'; |
| | 427 | + if ( $this->mLocalFile->allowInlineDisplay() ) { |
| | 428 | + $dlink2 = $sk->makeImageLinkObj( $nt, wfMsgExt( 'fileexists-thumb', 'parseinline', $dlink ), |
| | 429 | + $nt->getText(), 'right', array(), false, true ); |
| | 430 | + } elseif ( !$this->mLocalFile->allowInlineDisplay() && $this->mLocalFile->isSafeFile() ) { |
| | 431 | + $icon = $this->mLocalFile->iconThumb(); |
| | 432 | + $dlink2 = '<div style="float:right" id="mw-media-icon"><a href="' . $this->mLocalFile->getURL() . '">' . |
| | 433 | + $icon->toHtml() . '</a><br />' . $dlink . '</div>'; |
| 433 | 434 | } else { |
| 434 | 435 | $dlink2 = ''; |
| 435 | 436 | } |
| — | — | @@ -440,17 +441,22 @@ |
| 441 | 442 | # It's not forbidden but in 99% it makes no sense to upload the same filename with uppercase extension |
| 442 | 443 | $dlink = $sk->makeKnownLinkObj( $nt_lc ); |
| 443 | 444 | if ( $image_lc->allowInlineDisplay() ) { |
| 444 | | - $dlink2 = $sk->makeImageLinkObj( $nt_lc, wfMsgExt( 'fileexists-thumb', 'parseinline', $dlink ), $nt_lc->getText(), 'right', array(), false, true ); |
| | 445 | + $dlink2 = $sk->makeImageLinkObj( $nt_lc, wfMsgExt( 'fileexists-thumb', 'parseinline', $dlink ), |
| | 446 | + $nt_lc->getText(), 'right', array(), false, true ); |
| 445 | 447 | } elseif ( !$image_lc->allowInlineDisplay() && $image_lc->isSafeFile() ) { |
| 446 | 448 | $icon = $image_lc->iconThumb(); |
| 447 | | - $dlink2 = '<div style="float:right" id="mw-media-icon"><a href="' . $image_lc->getURL() . '">' . $icon->toHtml() . '</a><br />' . $dlink . '</div>'; |
| | 449 | + $dlink2 = '<div style="float:right" id="mw-media-icon"><a href="' . $image_lc->getURL() . '">' . |
| | 450 | + $icon->toHtml() . '</a><br />' . $dlink . '</div>'; |
| 448 | 451 | } else { |
| 449 | 452 | $dlink2 = ''; |
| 450 | 453 | } |
| 451 | 454 | |
| 452 | | - $warning .= '<li>' . wfMsgExt( 'fileexists-extension', 'parsemag' , $partname . '.' . $finalExt , $dlink ) . '</li>' . $dlink2; |
| | 455 | + $warning .= '<li>' . wfMsgExt( 'fileexists-extension', 'parsemag' , $partname . '.' |
| | 456 | + . $finalExt , $dlink ) . '</li>' . $dlink2; |
| 453 | 457 | |
| 454 | | - } elseif ( ( substr( $partname , 3, 3 ) == 'px-' || substr( $partname , 2, 3 ) == 'px-' ) && ereg( "[0-9]{2}" , substr( $partname , 0, 2) ) ) { |
| | 458 | + } elseif ( ( substr( $partname , 3, 3 ) == 'px-' || substr( $partname , 2, 3 ) == 'px-' ) |
| | 459 | + && ereg( "[0-9]{2}" , substr( $partname , 0, 2) ) ) |
| | 460 | + { |
| 455 | 461 | # Check for filenames like 50px- or 180px-, these are mostly thumbnails |
| 456 | 462 | $nt_thb = Title::newFromText( substr( $partname , strpos( $partname , '-' ) +1 ) . '.' . $finalExt ); |
| 457 | 463 | $image_thb = wfLocalFile( $nt_thb ); |
| — | — | @@ -458,26 +464,34 @@ |
| 459 | 465 | # Check if an image without leading '180px-' (or similiar) exists |
| 460 | 466 | $dlink = $sk->makeKnownLinkObj( $nt_thb); |
| 461 | 467 | if ( $image_thb->allowInlineDisplay() ) { |
| 462 | | - $dlink2 = $sk->makeImageLinkObj( $nt_thb, wfMsgExt( 'fileexists-thumb', 'parseinline', $dlink ), $nt_thb->getText(), 'right', array(), false, true ); |
| | 468 | + $dlink2 = $sk->makeImageLinkObj( $nt_thb, |
| | 469 | + wfMsgExt( 'fileexists-thumb', 'parseinline', $dlink ), |
| | 470 | + $nt_thb->getText(), 'right', array(), false, true ); |
| 463 | 471 | } elseif ( !$image_thb->allowInlineDisplay() && $image_thb->isSafeFile() ) { |
| 464 | 472 | $icon = $image_thb->iconThumb(); |
| 465 | | - $dlink2 = '<div style="float:right" id="mw-media-icon"><a href="' . $image_thb->getURL() . '">' . $icon->toHtml() . '</a><br />' . $dlink . '</div>'; |
| | 473 | + $dlink2 = '<div style="float:right" id="mw-media-icon"><a href="' . |
| | 474 | + $image_thb->getURL() . '">' . $icon->toHtml() . '</a><br />' . |
| | 475 | + $dlink . '</div>'; |
| 466 | 476 | } else { |
| 467 | 477 | $dlink2 = ''; |
| 468 | 478 | } |
| 469 | 479 | |
| 470 | | - $warning .= '<li>' . wfMsgExt( 'fileexists-thumbnail-yes', 'parsemag', $dlink ) . '</li>' . $dlink2; |
| | 480 | + $warning .= '<li>' . wfMsgExt( 'fileexists-thumbnail-yes', 'parsemag', $dlink ) . |
| | 481 | + '</li>' . $dlink2; |
| 471 | 482 | } else { |
| 472 | 483 | # Image w/o '180px-' does not exists, but we do not like these filenames |
| 473 | | - $warning .= '<li>' . wfMsgExt( 'file-thumbnail-no', 'parseinline' , substr( $partname , 0, strpos( $partname , '-' ) +1 ) ) . '</li>'; |
| | 484 | + $warning .= '<li>' . wfMsgExt( 'file-thumbnail-no', 'parseinline' , |
| | 485 | + substr( $partname , 0, strpos( $partname , '-' ) +1 ) ) . '</li>'; |
| 474 | 486 | } |
| 475 | 487 | } |
| 476 | | - if ( $image->wasDeleted() ) { |
| | 488 | + if ( $this->mLocalFile->wasDeleted() ) { |
| 477 | 489 | # If the file existed before and was deleted, warn the user of this |
| 478 | 490 | # Don't bother doing so if the image exists now, however |
| 479 | 491 | $ltitle = SpecialPage::getTitleFor( 'Log' ); |
| 480 | | - $llink = $sk->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ), 'type=delete&page=' . $nt->getPrefixedUrl() ); |
| 481 | | - $warning .= wfOpenElement( 'li' ) . wfMsgWikiHtml( 'filewasdeleted', $llink ) . wfCloseElement( 'li' ); |
| | 492 | + $llink = $sk->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ), |
| | 493 | + 'type=delete&page=' . $nt->getPrefixedUrl() ); |
| | 494 | + $warning .= wfOpenElement( 'li' ) . wfMsgWikiHtml( 'filewasdeleted', $llink ) . |
| | 495 | + wfCloseElement( 'li' ); |
| 482 | 496 | } |
| 483 | 497 | |
| 484 | 498 | if( $warning != '' ) { |
| — | — | @@ -493,59 +507,24 @@ |
| 494 | 508 | * Try actually saving the thing... |
| 495 | 509 | * It will show an error form on failure. |
| 496 | 510 | */ |
| 497 | | - $hasBeenMunged = !empty( $this->mSessionKey ) || $this->mRemoveTempFile; |
| 498 | | - if( $this->saveUploadedFile( $this->mUploadSaveName, |
| 499 | | - $this->mUploadTempName, |
| 500 | | - $hasBeenMunged ) ) { |
| 501 | | - /** |
| 502 | | - * Update the upload log and create the description page |
| 503 | | - * if it's a new file. |
| 504 | | - */ |
| 505 | | - $this->mImage = wfLocalFile( $this->mUploadSaveName ); |
| 506 | | - $success = $this->mImage->recordUpload( $this->mUploadOldVersion, |
| 507 | | - $this->mUploadDescription, |
| 508 | | - $this->mLicense, |
| 509 | | - $this->mUploadCopyStatus, |
| 510 | | - $this->mUploadSource, |
| 511 | | - $this->mWatchthis ); |
| | 511 | + $pageText = self::getInitialPageText( $this->mComment, $this->mLicense, |
| | 512 | + $this->mCopyrightStatus, $this->mCopyrightSource ); |
| 512 | 513 | |
| 513 | | - if ( $success ) { |
| 514 | | - $this->showSuccess(); |
| 515 | | - wfRunHooks( 'UploadComplete', array( &$img ) ); |
| 516 | | - } else { |
| 517 | | - // File::recordUpload() fails if the image went missing, which is |
| 518 | | - // unlikely, hence the lack of a specialised message |
| 519 | | - $wgOut->showFileNotFoundError( $this->mUploadSaveName ); |
| | 514 | + $error = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText, |
| | 515 | + File::DELETE_SOURCE, $this->mFileProps ); |
| | 516 | + if ( WikiError::isError( $error ) ) { |
| | 517 | + $this->showError( $error ); |
| | 518 | + } else { |
| | 519 | + if ( $this->mWatchthis ) { |
| | 520 | + global $wgUser; |
| | 521 | + $wgUser->addWatch( $this->mLocalFile->getTitle() ); |
| 520 | 522 | } |
| | 523 | + $this->showSuccess(); |
| | 524 | + wfRunHooks( 'UploadComplete', array( &$img ) ); |
| 521 | 525 | } |
| 522 | 526 | } |
| 523 | 527 | |
| 524 | 528 | /** |
| 525 | | - * Move the uploaded file from its temporary location to the final |
| 526 | | - * destination. If a previous version of the file exists, move |
| 527 | | - * it into the archive subdirectory. |
| 528 | | - * |
| 529 | | - * @todo If the later save fails, we may have disappeared the original file. |
| 530 | | - * |
| 531 | | - * @param string $saveName |
| 532 | | - * @param string $tempName full path to the temporary file |
| 533 | | - * @param bool $useRename if true, doesn't check that the source file |
| 534 | | - * is a PHP-managed upload temporary |
| 535 | | - */ |
| 536 | | - function saveUploadedFile( $saveName, $tempName, $useRename = false ) { |
| 537 | | - global $wgOut, $wgAllowCopyUploads; |
| 538 | | - |
| 539 | | - $image = wfLocalFile( $saveName ); |
| 540 | | - $archiveName = $image->publish( $tempName, File::DELETE_SOURCE ); |
| 541 | | - if ( WikiError::isError( $archiveName ) ) { |
| 542 | | - $this->showError( $archiveName ); |
| 543 | | - return false; |
| 544 | | - } |
| 545 | | - $this->mUploadOldVersion = $archiveName; |
| 546 | | - return true; |
| 547 | | - } |
| 548 | | - |
| 549 | | - /** |
| 550 | 529 | * Stash a file in a temporary directory for later processing |
| 551 | 530 | * after the user has confirmed it. |
| 552 | 531 | * |
| — | — | @@ -579,8 +558,7 @@ |
| 580 | 559 | * @access private |
| 581 | 560 | */ |
| 582 | 561 | function stashSession() { |
| 583 | | - $stash = $this->saveTempUploadedFile( |
| 584 | | - $this->mUploadSaveName, $this->mUploadTempName ); |
| | 562 | + $stash = $this->saveTempUploadedFile( $this->mDestName, $this->mTempPath ); |
| 585 | 563 | |
| 586 | 564 | if( !$stash ) { |
| 587 | 565 | # Couldn't save the file. |
| — | — | @@ -589,9 +567,12 @@ |
| 590 | 568 | |
| 591 | 569 | $key = mt_rand( 0, 0x7fffffff ); |
| 592 | 570 | $_SESSION['wsUploadData'][$key] = array( |
| 593 | | - 'mUploadTempName' => $stash, |
| 594 | | - 'mUploadSize' => $this->mUploadSize, |
| 595 | | - 'mOname' => $this->mOname ); |
| | 571 | + 'mTempPath' => $stash, |
| | 572 | + 'mFileSize' => $this->mFileSize, |
| | 573 | + 'mSrcName' => $this->mSrcName, |
| | 574 | + 'mFileProps' => $this->mFileProps, |
| | 575 | + 'version' => self::SESSION_VERSION, |
| | 576 | + ); |
| 596 | 577 | return $key; |
| 597 | 578 | } |
| 598 | 579 | |
| — | — | @@ -602,11 +583,10 @@ |
| 603 | 584 | */ |
| 604 | 585 | function unsaveUploadedFile() { |
| 605 | 586 | global $wgOut; |
| 606 | | - wfSuppressWarnings(); |
| 607 | | - $success = unlink( $this->mUploadTempName ); |
| 608 | | - wfRestoreWarnings(); |
| | 587 | + $repo = RepoGroup::singleton()->getLocalRepo(); |
| | 588 | + $success = $repo->freeTemp( $this->mTempPath ); |
| 609 | 589 | if ( ! $success ) { |
| 610 | | - $wgOut->showFileDeleteError( $this->mUploadTempName ); |
| | 590 | + $wgOut->showFileDeleteError( $this->mTempPath ); |
| 611 | 591 | return false; |
| 612 | 592 | } else { |
| 613 | 593 | return true; |
| — | — | @@ -623,8 +603,8 @@ |
| 624 | 604 | global $wgUser, $wgOut, $wgContLang; |
| 625 | 605 | |
| 626 | 606 | $sk = $wgUser->getSkin(); |
| 627 | | - $ilink = $sk->makeMediaLinkObj( $this->mImage->getTitle() ); |
| 628 | | - $dname = $wgContLang->getNsText( NS_IMAGE ) . ':'.$this->mUploadSaveName; |
| | 607 | + $ilink = $sk->makeMediaLinkObj( $this->mLocalFile->getTitle() ); |
| | 608 | + $dname = $wgContLang->getNsText( NS_IMAGE ) . ':'.$this->mDestName; |
| 629 | 609 | $dlink = $sk->makeKnownLink( $dname, $dname ); |
| 630 | 610 | |
| 631 | 611 | $wgOut->addHTML( '<h2>' . wfMsgHtml( 'successfulupload' ) . "</h2>\n" ); |
| — | — | @@ -674,8 +654,8 @@ |
| 675 | 655 | if ( $wgUseCopyrightUpload ) |
| 676 | 656 | { |
| 677 | 657 | $copyright = " |
| 678 | | - <input type='hidden' name='wpUploadCopyStatus' value=\"" . htmlspecialchars( $this->mUploadCopyStatus ) . "\" /> |
| 679 | | - <input type='hidden' name='wpUploadSource' value=\"" . htmlspecialchars( $this->mUploadSource ) . "\" /> |
| | 658 | + <input type='hidden' name='wpUploadCopyStatus' value=\"" . htmlspecialchars( $this->mCopyrightStatus ) . "\" /> |
| | 659 | + <input type='hidden' name='wpUploadSource' value=\"" . htmlspecialchars( $this->mCopyrightSource ) . "\" /> |
| 680 | 660 | "; |
| 681 | 661 | } else { |
| 682 | 662 | $copyright = ""; |
| — | — | @@ -685,9 +665,9 @@ |
| 686 | 666 | <form id='uploadwarning' method='post' enctype='multipart/form-data' action='$action'> |
| 687 | 667 | <input type='hidden' name='wpIgnoreWarning' value='1' /> |
| 688 | 668 | <input type='hidden' name='wpSessionKey' value=\"" . htmlspecialchars( $this->mSessionKey ) . "\" /> |
| 689 | | - <input type='hidden' name='wpUploadDescription' value=\"" . htmlspecialchars( $this->mUploadDescription ) . "\" /> |
| | 669 | + <input type='hidden' name='wpUploadDescription' value=\"" . htmlspecialchars( $this->mComment ) . "\" /> |
| 690 | 670 | <input type='hidden' name='wpLicense' value=\"" . htmlspecialchars( $this->mLicense ) . "\" /> |
| 691 | | - <input type='hidden' name='wpDestFile' value=\"" . htmlspecialchars( $this->mDestFile ) . "\" /> |
| | 671 | + <input type='hidden' name='wpDestFile' value=\"" . htmlspecialchars( $this->mDesiredDestName ) . "\" /> |
| 692 | 672 | <input type='hidden' name='wpWatchthis' value=\"" . htmlspecialchars( intval( $this->mWatchthis ) ) . "\" /> |
| 693 | 673 | {$copyright} |
| 694 | 674 | <table border='0'> |
| — | — | @@ -737,7 +717,7 @@ |
| 738 | 718 | "<span class='error'>{$msg}</span>\n" ); |
| 739 | 719 | } |
| 740 | 720 | $wgOut->addHTML( '<div id="uploadtext">' ); |
| 741 | | - $wgOut->addWikiText( wfMsgNoTrans( 'uploadtext', $this->mDestFile ) ); |
| | 721 | + $wgOut->addWikiText( wfMsgNoTrans( 'uploadtext', $this->mDesiredDestName ) ); |
| 742 | 722 | $wgOut->addHTML( '</div>' ); |
| 743 | 723 | |
| 744 | 724 | $sourcefilename = wfMsgHtml( 'sourcefilename' ); |
| — | — | @@ -755,35 +735,44 @@ |
| 756 | 736 | $titleObj = SpecialPage::getTitleFor( 'Upload' ); |
| 757 | 737 | $action = $titleObj->escapeLocalURL(); |
| 758 | 738 | |
| 759 | | - $encDestFile = htmlspecialchars( $this->mDestFile ); |
| | 739 | + $encDestName = htmlspecialchars( $this->mDesiredDestName ); |
| 760 | 740 | |
| 761 | 741 | $watchChecked = |
| 762 | 742 | ( $wgUser->getOption( 'watchdefault' ) || |
| 763 | | - ( $wgUser->getOption( 'watchcreations' ) && $this->mDestFile == '' ) ) |
| | 743 | + ( $wgUser->getOption( 'watchcreations' ) && $this->mDesiredDestName == '' ) ) |
| 764 | 744 | ? 'checked="checked"' |
| 765 | 745 | : ''; |
| 766 | 746 | |
| 767 | 747 | // Prepare form for upload or upload/copy |
| 768 | 748 | if( $wgAllowCopyUploads && $wgUser->isAllowed( 'upload_by_url' ) ) { |
| 769 | 749 | $filename_form = |
| 770 | | - "<input type='radio' id='wpSourceTypeFile' name='wpSourceType' value='file' onchange='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\")' checked />" . |
| 771 | | - "<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' onfocus='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\");toggle_element_check(\"wpSourceTypeFile\",\"wpSourceTypeURL\")'" . |
| 772 | | - ($this->mDestFile?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . "size='40' />" . |
| | 750 | + "<input type='radio' id='wpSourceTypeFile' name='wpSourceType' value='file' " . |
| | 751 | + "onchange='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\")' checked />" . |
| | 752 | + "<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' " . |
| | 753 | + "onfocus='" . |
| | 754 | + "toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\");" . |
| | 755 | + "toggle_element_check(\"wpSourceTypeFile\",\"wpSourceTypeURL\")'" . |
| | 756 | + ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . "size='40' />" . |
| 773 | 757 | wfMsgHTML( 'upload_source_file' ) . "<br/>" . |
| 774 | | - "<input type='radio' id='wpSourceTypeURL' name='wpSourceType' value='web' onchange='toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\")' />" . |
| 775 | | - "<input tabindex='1' type='text' name='wpUploadFileURL' id='wpUploadFileURL' onfocus='toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\");toggle_element_check(\"wpSourceTypeURL\",\"wpSourceTypeFile\")'" . |
| 776 | | - ($this->mDestFile?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='40' DISABLED />" . |
| | 758 | + "<input type='radio' id='wpSourceTypeURL' name='wpSourceType' value='web' " . |
| | 759 | + "onchange='toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\")' />" . |
| | 760 | + "<input tabindex='1' type='text' name='wpUploadFileURL' id='wpUploadFileURL' " . |
| | 761 | + "onfocus='" . |
| | 762 | + "toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\");" . |
| | 763 | + "toggle_element_check(\"wpSourceTypeURL\",\"wpSourceTypeFile\")'" . |
| | 764 | + ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='40' DISABLED />" . |
| 777 | 765 | wfMsgHtml( 'upload_source_url' ) ; |
| 778 | 766 | } else { |
| 779 | 767 | $filename_form = |
| 780 | 768 | "<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' " . |
| 781 | | - ($this->mDestFile?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . |
| | 769 | + ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . |
| 782 | 770 | "size='40' />" . |
| 783 | 771 | "<input type='hidden' name='wpSourceType' value='file' />" ; |
| 784 | 772 | } |
| | 773 | + $encComment = htmlspecialchars( $this->mComment ); |
| 785 | 774 | |
| 786 | | - $wgOut->addHTML( " |
| 787 | | - <form id='upload' method='post' enctype='multipart/form-data' action=\"$action\"> |
| | 775 | + $wgOut->addHTML( <<<EOT |
| | 776 | + <form id='upload' method='post' enctype='multipart/form-data' action="$action"> |
| 788 | 777 | <table border='0'> |
| 789 | 778 | <tr> |
| 790 | 779 | {$this->uploadFormTextTop} |
| — | — | @@ -795,17 +784,20 @@ |
| 796 | 785 | <tr> |
| 797 | 786 | <td align='right'><label for='wpDestFile'>{$destfilename}:</label></td> |
| 798 | 787 | <td align='left'> |
| 799 | | - <input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='40' value=\"$encDestFile\" /> |
| | 788 | + <input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='40' value="$encDestName" /> |
| 800 | 789 | </td> |
| 801 | 790 | </tr> |
| 802 | 791 | <tr> |
| 803 | 792 | <td align='right'><label for='wpUploadDescription'>{$summary}</label></td> |
| 804 | 793 | <td align='left'> |
| 805 | | - <textarea tabindex='3' name='wpUploadDescription' id='wpUploadDescription' rows='6' cols='{$cols}'{$ew}>" . htmlspecialchars( $this->mUploadDescription ) . "</textarea> |
| | 794 | + <textarea tabindex='3' name='wpUploadDescription' id='wpUploadDescription' rows='6' |
| | 795 | + cols='{$cols}'{$ew}>$encComment</textarea> |
| 806 | 796 | {$this->uploadFormTextAfterSummary} |
| 807 | 797 | </td> |
| 808 | 798 | </tr> |
| 809 | | - <tr>" ); |
| | 799 | + <tr> |
| | 800 | +EOT |
| | 801 | + ); |
| 810 | 802 | |
| 811 | 803 | if ( $licenseshtml != '' ) { |
| 812 | 804 | global $wgStylePath; |
| — | — | @@ -826,17 +818,19 @@ |
| 827 | 819 | |
| 828 | 820 | if ( $wgUseCopyrightUpload ) { |
| 829 | 821 | $filestatus = wfMsgHtml ( 'filestatus' ); |
| 830 | | - $copystatus = htmlspecialchars( $this->mUploadCopyStatus ); |
| | 822 | + $copystatus = htmlspecialchars( $this->mCopyrightStatus ); |
| 831 | 823 | $filesource = wfMsgHtml ( 'filesource' ); |
| 832 | | - $uploadsource = htmlspecialchars( $this->mUploadSource ); |
| | 824 | + $uploadsource = htmlspecialchars( $this->mCopyrightSource ); |
| 833 | 825 | |
| 834 | 826 | $wgOut->addHTML( " |
| 835 | 827 | <td align='right' nowrap='nowrap'><label for='wpUploadCopyStatus'>$filestatus:</label></td> |
| 836 | | - <td><input tabindex='5' type='text' name='wpUploadCopyStatus' id='wpUploadCopyStatus' value=\"$copystatus\" size='40' /></td> |
| | 828 | + <td><input tabindex='5' type='text' name='wpUploadCopyStatus' id='wpUploadCopyStatus' |
| | 829 | + value=\"$copystatus\" size='40' /></td> |
| 837 | 830 | </tr> |
| 838 | 831 | <tr> |
| 839 | 832 | <td align='right'><label for='wpUploadCopyStatus'>$filesource:</label></td> |
| 840 | | - <td><input tabindex='6' type='text' name='wpUploadSource' id='wpUploadCopyStatus' value=\"$uploadsource\" size='40' /></td> |
| | 833 | + <td><input tabindex='6' type='text' name='wpUploadSource' id='wpUploadCopyStatus' |
| | 834 | + value=\"$uploadsource\" size='40' /></td> |
| 841 | 835 | </tr> |
| 842 | 836 | <tr> |
| 843 | 837 | "); |
| — | — | @@ -927,8 +921,6 @@ |
| 928 | 922 | $magic=& MimeMagic::singleton(); |
| 929 | 923 | $mime= $magic->guessMimeType($tmpfile,false); |
| 930 | 924 | |
| 931 | | - $fname= "SpecialUpload::verify"; |
| 932 | | - |
| 933 | 925 | #check mime type, if desired |
| 934 | 926 | global $wgVerifyMimeType; |
| 935 | 927 | if ($wgVerifyMimeType) { |
| — | — | @@ -959,7 +951,7 @@ |
| 960 | 952 | return new WikiErrorMsg( 'uploadvirus', htmlspecialchars($virus) ); |
| 961 | 953 | } |
| 962 | 954 | |
| 963 | | - wfDebug( "$fname: all clear; passing.\n" ); |
| | 955 | + wfDebug( __METHOD__.": all clear; passing.\n" ); |
| 964 | 956 | return true; |
| 965 | 957 | } |
| 966 | 958 | |
| — | — | @@ -971,45 +963,46 @@ |
| 972 | 964 | * @return bool |
| 973 | 965 | */ |
| 974 | 966 | function verifyExtension( $mime, $extension ) { |
| 975 | | - $fname = 'SpecialUpload::verifyExtension'; |
| 976 | | - |
| 977 | 967 | $magic =& MimeMagic::singleton(); |
| 978 | 968 | |
| 979 | 969 | if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' ) |
| 980 | 970 | if ( ! $magic->isRecognizableExtension( $extension ) ) { |
| 981 | | - wfDebug( "$fname: passing file with unknown detected mime type; unrecognized extension '$extension', can't verify\n" ); |
| | 971 | + wfDebug( __METHOD__.": passing file with unknown detected mime type; " . |
| | 972 | + "unrecognized extension '$extension', can't verify\n" ); |
| 982 | 973 | return true; |
| 983 | 974 | } else { |
| 984 | | - wfDebug( "$fname: rejecting file with unknown detected mime type; recognized extension '$extension', so probably invalid file\n" ); |
| | 975 | + wfDebug( __METHOD__.": rejecting file with unknown detected mime type; ". |
| | 976 | + "recognized extension '$extension', so probably invalid file\n" ); |
| 985 | 977 | return false; |
| 986 | 978 | } |
| 987 | 979 | |
| 988 | 980 | $match= $magic->isMatchingExtension($extension,$mime); |
| 989 | 981 | |
| 990 | 982 | if ($match===NULL) { |
| 991 | | - wfDebug( "$fname: no file extension known for mime type $mime, passing file\n" ); |
| | 983 | + wfDebug( __METHOD__.": no file extension known for mime type $mime, passing file\n" ); |
| 992 | 984 | return true; |
| 993 | 985 | } elseif ($match===true) { |
| 994 | | - wfDebug( "$fname: mime type $mime matches extension $extension, passing file\n" ); |
| | 986 | + wfDebug( __METHOD__.": mime type $mime matches extension $extension, passing file\n" ); |
| 995 | 987 | |
| 996 | 988 | #TODO: if it's a bitmap, make sure PHP or ImageMagic resp. can handle it! |
| 997 | 989 | return true; |
| 998 | 990 | |
| 999 | 991 | } else { |
| 1000 | | - wfDebug( "$fname: mime type $mime mismatches file extension $extension, rejecting file\n" ); |
| | 992 | + wfDebug( __METHOD__.": mime type $mime mismatches file extension $extension, rejecting file\n" ); |
| 1001 | 993 | return false; |
| 1002 | 994 | } |
| 1003 | 995 | } |
| 1004 | 996 | |
| 1005 | | - /** Heuristig for detecting files that *could* contain JavaScript instructions or |
| 1006 | | - * things that may look like HTML to a browser and are thus |
| 1007 | | - * potentially harmful. The present implementation will produce false positives in some situations. |
| 1008 | | - * |
| 1009 | | - * @param string $file Pathname to the temporary upload file |
| 1010 | | - * @param string $mime The mime type of the file |
| 1011 | | - * @param string $extension The extension of the file |
| 1012 | | - * @return bool true if the file contains something looking like embedded scripts |
| 1013 | | - */ |
| | 997 | + /** |
| | 998 | + * Heuristic for detecting files that *could* contain JavaScript instructions or |
| | 999 | + * things that may look like HTML to a browser and are thus |
| | 1000 | + * potentially harmful. The present implementation will produce false positives in some situations. |
| | 1001 | + * |
| | 1002 | + * @param string $file Pathname to the temporary upload file |
| | 1003 | + * @param string $mime The mime type of the file |
| | 1004 | + * @param string $extension The extension of the file |
| | 1005 | + * @return bool true if the file contains something looking like embedded scripts |
| | 1006 | + */ |
| 1014 | 1007 | function detectScript($file, $mime, $extension) { |
| 1015 | 1008 | global $wgAllowTitlesInSVG; |
| 1016 | 1009 | |
| — | — | @@ -1098,93 +1091,103 @@ |
| 1099 | 1092 | return false; |
| 1100 | 1093 | } |
| 1101 | 1094 | |
| 1102 | | - /** Generic wrapper function for a virus scanner program. |
| 1103 | | - * This relies on the $wgAntivirus and $wgAntivirusSetup variables. |
| 1104 | | - * $wgAntivirusRequired may be used to deny upload if the scan fails. |
| 1105 | | - * |
| 1106 | | - * @param string $file Pathname to the temporary upload file |
| 1107 | | - * @return mixed false if not virus is found, NULL if the scan fails or is disabled, |
| 1108 | | - * or a string containing feedback from the virus scanner if a virus was found. |
| 1109 | | - * If textual feedback is missing but a virus was found, this function returns true. |
| 1110 | | - */ |
| | 1095 | + /** |
| | 1096 | + * Generic wrapper function for a virus scanner program. |
| | 1097 | + * This relies on the $wgAntivirus and $wgAntivirusSetup variables. |
| | 1098 | + * $wgAntivirusRequired may be used to deny upload if the scan fails. |
| | 1099 | + * |
| | 1100 | + * @param string $file Pathname to the temporary upload file |
| | 1101 | + * @return mixed false if not virus is found, NULL if the scan fails or is disabled, |
| | 1102 | + * or a string containing feedback from the virus scanner if a virus was found. |
| | 1103 | + * If textual feedback is missing but a virus was found, this function returns true. |
| | 1104 | + */ |
| 1111 | 1105 | function detectVirus($file) { |
| 1112 | 1106 | global $wgAntivirus, $wgAntivirusSetup, $wgAntivirusRequired, $wgOut; |
| 1113 | 1107 | |
| 1114 | | - $fname= "SpecialUpload::detectVirus"; |
| 1115 | | - |
| 1116 | | - if (!$wgAntivirus) { #disabled? |
| 1117 | | - wfDebug("$fname: virus scanner disabled\n"); |
| 1118 | | - |
| | 1108 | + if ( !$wgAntivirus ) { |
| | 1109 | + wfDebug( __METHOD__.": virus scanner disabled\n"); |
| 1119 | 1110 | return NULL; |
| 1120 | 1111 | } |
| 1121 | 1112 | |
| 1122 | | - if (!$wgAntivirusSetup[$wgAntivirus]) { |
| 1123 | | - wfDebug("$fname: unknown virus scanner: $wgAntivirus\n"); |
| 1124 | | - |
| 1125 | | - $wgOut->addHTML( "<div class='error'>Bad configuration: unknown virus scanner: <i>$wgAntivirus</i></div>\n" ); #LOCALIZE |
| 1126 | | - |
| | 1113 | + if ( !$wgAntivirusSetup[$wgAntivirus] ) { |
| | 1114 | + wfDebug( __METHOD__.": unknown virus scanner: $wgAntivirus\n" ); |
| | 1115 | + # @TODO: localise |
| | 1116 | + $wgOut->addHTML( "<div class='error'>Bad configuration: unknown virus scanner: <i>$wgAntivirus</i></div>\n" ); |
| 1127 | 1117 | return "unknown antivirus: $wgAntivirus"; |
| 1128 | 1118 | } |
| 1129 | 1119 | |
| 1130 | | - #look up scanner configuration |
| 1131 | | - $virus_scanner= $wgAntivirusSetup[$wgAntivirus]["command"]; #command pattern |
| 1132 | | - $virus_scanner_codes= $wgAntivirusSetup[$wgAntivirus]["codemap"]; #exit-code map |
| 1133 | | - $msg_pattern= $wgAntivirusSetup[$wgAntivirus]["messagepattern"]; #message pattern |
| | 1120 | + # look up scanner configuration |
| | 1121 | + $command = $wgAntivirusSetup[$wgAntivirus]["command"]; |
| | 1122 | + $exitCodeMap = $wgAntivirusSetup[$wgAntivirus]["codemap"]; |
| | 1123 | + $msgPattern = isset( $wgAntivirusSetup[$wgAntivirus]["messagepattern"] ) ? |
| | 1124 | + $wgAntivirusSetup[$wgAntivirus]["messagepattern"] : null; |
| 1134 | 1125 | |
| 1135 | | - $scanner= $virus_scanner; #copy, so we can resolve the pattern |
| | 1126 | + if ( strpos( $command,"%f" ) === false ) { |
| | 1127 | + # simple pattern: append file to scan |
| | 1128 | + $command .= " " . wfEscapeShellArg( $file ); |
| | 1129 | + } else { |
| | 1130 | + # complex pattern: replace "%f" with file to scan |
| | 1131 | + $command = str_replace( "%f", wfEscapeShellArg( $file ), $command ); |
| | 1132 | + } |
| 1136 | 1133 | |
| 1137 | | - if (strpos($scanner,"%f")===false) $scanner.= " ".wfEscapeShellArg($file); #simple pattern: append file to scan |
| 1138 | | - else $scanner= str_replace("%f",wfEscapeShellArg($file),$scanner); #complex pattern: replace "%f" with file to scan |
| | 1134 | + wfDebug( __METHOD__.": running virus scan: $command \n" ); |
| 1139 | 1135 | |
| 1140 | | - wfDebug("$fname: running virus scan: $scanner \n"); |
| | 1136 | + # execute virus scanner |
| | 1137 | + $exitCode = false; |
| 1141 | 1138 | |
| 1142 | | - #execute virus scanner |
| 1143 | | - $code= false; |
| 1144 | | - |
| 1145 | 1139 | #NOTE: there's a 50 line workaround to make stderr redirection work on windows, too. |
| 1146 | 1140 | # that does not seem to be worth the pain. |
| 1147 | 1141 | # Ask me (Duesentrieb) about it if it's ever needed. |
| 1148 | 1142 | $output = array(); |
| 1149 | | - if (wfIsWindows()) exec("$scanner",$output,$code); |
| 1150 | | - else exec("$scanner 2>&1",$output,$code); |
| | 1143 | + if ( wfIsWindows() ) { |
| | 1144 | + exec( "$command", $output, $exitCode ); |
| | 1145 | + } else { |
| | 1146 | + exec( "$command 2>&1", $output, $exitCode ); |
| | 1147 | + } |
| 1151 | 1148 | |
| 1152 | | - $exit_code= $code; #remember for user feedback |
| 1153 | | - |
| 1154 | | - if ($virus_scanner_codes) { #map exit code to AV_xxx constants. |
| 1155 | | - if (isset($virus_scanner_codes[$code])) { |
| 1156 | | - $code= $virus_scanner_codes[$code]; # explicit mapping |
| 1157 | | - } else if (isset($virus_scanner_codes["*"])) { |
| 1158 | | - $code= $virus_scanner_codes["*"]; # fallback mapping |
| | 1149 | + # map exit code to AV_xxx constants. |
| | 1150 | + $mappedCode = $exitCode; |
| | 1151 | + if ( $exitCodeMap ) { |
| | 1152 | + if ( isset( $exitCodeMap[$exitCode] ) ) { |
| | 1153 | + $mappedCode = $exitCodeMap[$exitCode]; |
| | 1154 | + } elseif ( isset( $exitCodeMap["*"] ) ) { |
| | 1155 | + $mappedCode = $exitCodeMap["*"]; |
| 1159 | 1156 | } |
| 1160 | 1157 | } |
| 1161 | 1158 | |
| 1162 | | - if ($code===AV_SCAN_FAILED) { #scan failed (code was mapped to false by $virus_scanner_codes) |
| 1163 | | - wfDebug("$fname: failed to scan $file (code $exit_code).\n"); |
| | 1159 | + if ( $mappedCode === AV_SCAN_FAILED ) { |
| | 1160 | + # scan failed (code was mapped to false by $exitCodeMap) |
| | 1161 | + wfDebug( __METHOD__.": failed to scan $file (code $exitCode).\n" ); |
| 1164 | 1162 | |
| 1165 | | - if ($wgAntivirusRequired) { return "scan failed (code $exit_code)"; } |
| 1166 | | - else { return NULL; } |
| 1167 | | - } |
| 1168 | | - else if ($code===AV_SCAN_ABORTED) { #scan failed because filetype is unknown (probably imune) |
| 1169 | | - wfDebug("$fname: unsupported file type $file (code $exit_code).\n"); |
| | 1163 | + if ( $wgAntivirusRequired ) { |
| | 1164 | + return "scan failed (code $exitCode)"; |
| | 1165 | + } else { |
| | 1166 | + return NULL; |
| | 1167 | + } |
| | 1168 | + } else if ( $mappedCode === AV_SCAN_ABORTED ) { |
| | 1169 | + # scan failed because filetype is unknown (probably imune) |
| | 1170 | + wfDebug( __METHOD__.": unsupported file type $file (code $exitCode).\n" ); |
| 1170 | 1171 | return NULL; |
| 1171 | | - } |
| 1172 | | - else if ($code===AV_NO_VIRUS) { |
| 1173 | | - wfDebug("$fname: file passed virus scan.\n"); |
| 1174 | | - return false; #no virus found |
| 1175 | | - } |
| 1176 | | - else { |
| 1177 | | - $output= join("\n",$output); |
| 1178 | | - $output= trim($output); |
| | 1172 | + } else if ( $mappedCode === AV_NO_VIRUS ) { |
| | 1173 | + # no virus found |
| | 1174 | + wfDebug( __METHOD__.": file passed virus scan.\n" ); |
| | 1175 | + return false; |
| | 1176 | + } else { |
| | 1177 | + $output = join( "\n", $output ); |
| | 1178 | + $output = trim( $output ); |
| 1179 | 1179 | |
| 1180 | | - if (!$output) $output= true; #if there's no output, return true |
| 1181 | | - else if ($msg_pattern) { |
| 1182 | | - $groups= array(); |
| 1183 | | - if (preg_match($msg_pattern,$output,$groups)) { |
| 1184 | | - if ($groups[1]) $output= $groups[1]; |
| | 1180 | + if ( !$output ) { |
| | 1181 | + $output = true; #if there's no output, return true |
| | 1182 | + } elseif ( $msgPattern ) { |
| | 1183 | + $groups = array(); |
| | 1184 | + if ( preg_match( $msgPattern, $output, $groups ) ) { |
| | 1185 | + if ( $groups[1] ) { |
| | 1186 | + $output = $groups[1]; |
| | 1187 | + } |
| 1185 | 1188 | } |
| 1186 | 1189 | } |
| 1187 | 1190 | |
| 1188 | | - wfDebug("$fname: FOUND VIRUS! scanner feedback: $output"); |
| | 1191 | + wfDebug( __METHOD__.": FOUND VIRUS! scanner feedback: $output" ); |
| 1189 | 1192 | return $output; |
| 1190 | 1193 | } |
| 1191 | 1194 | } |
| — | — | @@ -1198,7 +1201,7 @@ |
| 1199 | 1202 | * @access private |
| 1200 | 1203 | */ |
| 1201 | 1204 | function checkMacBinary() { |
| 1202 | | - $macbin = new MacBinary( $this->mUploadTempName ); |
| | 1205 | + $macbin = new MacBinary( $this->mTempPath ); |
| 1203 | 1206 | if( $macbin->isValid() ) { |
| 1204 | 1207 | $dataFile = tempnam( wfTempDir(), "WikiMacBinary" ); |
| 1205 | 1208 | $dataHandle = fopen( $dataFile, 'wb' ); |
| — | — | @@ -1206,8 +1209,8 @@ |
| 1207 | 1210 | wfDebug( "SpecialUpload::checkMacBinary: Extracting MacBinary data fork to $dataFile\n" ); |
| 1208 | 1211 | $macbin->extractData( $dataHandle ); |
| 1209 | 1212 | |
| 1210 | | - $this->mUploadTempName = $dataFile; |
| 1211 | | - $this->mUploadSize = $macbin->dataForkLength(); |
| | 1213 | + $this->mTempPath = $dataFile; |
| | 1214 | + $this->mFileSize = $macbin->dataForkLength(); |
| 1212 | 1215 | |
| 1213 | 1216 | // We'll have to manually remove the new file if it's not kept. |
| 1214 | 1217 | $this->mRemoveTempFile = true; |
| — | — | @@ -1221,9 +1224,9 @@ |
| 1222 | 1225 | * @access private |
| 1223 | 1226 | */ |
| 1224 | 1227 | function cleanupTempFile() { |
| 1225 | | - if( $this->mRemoveTempFile && file_exists( $this->mUploadTempName ) ) { |
| 1226 | | - wfDebug( "SpecialUpload::cleanupTempFile: Removing temporary file $this->mUploadTempName\n" ); |
| 1227 | | - unlink( $this->mUploadTempName ); |
| | 1228 | + if ( $this->mRemoveTempFile && file_exists( $this->mTempPath ) ) { |
| | 1229 | + wfDebug( "SpecialUpload::cleanupTempFile: Removing temporary file {$this->mTempPath}\n" ); |
| | 1230 | + unlink( $this->mTempPath ); |
| 1228 | 1231 | } |
| 1229 | 1232 | } |
| 1230 | 1233 | |
| — | — | @@ -1296,5 +1299,30 @@ |
| 1297 | 1300 | $wgOut->enableClientCache( false ); |
| 1298 | 1301 | $wgOut->addWikiText( $error->getMessage() ); |
| 1299 | 1302 | } |
| | 1303 | + |
| | 1304 | + /** |
| | 1305 | + * Get the initial image page text based on a comment and optional file status information |
| | 1306 | + */ |
| | 1307 | + static function getInitialPageText( $comment, $license, $copyStatus, $source ) { |
| | 1308 | + global $wgUseCopyrightUpload; |
| | 1309 | + if ( $wgUseCopyrightUpload ) { |
| | 1310 | + if ( $license != '' ) { |
| | 1311 | + $licensetxt = '== ' . wfMsgForContent( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; |
| | 1312 | + } |
| | 1313 | + $pageText = '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n" . |
| | 1314 | + '== ' . wfMsgForContent ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" . |
| | 1315 | + "$licensetxt" . |
| | 1316 | + '== ' . wfMsgForContent ( 'filesource' ) . " ==\n" . $source ; |
| | 1317 | + } else { |
| | 1318 | + if ( $license != '' ) { |
| | 1319 | + $filedesc = $comment == '' ? '' : '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n"; |
| | 1320 | + $pageText = $filedesc . |
| | 1321 | + '== ' . wfMsgForContent ( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; |
| | 1322 | + } else { |
| | 1323 | + $pageText = $comment; |
| | 1324 | + } |
| | 1325 | + } |
| | 1326 | + return $pageText; |
| | 1327 | + } |
| 1300 | 1328 | } |
| 1301 | 1329 | ?> |
| Index: branches/phase3_rev_deleted/includes/RecentChange.php |
| — | — | @@ -295,11 +295,9 @@ |
| 296 | 296 | public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = 'default', |
| 297 | 297 | $ip='', $size = 0, $newId = 0 ) |
| 298 | 298 | { |
| 299 | | - if ( !$ip ) { |
| | 299 | + if( !$ip ) { |
| 300 | 300 | $ip = wfGetIP(); |
| 301 | | - if ( !$ip ) { |
| 302 | | - $ip = ''; |
| 303 | | - } |
| | 301 | + if( !$ip ) $ip = ''; |
| 304 | 302 | } |
| 305 | 303 | if ( $bot === 'default' ) { |
| 306 | 304 | $bot = $user->isAllowed( 'bot' ); |
| — | — | @@ -347,11 +345,9 @@ |
| 348 | 346 | # Makes an entry in the database corresponding to a rename |
| 349 | 347 | /*static*/ function notifyMove( $timestamp, &$oldTitle, &$newTitle, &$user, $comment, $ip='', $overRedir = false ) |
| 350 | 348 | { |
| 351 | | - if ( !$ip ) { |
| | 349 | + if( !$ip ) { |
| 352 | 350 | $ip = wfGetIP(); |
| 353 | | - if ( !$ip ) { |
| 354 | | - $ip = ''; |
| 355 | | - } |
| | 351 | + if( !$ip ) $ip = ''; |
| 356 | 352 | } |
| 357 | 353 | |
| 358 | 354 | $rc = new RecentChange; |
| — | — | @@ -404,16 +400,17 @@ |
| 405 | 401 | /*static*/ function notifyLog( $timestamp, &$title, &$user, $comment, $ip='', |
| 406 | 402 | $type, $action, $target, $logComment, $params, $newId=0 ) |
| 407 | 403 | { |
| 408 | | - if ( !$ip ) { |
| | 404 | + if( !$ip ) { |
| 409 | 405 | $ip = wfGetIP(); |
| 410 | | - if ( !$ip ) $ip = ''; |
| | 406 | + if( !$ip ) $ip = ''; |
| 411 | 407 | } |
| | 408 | + |
| 412 | 409 | $rc = new RecentChange; |
| 413 | 410 | $rc->mAttribs = array( |
| 414 | 411 | 'rc_timestamp' => $timestamp, |
| 415 | 412 | 'rc_cur_time' => $timestamp, |
| 416 | | - 'rc_namespace' => $title->getNamespace(), |
| 417 | | - 'rc_title' => $title->getDBkey(), |
| | 413 | + 'rc_namespace' => $target->getNamespace(), |
| | 414 | + 'rc_title' => $target->getDBkey(), |
| 418 | 415 | 'rc_type' => RC_LOG, |
| 419 | 416 | 'rc_minor' => 0, |
| 420 | 417 | 'rc_cur_id' => $title->getArticleID(), |
| Index: branches/phase3_rev_deleted/includes/SearchMySQL.php |
| — | — | @@ -200,6 +200,10 @@ |
| 201 | 201 | return new SearchResult( $row ); |
| 202 | 202 | } |
| 203 | 203 | } |
| | 204 | + |
| | 205 | + function free() { |
| | 206 | + $this->mResultSet->free(); |
| | 207 | + } |
| 204 | 208 | } |
| 205 | 209 | |
| 206 | 210 | ?> |
| Index: branches/phase3_rev_deleted/includes/SpecialPreferences.php |
| — | — | @@ -241,11 +241,18 @@ |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | # Validate the signature and clean it up as needed |
| 245 | | - if( $this->mToggles['fancysig'] ) { |
| | 245 | + global $wgMaxSigChars; |
| | 246 | + if( strlen( $this->mNick ) > $wgMaxSigChars ) { |
| | 247 | + global $wgLang; |
| | 248 | + $this->mainPrefsForm( 'error', |
| | 249 | + wfMsg( 'badsiglength', $wgLang->formatNum( $wgMaxSigChars ) ) ); |
| | 250 | + return; |
| | 251 | + } elseif( $this->mToggles['fancysig'] ) { |
| 246 | 252 | if( Parser::validateSig( $this->mNick ) !== false ) { |
| 247 | 253 | $this->mNick = $wgParser->cleanSig( $this->mNick ); |
| 248 | 254 | } else { |
| 249 | 255 | $this->mainPrefsForm( 'error', wfMsg( 'badsig' ) ); |
| | 256 | + return; |
| 250 | 257 | } |
| 251 | 258 | } else { |
| 252 | 259 | // When no fancy sig used, make sure ~{3,5} get removed. |
| — | — | @@ -602,8 +609,14 @@ |
| 603 | 610 | ); |
| 604 | 611 | } |
| 605 | 612 | |
| 606 | | - global $wgParser; |
| 607 | | - if( !empty( $this->mToggles['fancysig'] ) && |
| | 613 | + global $wgParser, $wgMaxSigChars; |
| | 614 | + if( strlen( $this->mNick ) > $wgMaxSigChars ) { |
| | 615 | + $invalidSig = $this->tableRow( |
| | 616 | + ' ', |
| | 617 | + Xml::element( 'span', array( 'class' => 'error' ), |
| | 618 | + wfMsg( 'badsiglength', $wgLang->formatNum( $wgMaxSigChars ) ) ) |
| | 619 | + ); |
| | 620 | + } elseif( !empty( $this->mToggles['fancysig'] ) && |
| 608 | 621 | false === $wgParser->validateSig( $this->mNick ) ) { |
| 609 | 622 | $invalidSig = $this->tableRow( |
| 610 | 623 | ' ', |
| — | — | @@ -616,7 +629,14 @@ |
| 617 | 630 | $wgOut->addHTML( |
| 618 | 631 | $this->tableRow( |
| 619 | 632 | Xml::label( wfMsg( 'yournick' ), 'wpNick' ), |
| 620 | | - Xml::input( 'wpNick', 25, $this->mNick, array( 'id' => 'wpNick' ) ) |
| | 633 | + Xml::input( 'wpNick', 25, $this->mNick, |
| | 634 | + array( |
| | 635 | + 'id' => 'wpNick', |
| | 636 | + // Note: $wgMaxSigChars is currently enforced in UTF-8 bytes, |
| | 637 | + // but 'maxlength' attribute is enforced in characters. |
| | 638 | + // It's still possible to put in an overlong string |
| | 639 | + // 'legitimately' by typing non-ASCII chars. |
| | 640 | + 'maxlength' => $wgMaxSigChars ) ) |
| 621 | 641 | ) . |
| 622 | 642 | $invalidSig . |
| 623 | 643 | $this->tableRow( ' ', $this->getToggle( 'fancysig' ) ) |
| — | — | @@ -949,8 +969,8 @@ |
| 950 | 970 | # Misc |
| 951 | 971 | # |
| 952 | 972 | $wgOut->addHTML('<fieldset><legend>' . wfMsg('prefs-misc') . '</legend>'); |
| 953 | | - $wgOut->addHTML( wfInputLabel( wfMsg( 'stubthreshold' ), |
| 954 | | - 'wpStubs', 'wpStubs', 6, $this->mStubs ) ); |
| | 973 | + $wgOut->addHtml( '<label for="wpStubs">' . wfMsg( 'stub-threshold' ) . '</label> ' ); |
| | 974 | + $wgOut->addHtml( Xml::input( 'wpStubs', 6, $this->mStubs, array( 'id' => 'wpStubs' ) ) ); |
| 955 | 975 | $msgUnderline = htmlspecialchars( wfMsg ( 'tog-underline' ) ); |
| 956 | 976 | $msgUnderlinenever = htmlspecialchars( wfMsg ( 'underline-never' ) ); |
| 957 | 977 | $msgUnderlinealways = htmlspecialchars( wfMsg ( 'underline-always' ) ); |
| Index: branches/phase3_rev_deleted/includes/SpecialUserlogin.php |
| — | — | @@ -265,6 +265,11 @@ |
| 266 | 266 | $this->mainLoginForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) ); |
| 267 | 267 | return false; |
| 268 | 268 | } |
| | 269 | + |
| | 270 | + # Set some additional data so the AbortNewAccount hook can be |
| | 271 | + # used for more than just username validation |
| | 272 | + $u->setEmail( $this->mEmail ); |
| | 273 | + $u->setRealName( $this->mRealName ); |
| 269 | 274 | |
| 270 | 275 | $abortError = ''; |
| 271 | 276 | if( !wfRunHooks( 'AbortNewAccount', array( $u, &$abortError ) ) ) { |
| Index: branches/phase3_rev_deleted/includes/SpecialWhatlinkshere.php |
| — | — | @@ -230,12 +230,14 @@ |
| 231 | 231 | $wgOut->addHTML( ' (' . implode( ', ', $props ) . ') ' ); |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | | - //add whatlinkshere link |
| 235 | | - $whatlink = $this->skin->makeKnownLinkObj( |
| 236 | | - SpecialPage::getTitleFor( 'Whatlinkshere', $nt->getPrefixedDBkey() ), |
| 237 | | - wfMsgHtml( 'whatlinkshere-links' ) ); |
| 238 | | - $wgOut->addHTML(" ($whatlink)" ); |
| 239 | | - |
| | 234 | + # Space for utilities links, with a what-links-here link provided |
| | 235 | + $wlh = $this->skin->makeKnownLinkObj( |
| | 236 | + SpecialPage::getTitleFor( 'Whatlinkshere' ), |
| | 237 | + wfMsgHtml( 'whatlinkshere-links' ), |
| | 238 | + 'target=' . $nt->getPrefixedUrl() |
| | 239 | + ); |
| | 240 | + $wgOut->addHtml( ' <span class="mw-whatlinkshere-tools">(' . $wlh . ')</span>' ); |
| | 241 | + |
| 240 | 242 | if ( $row->page_is_redirect ) { |
| 241 | 243 | if ( $level < 2 ) { |
| 242 | 244 | $this->showIndirectLinks( $level + 1, $nt, 500 ); |
| Index: branches/phase3_rev_deleted/includes/SpecialRecentchanges.php |
| — | — | @@ -269,8 +269,6 @@ |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | function rcFilterByCategories ( &$rows , $categories , $any ) { |
| 273 | | - require_once ( 'Categoryfinder.php' ) ; |
| 274 | | - |
| 275 | 273 | # Filter categories |
| 276 | 274 | $cats = array () ; |
| 277 | 275 | foreach ( $categories AS $cat ) { |
| Index: branches/phase3_rev_deleted/includes/SpecialProtectedpages.php |
| — | — | @@ -147,6 +147,11 @@ |
| 148 | 148 | foreach( $wgRestrictionTypes as $type ) {
|
| 149 | 149 | $text = wfMsg("restriction-$type");
|
| 150 | 150 | $m[$text] = $type;
|
| | 151 | + if( $type=='edit' ) {
|
| | 152 | + // Upload rights for images, a subtype of edit
|
| | 153 | + $text = wfMsg("restriction-upload");
|
| | 154 | + $m[$text] = 'upload';
|
| | 155 | + }
|
| 151 | 156 | }
|
| 152 | 157 |
|
| 153 | 158 | // Third pass generates sorted XHTML content
|
| Index: branches/phase3_rev_deleted/includes/SearchEngine.php |
| — | — | @@ -322,6 +322,14 @@ |
| 323 | 323 | function next() { |
| 324 | 324 | return false; |
| 325 | 325 | } |
| | 326 | + |
| | 327 | + /** |
| | 328 | + * Frees the result set, if applicable. |
| | 329 | + * @ access public |
| | 330 | + */ |
| | 331 | + function free() { |
| | 332 | + // ... |
| | 333 | + } |
| 326 | 334 | } |
| 327 | 335 | |
| 328 | 336 | |
| Index: branches/phase3_rev_deleted/includes/Xml.php |
| — | — | @@ -100,15 +100,8 @@ |
| 101 | 101 | */
|
| 102 | 102 | public static function namespaceSelector($selected = '', $allnamespaces = null, $includehidden=false) {
|
| 103 | 103 | global $wgContLang;
|
| 104 | | - if( $selected !== '' ) {
|
| 105 | | - if( is_null( $selected ) ) {
|
| 106 | | - // No namespace selected; let exact match work without hitting Main
|
| 107 | | - $selected = '';
|
| 108 | | - } else {
|
| 109 | | - // Let input be numeric strings without breaking the empty match.
|
| 110 | | - $selected = intval( $selected );
|
| 111 | | - }
|
| 112 | | - }
|
| | 104 | + if( is_null( $selected ) )
|
| | 105 | + $selected = '';
|
| 113 | 106 | $s = "\n<select id='namespace' name='namespace' class='namespaceselector'>\n";
|
| 114 | 107 | $arr = $wgContLang->getFormattedNamespaces();
|
| 115 | 108 | if( !is_null($allnamespaces) ) {
|
| Index: branches/phase3_rev_deleted/includes/Title.php |
| — | — | @@ -47,6 +47,7 @@ |
| 48 | 48 | var $mTextform; # Text form (spaces not underscores) of the main part |
| 49 | 49 | var $mUrlform; # URL-encoded form of the main part |
| 50 | 50 | var $mDbkeyform; # Main part with underscores |
| | 51 | + var $mUserCaseDBKey; # DB key with the initial letter in the case specified by the user |
| 51 | 52 | var $mNamespace; # Namespace index, i.e. one of the NS_xxxx constants |
| 52 | 53 | var $mInterwiki; # Interwiki prefix (or null string) |
| 53 | 54 | var $mFragment; # Title fragment (i.e. the bit after the #) |
| — | — | @@ -557,6 +558,12 @@ |
| 558 | 559 | return $wgContLang->getNsText( $this->mNamespace ); |
| 559 | 560 | } |
| 560 | 561 | /** |
| | 562 | + * Get the DB key with the initial letter case as specified by the user |
| | 563 | + */ |
| | 564 | + function getUserCaseDBKey() { |
| | 565 | + return $this->mUserCaseDBKey; |
| | 566 | + } |
| | 567 | + /** |
| 561 | 568 | * Get the namespace text of the subject (rather than talk) page |
| 562 | 569 | * @return string |
| 563 | 570 | */ |
| — | — | @@ -1749,6 +1756,7 @@ |
| 1750 | 1757 | * Don't force it for interwikis, since the other |
| 1751 | 1758 | * site might be case-sensitive. |
| 1752 | 1759 | */ |
| | 1760 | + $this->mUserCaseDBKey = $dbkey; |
| 1753 | 1761 | if( $wgCapitalLinks && $this->mInterwiki == '') { |
| 1754 | 1762 | $dbkey = $wgContLang->ucfirst( $dbkey ); |
| 1755 | 1763 | } |
| Index: branches/phase3_rev_deleted/includes/EditPage.php |
| — | — | @@ -410,9 +410,10 @@ |
| 411 | 411 | } |
| 412 | 412 | } |
| 413 | 413 | |
| 414 | | - if(!$this->mTitle->getArticleID() && ('initial' == $this->formtype || $this->firsttime )) { # new article |
| | 414 | + # Show applicable editing introductions |
| | 415 | + if( $this->formtype == 'initial' || $this->firsttime ) |
| 415 | 416 | $this->showIntro(); |
| 416 | | - } |
| | 417 | + |
| 417 | 418 | if( $this->mTitle->isTalkPage() ) { |
| 418 | 419 | $wgOut->addWikiText( wfMsg( 'talkpagetext' ) ); |
| 419 | 420 | } |
| — | — | @@ -585,27 +586,41 @@ |
| 586 | 587 | return $this->mTokenOk; |
| 587 | 588 | } |
| 588 | 589 | |
| 589 | | - /** */ |
| 590 | | - function showIntro() { |
| | 590 | + /** |
| | 591 | + * Show all applicable editing introductions |
| | 592 | + */ |
| | 593 | + private function showIntro() { |
| 591 | 594 | global $wgOut, $wgUser; |
| 592 | | - $addstandardintro=true; |
| 593 | | - if($this->editintro) { |
| 594 | | - $introtitle=Title::newFromText($this->editintro); |
| 595 | | - if(isset($introtitle) && $introtitle->userCanRead()) { |
| 596 | | - $rev=Revision::newFromTitle($introtitle); |
| 597 | | - if($rev) { |
| 598 | | - $wgOut->addSecondaryWikiText($rev->getText()); |
| 599 | | - $addstandardintro=false; |
| 600 | | - } |
| 601 | | - } |
| 602 | | - } |
| 603 | | - if($addstandardintro) { |
| 604 | | - if ( $wgUser->isLoggedIn() ) |
| | 595 | + if( !$this->showCustomIntro() && !$this->mTitle->exists() ) { |
| | 596 | + if( $wgUser->isLoggedIn() ) { |
| 605 | 597 | $wgOut->addWikiText( wfMsg( 'newarticletext' ) ); |
| 606 | | - else |
| | 598 | + } else { |
| 607 | 599 | $wgOut->addWikiText( wfMsg( 'newarticletextanon' ) ); |
| | 600 | + } |
| | 601 | + $this->showDeletionLog( $wgOut ); |
| 608 | 602 | } |
| 609 | 603 | } |
| | 604 | + |
| | 605 | + /** |
| | 606 | + * Attempt to show a custom editing introduction, if supplied |
| | 607 | + * |
| | 608 | + * @return bool |
| | 609 | + */ |
| | 610 | + private function showCustomIntro() { |
| | 611 | + if( $this->editintro ) { |
| | 612 | + $title = Title::newFromText( $this->editintro ); |
| | 613 | + if( $title instanceof Title && $title->exists() && $title->userCanRead() ) { |
| | 614 | + global $wgOut; |
| | 615 | + $revision = Revision::newFromTitle( $title ); |
| | 616 | + $wgOut->addSecondaryWikiText( $revision->getText() ); |
| | 617 | + return true; |
| | 618 | + } else { |
| | 619 | + return false; |
| | 620 | + } |
| | 621 | + } else { |
| | 622 | + return false; |
| | 623 | + } |
| | 624 | + } |
| 610 | 625 | |
| 611 | 626 | /** |
| 612 | 627 | * Attempt submission |
| — | — | @@ -1089,8 +1104,7 @@ |
| 1090 | 1105 | } |
| 1091 | 1106 | |
| 1092 | 1107 | if ( 'diff' == $this->formtype ) { |
| 1093 | | - $wgOut->addStyle( 'common/diff.css' ); |
| 1094 | | - $wgOut->addHTML( $this->getDiff() ); |
| | 1108 | + $this->showDiff(); |
| 1095 | 1109 | } |
| 1096 | 1110 | } |
| 1097 | 1111 | |
| — | — | @@ -1116,7 +1130,7 @@ |
| 1117 | 1131 | if( !$this->preview && !$this->diff ) { |
| 1118 | 1132 | $wgOut->setOnloadHandler( 'document.editform.wpTextbox1.focus()' ); |
| 1119 | 1133 | } |
| 1120 | | - $templates = ($this->preview || $this->section) ? $this->mPreviewTemplates : $this->mArticle->getUsedTemplates(); |
| | 1134 | + $templates = ($this->preview || $this->section != '') ? $this->mPreviewTemplates : $this->mArticle->getUsedTemplates(); |
| 1121 | 1135 | $formattedtemplates = $sk->formatTemplates( $templates, $this->preview, $this->section != ''); |
| 1122 | 1136 | |
| 1123 | 1137 | global $wgUseMetadataEdit ; |
| — | — | @@ -1272,8 +1286,7 @@ |
| 1273 | 1287 | } |
| 1274 | 1288 | |
| 1275 | 1289 | if ( $this->formtype == 'diff') { |
| 1276 | | - $wgOut->addStyle( 'common/diff.css' ); |
| 1277 | | - $wgOut->addHTML( $this->getDiff() ); |
| | 1290 | + $this->showDiff(); |
| 1278 | 1291 | } |
| 1279 | 1292 | |
| 1280 | 1293 | } |
| — | — | @@ -1895,10 +1908,8 @@ |
| 1896 | 1909 | * |
| 1897 | 1910 | * If this is a section edit, we'll replace the section as for final |
| 1898 | 1911 | * save and then make a comparison. |
| 1899 | | - * |
| 1900 | | - * @return string HTML |
| 1901 | 1912 | */ |
| 1902 | | - function getDiff() { |
| | 1913 | + function showDiff() { |
| 1903 | 1914 | $oldtext = $this->mArticle->fetchContent(); |
| 1904 | 1915 | $newtext = $this->mArticle->replaceSection( |
| 1905 | 1916 | $this->section, $this->textbox1, $this->summary, $this->edittime ); |
| — | — | @@ -1909,11 +1920,13 @@ |
| 1910 | 1921 | $de = new DifferenceEngine( $this->mTitle ); |
| 1911 | 1922 | $de->setText( $oldtext, $newtext ); |
| 1912 | 1923 | $difftext = $de->getDiff( $oldtitle, $newtitle ); |
| | 1924 | + $de->showDiffStyle(); |
| 1913 | 1925 | } else { |
| 1914 | 1926 | $difftext = ''; |
| 1915 | 1927 | } |
| 1916 | 1928 | |
| 1917 | | - return '<div id="wikiDiff">' . $difftext . '</div>'; |
| | 1929 | + global $wgOut; |
| | 1930 | + $wgOut->addHtml( '<div id="wikiDiff">' . $difftext . '</div>' ); |
| 1918 | 1931 | } |
| 1919 | 1932 | |
| 1920 | 1933 | /** |
| — | — | @@ -2036,7 +2049,32 @@ |
| 2037 | 2050 | $wgOut->setPageTitle( wfMsg( 'nocreatetitle' ) ); |
| 2038 | 2051 | $wgOut->addWikiText( wfMsg( 'nocreatetext' ) ); |
| 2039 | 2052 | } |
| 2040 | | - |
| | 2053 | + |
| | 2054 | + /** |
| | 2055 | + * If there are rows in the deletion log for this page, show them, |
| | 2056 | + * along with a nice little note for the user |
| | 2057 | + * |
| | 2058 | + * @param OutputPage $out |
| | 2059 | + */ |
| | 2060 | + private function showDeletionLog( $out ) { |
| | 2061 | + $title = $this->mArticle->getTitle(); |
| | 2062 | + $reader = new LogReader( |
| | 2063 | + new FauxRequest( |
| | 2064 | + array( |
| | 2065 | + 'page' => $title->getPrefixedText(), |
| | 2066 | + 'type' => 'delete', |
| | 2067 | + ) |
| | 2068 | + ) |
| | 2069 | + ); |
| | 2070 | + if( $reader->hasRows() ) { |
| | 2071 | + $out->addHtml( '<div id="mw-recreate-deleted-warn">' ); |
| | 2072 | + $out->addWikiText( wfMsg( 'recreate-deleted-warn' ) ); |
| | 2073 | + $viewer = new LogViewer( $reader ); |
| | 2074 | + $viewer->showList( $out ); |
| | 2075 | + $out->addHtml( '</div>' ); |
| | 2076 | + } |
| | 2077 | + } |
| | 2078 | + |
| 2041 | 2079 | } |
| 2042 | 2080 | |
| 2043 | 2081 | ?> |