| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/collapsed.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/uncollapsed.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.php |
| — | — | @@ -121,9 +121,6 @@ |
| 122 | 122 | |
| 123 | 123 | $wgSpecialPages['BannerAllocation'] = 'SpecialBannerAllocation'; |
| 124 | 124 | $wgAutoloadClasses['SpecialBannerAllocation'] = $specialDir . 'SpecialBannerAllocation.php'; |
| 125 | | - |
| 126 | | - $wgSpecialPages['CentralNoticeLogs'] = 'SpecialCentralNoticeLogs'; |
| 127 | | - $wgAutoloadClasses['SpecialCentralNoticeLogs'] = $specialDir . 'SpecialCentralNoticeLogs.php'; |
| 128 | 125 | } |
| 129 | 126 | } |
| 130 | 127 | |
| — | — | @@ -147,8 +144,6 @@ |
| 148 | 145 | $base . '/patches/patch-notice_countries.sql' ); |
| 149 | 146 | $wgExtNewTables[] = array( 'cn_notice_projects', |
| 150 | 147 | $base . '/patches/patch-notice_projects.sql' ); |
| 151 | | - $wgExtNewTables[] = array( 'cn_notice_log', |
| 152 | | - $base . '/patches/patch-notice_log.sql' ); |
| 153 | 148 | } |
| 154 | 149 | } else { |
| 155 | 150 | if ( $updater->getDB()->getType() == 'mysql' ) { |
| — | — | @@ -166,8 +161,6 @@ |
| 167 | 162 | $base . '/patches/patch-notice_countries.sql', true ) ); |
| 168 | 163 | $updater->addExtensionUpdate( array( 'addTable', 'cn_notice_projects', |
| 169 | 164 | $base . '/patches/patch-notice_projects.sql', true ) ); |
| 170 | | - $updater->addExtensionUpdate( array( 'addTable', 'cn_notice_log', |
| 171 | | - $base . '/patches/patch-notice_log.sql', true ) ); |
| 172 | 165 | } |
| 173 | 166 | } |
| 174 | 167 | return true; |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 175 | 168 | Reverse-merged /trunk/extensions/CentralNotice/CentralNotice.php:r91118-92408 |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialBannerListLoader.php |
| — | — | @@ -64,12 +64,12 @@ |
| 65 | 65 | // Quick short circuit to show preferred campaigns |
| 66 | 66 | if ( $campaigns ) { |
| 67 | 67 | // Pull banners |
| 68 | | - $banners = CentralNoticeDB::getCampaignBanners( $campaigns ); |
| | 68 | + $banners = CentralNoticeDB::selectBannersAssigned( $campaigns ); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | // Didn't find any preferred banners so do an old style lookup |
| 72 | 72 | if ( !$banners ) { |
| 73 | | - $banners = CentralNoticeDB::getBannersByTarget( |
| | 73 | + $banners = CentralNotice::selectNoticeTemplates( |
| 74 | 74 | $this->project, $this->language, $this->location ); |
| 75 | 75 | } |
| 76 | 76 | |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialBannerController.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 77 | 77 | Merged /branches/wmf-deployment/extensions/CentralNotice/special/SpecialBannerController.php:r60970 |
| 78 | 78 | Merged /branches/wmf/1.16wmf4/extensions/CentralNotice/special/SpecialBannerController.php:r67177,69199,76243,77266 |
| 79 | 79 | Merged /trunk/extensions/CentralNotice/special/SpecialBannerController.php:r62820-67552,67557,67559-71720,71725-71731,71734-71739,71748-71753,71774-71997,72058-72131,72136-73830,73847,73850,73852,73855,73959,73963,73973,73980,73983,73991,73994-73995,74000-74321,74325-74406,75376-75470,75567,75643,75646,75674,75680,75726,75849,75889,75908,75973,76141,76145,76333,76347,76351,76356-76358,76361,76363,76462,76543,76763,77622-79761,79780,79783-80145,80147-80148,80150,80152-80602,81461-83563,83565-91217 |
| 80 | 80 | Merged /trunk/phase3/extensions/CentralNotice/special/SpecialBannerController.php:r63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573 |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialCentralNotice.php |
| — | — | @@ -57,9 +57,85 @@ |
| 58 | 58 | // Check authentication token |
| 59 | 59 | if ( $wgUser->matchEditToken( $wgRequest->getVal( 'authtoken' ) ) ) { |
| 60 | 60 | |
| 61 | | - // Handle adding a campaign |
| | 61 | + // Handle removing campaigns |
| | 62 | + $toRemove = $wgRequest->getArray( 'removeNotices' ); |
| | 63 | + if ( $toRemove ) { |
| | 64 | + // Remove campaigns in list |
| | 65 | + foreach ( $toRemove as $notice ) { |
| | 66 | + $this->removeNotice( $notice ); |
| | 67 | + } |
| | 68 | + |
| | 69 | + // Skip subsequent form handling and show list of campaigns |
| | 70 | + $this->listNotices(); |
| | 71 | + $wgOut->addHTML( Xml::closeElement( 'div' ) ); |
| | 72 | + return; |
| | 73 | + } |
| | 74 | + |
| | 75 | + // Handle locking/unlocking campaigns |
| | 76 | + $lockedNotices = $wgRequest->getArray( 'locked' ); |
| | 77 | + if ( $lockedNotices ) { |
| | 78 | + // Build list of campaigns to lock |
| | 79 | + $unlockedNotices = array_diff( $this->getAllCampaignNames(), $lockedNotices ); |
| | 80 | + |
| | 81 | + // Set locked/unlocked flag accordingly |
| | 82 | + foreach ( $lockedNotices as $notice ) { |
| | 83 | + $this->updateLock( $notice, '1' ); |
| | 84 | + } |
| | 85 | + foreach ( $unlockedNotices as $notice ) { |
| | 86 | + $this->updateLock( $notice, '0' ); |
| | 87 | + } |
| | 88 | + // Handle updates if no post content came through (all checkboxes unchecked) |
| | 89 | + } elseif ( $method !== 'addNotice' ) { |
| | 90 | + $allNotices = $this->getAllCampaignNames(); |
| | 91 | + foreach ( $allNotices as $notice ) { |
| | 92 | + $this->updateLock( $notice, '0' ); |
| | 93 | + } |
| | 94 | + } |
| | 95 | + |
| | 96 | + // Handle enabling/disabling campaigns |
| | 97 | + $enabledNotices = $wgRequest->getArray( 'enabled' ); |
| | 98 | + if ( $enabledNotices ) { |
| | 99 | + // Build list of campaigns to disable |
| | 100 | + $disabledNotices = array_diff( $this->getAllCampaignNames(), $enabledNotices ); |
| | 101 | + |
| | 102 | + // Set enabled/disabled flag accordingly |
| | 103 | + foreach ( $enabledNotices as $notice ) { |
| | 104 | + $this->updateEnabled( $notice, '1' ); |
| | 105 | + } |
| | 106 | + foreach ( $disabledNotices as $notice ) { |
| | 107 | + $this->updateEnabled( $notice, '0' ); |
| | 108 | + } |
| | 109 | + // Handle updates if no post content came through (all checkboxes unchecked) |
| | 110 | + } elseif ( $method !== 'addNotice' ) { |
| | 111 | + $allNotices = $this->getAllCampaignNames(); |
| | 112 | + foreach ( $allNotices as $notice ) { |
| | 113 | + $this->updateEnabled( $notice, '0' ); |
| | 114 | + } |
| | 115 | + } |
| | 116 | + |
| | 117 | + // Handle setting preferred campaigns |
| | 118 | + $preferredNotices = $wgRequest->getArray( 'preferred' ); |
| | 119 | + if ( $preferredNotices ) { |
| | 120 | + // Build list of campaigns to unset |
| | 121 | + $unsetNotices = array_diff( $this->getAllCampaignNames(), $preferredNotices ); |
| | 122 | + |
| | 123 | + // Set flag accordingly |
| | 124 | + foreach ( $preferredNotices as $notice ) { |
| | 125 | + $this->updatePreferred( $notice, '1' ); |
| | 126 | + } |
| | 127 | + foreach ( $unsetNotices as $notice ) { |
| | 128 | + $this->updatePreferred( $notice, '0' ); |
| | 129 | + } |
| | 130 | + // Handle updates if no post content came through (all checkboxes unchecked) |
| | 131 | + } elseif ( $method !== 'addNotice' ) { |
| | 132 | + $allNotices = $this->getAllCampaignNames(); |
| | 133 | + foreach ( $allNotices as $notice ) { |
| | 134 | + $this->updatePreferred( $notice, '0' ); |
| | 135 | + } |
| | 136 | + } |
| | 137 | + |
| | 138 | + // Handle adding of campaign |
| 62 | 139 | if ( $method == 'addNotice' ) { |
| 63 | | - |
| 64 | 140 | $noticeName = $wgRequest->getVal( 'noticeName' ); |
| 65 | 141 | $start = $wgRequest->getArray( 'start' ); |
| 66 | 142 | $projects = $wgRequest->getArray( 'projects' ); |
| — | — | @@ -72,99 +148,6 @@ |
| 73 | 149 | $this->addNotice( $noticeName, '0', $start, $projects, |
| 74 | 150 | $project_languages, $geotargeted, $geo_countries ); |
| 75 | 151 | } |
| 76 | | - |
| 77 | | - // Handle changing settings to existing campaigns |
| 78 | | - } else { |
| 79 | | - |
| 80 | | - // Handle removing campaigns |
| 81 | | - $toRemove = $wgRequest->getArray( 'removeNotices' ); |
| 82 | | - if ( $toRemove ) { |
| 83 | | - // Remove campaigns in list |
| 84 | | - foreach ( $toRemove as $notice ) { |
| 85 | | - $this->removeNotice( $notice ); |
| 86 | | - } |
| 87 | | - } |
| 88 | | - |
| 89 | | - // Get all the initial campaign settings for logging |
| 90 | | - $allCampaignNames = $this->getAllCampaignNames(); |
| 91 | | - $allInitialCampaignSettings = array(); |
| 92 | | - foreach ( $allCampaignNames as $campaignName ) { |
| 93 | | - $allInitialCampaignSettings[$campaignName] = CentralNoticeDB::getCampaignSettings( $campaignName, false ); |
| 94 | | - } |
| 95 | | - |
| 96 | | - // Handle locking/unlocking campaigns |
| 97 | | - $lockedNotices = $wgRequest->getArray( 'locked' ); |
| 98 | | - if ( $lockedNotices ) { |
| 99 | | - // Build list of campaigns to lock |
| 100 | | - $unlockedNotices = array_diff( $this->getAllCampaignNames(), $lockedNotices ); |
| 101 | | - |
| 102 | | - // Set locked/unlocked flag accordingly |
| 103 | | - foreach ( $lockedNotices as $notice ) { |
| 104 | | - $this->setBooleanCampaignSetting( $notice, 'locked', 1 ); |
| 105 | | - } |
| 106 | | - foreach ( $unlockedNotices as $notice ) { |
| 107 | | - $this->setBooleanCampaignSetting( $notice, 'locked', 0 ); |
| 108 | | - } |
| 109 | | - // Handle updates if no post content came through (all checkboxes unchecked) |
| 110 | | - } else { |
| 111 | | - $allNotices = $this->getAllCampaignNames(); |
| 112 | | - foreach ( $allNotices as $notice ) { |
| 113 | | - $this->setBooleanCampaignSetting( $notice, 'locked', 0 ); |
| 114 | | - } |
| 115 | | - } |
| 116 | | - |
| 117 | | - // Handle enabling/disabling campaigns |
| 118 | | - $enabledNotices = $wgRequest->getArray( 'enabled' ); |
| 119 | | - if ( $enabledNotices ) { |
| 120 | | - // Build list of campaigns to disable |
| 121 | | - $disabledNotices = array_diff( $this->getAllCampaignNames(), $enabledNotices ); |
| 122 | | - |
| 123 | | - // Set enabled/disabled flag accordingly |
| 124 | | - foreach ( $enabledNotices as $notice ) { |
| 125 | | - $this->setBooleanCampaignSetting( $notice, 'enabled', 1 ); |
| 126 | | - } |
| 127 | | - foreach ( $disabledNotices as $notice ) { |
| 128 | | - $this->setBooleanCampaignSetting( $notice, 'enabled', 0 ); |
| 129 | | - } |
| 130 | | - // Handle updates if no post content came through (all checkboxes unchecked) |
| 131 | | - } else { |
| 132 | | - $allNotices = $this->getAllCampaignNames(); |
| 133 | | - foreach ( $allNotices as $notice ) { |
| 134 | | - $this->setBooleanCampaignSetting( $notice, 'enabled', 0 ); |
| 135 | | - } |
| 136 | | - } |
| 137 | | - |
| 138 | | - // Handle setting preferred campaigns |
| 139 | | - $preferredNotices = $wgRequest->getArray( 'preferred' ); |
| 140 | | - if ( $preferredNotices ) { |
| 141 | | - // Build list of campaigns to unset |
| 142 | | - $unsetNotices = array_diff( $this->getAllCampaignNames(), $preferredNotices ); |
| 143 | | - |
| 144 | | - // Set flag accordingly |
| 145 | | - foreach ( $preferredNotices as $notice ) { |
| 146 | | - $this->setBooleanCampaignSetting( $notice, 'preferred', 1 ); |
| 147 | | - } |
| 148 | | - foreach ( $unsetNotices as $notice ) { |
| 149 | | - $this->setBooleanCampaignSetting( $notice, 'preferred', 0 ); |
| 150 | | - } |
| 151 | | - // Handle updates if no post content came through (all checkboxes unchecked) |
| 152 | | - } else { |
| 153 | | - $allNotices = $this->getAllCampaignNames(); |
| 154 | | - foreach ( $allNotices as $notice ) { |
| 155 | | - $this->setBooleanCampaignSetting( $notice, 'preferred', 0 ); |
| 156 | | - } |
| 157 | | - } |
| 158 | | - |
| 159 | | - // Get all the final campaign settings for potential logging |
| 160 | | - foreach ( $allCampaignNames as $campaignName ) { |
| 161 | | - $finalCampaignSettings = CentralNoticeDB::getCampaignSettings( $campaignName, false ); |
| 162 | | - $diffs = array_diff_assoc( $allInitialCampaignSettings[$campaignName], $finalCampaignSettings ); |
| 163 | | - // If there are changes, log them |
| 164 | | - if ( $diffs ) { |
| 165 | | - $campaignId = CentralNotice::getNoticeId( $campaignName ); |
| 166 | | - $this->logCampaignChange( 'modified', $campaignId, $allInitialCampaignSettings[$campaignName], $finalCampaignSettings ); |
| 167 | | - } |
| 168 | | - } |
| 169 | 152 | } |
| 170 | 153 | |
| 171 | 154 | // If there were no errors, reload the page to prevent duplicate form submission |
| — | — | @@ -196,8 +179,7 @@ |
| 197 | 180 | $pages = array( |
| 198 | 181 | 'CentralNotice' => wfMsg( 'centralnotice-notices' ), |
| 199 | 182 | 'NoticeTemplate' => wfMsg ( 'centralnotice-templates' ), |
| 200 | | - 'BannerAllocation' => wfMsg ( 'centralnotice-allocation' ), |
| 201 | | - 'CentralNoticeLogs' => wfMsg ( 'centralnotice-logs' ) |
| | 183 | + 'BannerAllocation' => wfMsg ( 'centralnotice-allocation' ) |
| 202 | 184 | ); |
| 203 | 185 | $htmlOut = Xml::openElement( 'ul', array( 'id' => 'preftoc' ) ); |
| 204 | 186 | foreach ( $pages as $page => $msg ) { |
| — | — | @@ -383,7 +365,7 @@ |
| 384 | 366 | 'method=listNoticeDetail¬ice=' . urlencode( $row->not_name ) ); |
| 385 | 367 | |
| 386 | 368 | // Projects |
| 387 | | - $projects = CentralNotice::getNoticeProjects( $row->not_name ); |
| | 369 | + $projects = $this->getNoticeProjects( $row->not_name ); |
| 388 | 370 | $project_count = count( $projects ); |
| 389 | 371 | $projectList = ''; |
| 390 | 372 | if ( $project_count > 1 ) { |
| — | — | @@ -405,7 +387,7 @@ |
| 406 | 388 | $fields[] = $projectList; |
| 407 | 389 | |
| 408 | 390 | // Languages |
| 409 | | - $project_langs = CentralNotice::getNoticeLanguages( $row->not_name ); |
| | 391 | + $project_langs = $this->getNoticeLanguages( $row->not_name ); |
| 410 | 392 | $language_count = count( $project_langs ); |
| 411 | 393 | $languageList = ''; |
| 412 | 394 | if ( $language_count > 3 ) { |
| — | — | @@ -556,7 +538,7 @@ |
| 557 | 539 | // Countries |
| 558 | 540 | $htmlOut .= Xml::openElement( 'tr' ); |
| 559 | 541 | $htmlOut .= Xml::tags( 'td', array(), |
| 560 | | - Xml::label( wfMsg( 'centralnotice-geo' ), 'geotargeted' ) ); |
| | 542 | + Xml::label( wfMsg( 'centralnotice-geotargeted' ), 'geotargeted' ) ); |
| 561 | 543 | $htmlOut .= Xml::tags( 'td', array(), |
| 562 | 544 | Xml::check( 'geotargeted', false, |
| 563 | 545 | wfArrayMerge( $readonly, array( 'value' => 1, 'id' => 'geotargeted' ) ) ) ); |
| — | — | @@ -616,38 +598,36 @@ |
| 617 | 599 | } |
| 618 | 600 | } |
| 619 | 601 | |
| 620 | | - $initialCampaignSettings = CentralNoticeDB::getCampaignSettings( $notice ); |
| 621 | | - |
| 622 | 602 | // Handle locking/unlocking campaign |
| 623 | 603 | if ( $wgRequest->getCheck( 'locked' ) ) { |
| 624 | | - $this->setBooleanCampaignSetting( $notice, 'locked', 1 ); |
| | 604 | + $this->updateLock( $notice, '1' ); |
| 625 | 605 | } else { |
| 626 | | - $this->setBooleanCampaignSetting( $notice, 'locked', 0 ); |
| | 606 | + $this->updateLock( $notice, 0 ); |
| 627 | 607 | } |
| 628 | 608 | |
| 629 | 609 | // Handle enabling/disabling campaign |
| 630 | 610 | if ( $wgRequest->getCheck( 'enabled' ) ) { |
| 631 | | - $this->setBooleanCampaignSetting( $notice, 'enabled', 1 ); |
| | 611 | + $this->updateEnabled( $notice, '1' ); |
| 632 | 612 | } else { |
| 633 | | - $this->setBooleanCampaignSetting( $notice, 'enabled', 0 ); |
| | 613 | + $this->updateEnabled( $notice, 0 ); |
| 634 | 614 | } |
| 635 | 615 | |
| 636 | 616 | // Handle setting campaign to preferred/not preferred |
| 637 | 617 | if ( $wgRequest->getCheck( 'preferred' ) ) { |
| 638 | | - $this->setBooleanCampaignSetting( $notice, 'preferred', 1 ); |
| | 618 | + $this->updatePreferred( $notice, '1' ); |
| 639 | 619 | } else { |
| 640 | | - $this->setBooleanCampaignSetting( $notice, 'preferred', 0 ); |
| | 620 | + $this->updatePreferred( $notice, 0 ); |
| 641 | 621 | } |
| 642 | 622 | |
| 643 | 623 | // Handle updating geotargeting |
| 644 | 624 | if ( $wgRequest->getCheck( 'geotargeted' ) ) { |
| 645 | | - $this->setBooleanCampaignSetting( $notice, 'geo', 1 ); |
| | 625 | + $this->updateGeotargeted( $notice, 1 ); |
| 646 | 626 | $countries = $wgRequest->getArray( 'geo_countries' ); |
| 647 | 627 | if ( $countries ) { |
| 648 | 628 | $this->updateCountries( $notice, $countries ); |
| 649 | 629 | } |
| 650 | 630 | } else { |
| 651 | | - $this->setBooleanCampaignSetting( $notice, 'geo', 0 ); |
| | 631 | + $this->updateGeotargeted( $notice, 0 ); |
| 652 | 632 | } |
| 653 | 633 | |
| 654 | 634 | // Handle updating the start and end settings |
| — | — | @@ -710,10 +690,6 @@ |
| 711 | 691 | $this->updateProjectLanguages( $notice, $projectLangs ); |
| 712 | 692 | } |
| 713 | 693 | |
| 714 | | - $finalCampaignSettings = CentralNoticeDB::getCampaignSettings( $notice ); |
| 715 | | - $campaignId = CentralNotice::getNoticeId( $notice ); |
| 716 | | - $this->logCampaignChange( 'modified', $campaignId, $initialCampaignSettings, $finalCampaignSettings ); |
| 717 | | - |
| 718 | 694 | // If there were no errors, reload the page to prevent duplicate form submission |
| 719 | 695 | if ( !$this->centralNoticeError ) { |
| 720 | 696 | $wgOut->redirect( $this->getTitle()->getLocalUrl( |
| — | — | @@ -797,11 +773,26 @@ |
| 798 | 774 | } else { |
| 799 | 775 | $readonly = array( 'disabled' => 'disabled' ); |
| 800 | 776 | } |
| | 777 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 778 | + |
| | 779 | + // Get campaign info from database |
| | 780 | + $row = $dbr->selectRow( 'cn_notices', |
| | 781 | + array( |
| | 782 | + 'not_id', |
| | 783 | + 'not_name', |
| | 784 | + 'not_start', |
| | 785 | + 'not_end', |
| | 786 | + 'not_enabled', |
| | 787 | + 'not_preferred', |
| | 788 | + 'not_locked', |
| | 789 | + 'not_geo' |
| | 790 | + ), |
| | 791 | + array( 'not_name' => $notice ), |
| | 792 | + __METHOD__ |
| | 793 | + ); |
| 801 | 794 | |
| 802 | | - $campaign = CentralNoticeDB::getCampaignSettings( $notice ); |
| | 795 | + if ( $row ) { |
| 803 | 796 | |
| 804 | | - if ( $campaign ) { |
| 805 | | - |
| 806 | 797 | // If there was an error, we'll need to restore the state of the form |
| 807 | 798 | if ( $wgRequest->wasPosted() ) { |
| 808 | 799 | $startArray = $wgRequest->getArray( 'start' ); |
| — | — | @@ -826,15 +817,15 @@ |
| 827 | 818 | $isGeotargeted = $wgRequest->getCheck( 'geotargeted' ); |
| 828 | 819 | $countries = $wgRequest->getArray( 'geo_countries', array() ); |
| 829 | 820 | } else { // Defaults |
| 830 | | - $startTimestamp = $campaign['start']; |
| 831 | | - $endTimestamp = $campaign['end']; |
| 832 | | - $isEnabled = ( $campaign['enabled'] == '1' ); |
| 833 | | - $isPreferred = ( $campaign['preferred'] == '1' ); |
| 834 | | - $isLocked = ( $campaign['locked'] == '1' ); |
| 835 | | - $noticeProjects = CentralNotice::getNoticeProjects( $notice ); |
| 836 | | - $noticeLanguages = CentralNotice::getNoticeLanguages( $notice ); |
| 837 | | - $isGeotargeted = ( $campaign['geo'] == '1' ); |
| 838 | | - $countries = CentralNotice::getNoticeCountries( $notice ); |
| | 821 | + $startTimestamp = $row->not_start; |
| | 822 | + $endTimestamp = $row->not_end; |
| | 823 | + $isEnabled = ( $row->not_enabled == '1' ); |
| | 824 | + $isPreferred = ( $row->not_preferred == '1' ); |
| | 825 | + $isLocked = ( $row->not_locked == '1' ); |
| | 826 | + $noticeProjects = $this->getNoticeProjects( $notice ); |
| | 827 | + $noticeLanguages = $this->getNoticeLanguages( $notice ); |
| | 828 | + $isGeotargeted = ( $row->not_geo == '1' ); |
| | 829 | + $countries = $this->getNoticeCountries( $notice ); |
| 839 | 830 | } |
| 840 | 831 | |
| 841 | 832 | // Build Html |
| — | — | @@ -880,12 +871,12 @@ |
| 881 | 872 | // Countries |
| 882 | 873 | $htmlOut .= Xml::openElement( 'tr' ); |
| 883 | 874 | $htmlOut .= Xml::tags( 'td', array(), |
| 884 | | - Xml::label( wfMsg( 'centralnotice-geo' ), 'geotargeted' ) ); |
| | 875 | + Xml::label( wfMsg( 'centralnotice-geotargeted' ), 'geotargeted' ) ); |
| 885 | 876 | $htmlOut .= Xml::tags( 'td', array(), |
| 886 | 877 | Xml::check( 'geotargeted', $isGeotargeted, |
| 887 | 878 | wfArrayMerge( |
| 888 | 879 | $readonly, |
| 889 | | - array( 'value' => $notice, 'id' => 'geotargeted' ) ) ) ); |
| | 880 | + array( 'value' => $row->not_name, 'id' => 'geotargeted' ) ) ) ); |
| 890 | 881 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 891 | 882 | if ( $isGeotargeted ) { |
| 892 | 883 | $htmlOut .= Xml::openElement( 'tr', array( 'id'=>'geoMultiSelector' ) ); |
| — | — | @@ -904,7 +895,7 @@ |
| 905 | 896 | $htmlOut .= Xml::tags( 'td', array(), |
| 906 | 897 | Xml::check( 'enabled', $isEnabled, |
| 907 | 898 | wfArrayMerge( $readonly, |
| 908 | | - array( 'value' => $notice, 'id' => 'enabled' ) ) ) ); |
| | 899 | + array( 'value' => $row->not_name, 'id' => 'enabled' ) ) ) ); |
| 909 | 900 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 910 | 901 | // Preferred |
| 911 | 902 | $htmlOut .= Xml::openElement( 'tr' ); |
| — | — | @@ -913,7 +904,7 @@ |
| 914 | 905 | $htmlOut .= Xml::tags( 'td', array(), |
| 915 | 906 | Xml::check( 'preferred', $isPreferred, |
| 916 | 907 | wfArrayMerge( $readonly, |
| 917 | | - array( 'value' => $notice, 'id' => 'preferred' ) ) ) ); |
| | 908 | + array( 'value' => $row->not_name, 'id' => 'preferred' ) ) ) ); |
| 918 | 909 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 919 | 910 | // Locked |
| 920 | 911 | $htmlOut .= Xml::openElement( 'tr' ); |
| — | — | @@ -922,7 +913,7 @@ |
| 923 | 914 | $htmlOut .= Xml::tags( 'td', array(), |
| 924 | 915 | Xml::check( 'locked', $isLocked, |
| 925 | 916 | wfArrayMerge( $readonly, |
| 926 | | - array( 'value' => $notice, 'id' => 'locked' ) ) ) ); |
| | 917 | + array( 'value' => $row->not_name, 'id' => 'locked' ) ) ) ); |
| 927 | 918 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 928 | 919 | if ( $this->editable ) { |
| 929 | 920 | // Locked |
| — | — | @@ -931,7 +922,7 @@ |
| 932 | 923 | Xml::label( wfMsg( 'centralnotice-remove' ), 'remove' ) ); |
| 933 | 924 | $htmlOut .= Xml::tags( 'td', array(), |
| 934 | 925 | Xml::check( 'remove', false, |
| 935 | | - array( 'value' => $notice, 'id' => 'remove' ) ) ); |
| | 926 | + array( 'value' => $row->not_name, 'id' => 'remove' ) ) ); |
| 936 | 927 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 937 | 928 | } |
| 938 | 929 | $htmlOut .= Xml::closeElement( 'table' ); |
| — | — | @@ -1082,6 +1073,90 @@ |
| 1083 | 1074 | return $htmlOut; |
| 1084 | 1075 | } |
| 1085 | 1076 | |
| | 1077 | + /** |
| | 1078 | + * Lookup function for active banners under a given language/project/location. This function is |
| | 1079 | + * called by SpecialBannerListLoader::getJsonList() in order to build the banner list JSON for |
| | 1080 | + * each project. |
| | 1081 | + * @return a 2D array of running banners with associated weights and settings |
| | 1082 | + */ |
| | 1083 | + static function selectNoticeTemplates( $project, $language, $location = null ) { |
| | 1084 | + global $wgCentralDBname; |
| | 1085 | + |
| | 1086 | + $campaigns = array(); |
| | 1087 | + $dbr = wfGetDB( DB_SLAVE, array(), $wgCentralDBname ); |
| | 1088 | + $encTimestamp = $dbr->addQuotes( $dbr->timestamp() ); |
| | 1089 | + |
| | 1090 | + // Pull non-geotargeted campaigns |
| | 1091 | + $campaignResults1 = $dbr->select( |
| | 1092 | + array( |
| | 1093 | + 'cn_notices', |
| | 1094 | + 'cn_notice_projects', |
| | 1095 | + 'cn_notice_languages' |
| | 1096 | + ), |
| | 1097 | + array( |
| | 1098 | + 'not_id' |
| | 1099 | + ), |
| | 1100 | + array( |
| | 1101 | + "not_start <= $encTimestamp", |
| | 1102 | + "not_end >= $encTimestamp", |
| | 1103 | + 'not_enabled = 1', // enabled |
| | 1104 | + 'not_geo = 0', // not geotargeted |
| | 1105 | + 'np_notice_id = cn_notices.not_id', |
| | 1106 | + 'np_project' => $project, |
| | 1107 | + 'nl_notice_id = cn_notices.not_id', |
| | 1108 | + 'nl_language' => $language |
| | 1109 | + ), |
| | 1110 | + __METHOD__ |
| | 1111 | + ); |
| | 1112 | + foreach ( $campaignResults1 as $row ) { |
| | 1113 | + $campaigns[] = $row->not_id; |
| | 1114 | + } |
| | 1115 | + if ( $location ) { |
| | 1116 | + |
| | 1117 | + // Normalize location parameter (should be an uppercase 2-letter country code) |
| | 1118 | + preg_match( '/[a-zA-Z][a-zA-Z]/', $location, $matches ); |
| | 1119 | + if ( $matches ) { |
| | 1120 | + $location = strtoupper( $matches[0] ); |
| | 1121 | + |
| | 1122 | + // Pull geotargeted campaigns |
| | 1123 | + $campaignResults2 = $dbr->select( |
| | 1124 | + array( |
| | 1125 | + 'cn_notices', |
| | 1126 | + 'cn_notice_projects', |
| | 1127 | + 'cn_notice_languages', |
| | 1128 | + 'cn_notice_countries' |
| | 1129 | + ), |
| | 1130 | + array( |
| | 1131 | + 'not_id' |
| | 1132 | + ), |
| | 1133 | + array( |
| | 1134 | + "not_start <= $encTimestamp", |
| | 1135 | + "not_end >= $encTimestamp", |
| | 1136 | + 'not_enabled = 1', // enabled |
| | 1137 | + 'not_geo = 1', // geotargeted |
| | 1138 | + 'nc_notice_id = cn_notices.not_id', |
| | 1139 | + 'nc_country' => $location, |
| | 1140 | + 'np_notice_id = cn_notices.not_id', |
| | 1141 | + 'np_project' => $project, |
| | 1142 | + 'nl_notice_id = cn_notices.not_id', |
| | 1143 | + 'nl_language' => $language |
| | 1144 | + ), |
| | 1145 | + __METHOD__ |
| | 1146 | + ); |
| | 1147 | + foreach ( $campaignResults2 as $row ) { |
| | 1148 | + $campaigns[] = $row->not_id; |
| | 1149 | + } |
| | 1150 | + } |
| | 1151 | + } |
| | 1152 | + |
| | 1153 | + $templates = array(); |
| | 1154 | + if ( $campaigns ) { |
| | 1155 | + // Pull all banners assigned to the campaigns |
| | 1156 | + $templates = CentralNoticeDB::selectBannersAssigned( $campaigns ); |
| | 1157 | + } |
| | 1158 | + return $templates; |
| | 1159 | + } |
| | 1160 | + |
| 1086 | 1161 | function addNotice( $noticeName, $enabled, $start, $projects, |
| 1087 | 1162 | $project_languages, $geotargeted, $geo_countries ) |
| 1088 | 1163 | { |
| — | — | @@ -1095,7 +1170,6 @@ |
| 1096 | 1171 | $this->showError( 'centralnotice-no-language' ); |
| 1097 | 1172 | return; |
| 1098 | 1173 | } else { |
| 1099 | | - if ( !$geo_countries ) $geo_countries = array(); |
| 1100 | 1174 | $dbw = wfGetDB( DB_MASTER ); |
| 1101 | 1175 | $dbw->begin(); |
| 1102 | 1176 | $start['hour'] = substr( $start['hour'], 0 , 2 ); |
| — | — | @@ -1145,7 +1219,7 @@ |
| 1146 | 1220 | $res = $dbw->insert( 'cn_notice_languages', $insertArray, |
| 1147 | 1221 | __METHOD__, array( 'IGNORE' ) ); |
| 1148 | 1222 | |
| 1149 | | - if ( $geotargeted ) { |
| | 1223 | + if ( $geotargeted && $geo_countries ) { |
| 1150 | 1224 | // Do multi-row insert for campaign countries |
| 1151 | 1225 | $insertArray = array(); |
| 1152 | 1226 | foreach( $geo_countries as $code ) { |
| — | — | @@ -1156,22 +1230,6 @@ |
| 1157 | 1231 | } |
| 1158 | 1232 | |
| 1159 | 1233 | $dbw->commit(); |
| 1160 | | - |
| 1161 | | - // Log the creation of the campaign |
| 1162 | | - $beginSettings = array(); |
| 1163 | | - $endSettings = array( |
| 1164 | | - 'projects' => implode( ", ", $projects ), |
| 1165 | | - 'languages' => implode( ", ", $project_languages ), |
| 1166 | | - 'countries' => implode( ", ", $geo_countries ), |
| 1167 | | - 'start' => $dbw->timestamp( $startTs ), |
| 1168 | | - 'end' => $dbw->timestamp( $endTs ), |
| 1169 | | - 'enabled' => $enabled, |
| 1170 | | - 'preferred' => 0, |
| 1171 | | - 'locked' => 0, |
| 1172 | | - 'geo' => $geotargeted |
| 1173 | | - ); |
| 1174 | | - $this->logCampaignChange( 'created', $not_id, $beginSettings, $endSettings ); |
| 1175 | | - |
| 1176 | 1234 | return; |
| 1177 | 1235 | } |
| 1178 | 1236 | } |
| — | — | @@ -1191,19 +1249,13 @@ |
| 1192 | 1250 | $this->showError( 'centralnotice-notice-is-locked' ); |
| 1193 | 1251 | return; |
| 1194 | 1252 | } else { |
| 1195 | | - // Log the removal of the campaign |
| 1196 | | - $noticeId = CentralNotice::getNoticeId( $noticeName ); |
| 1197 | | - $this->logCampaignChange( 'removed', $noticeId ); |
| 1198 | | - |
| 1199 | 1253 | $dbw = wfGetDB( DB_MASTER ); |
| 1200 | 1254 | $dbw->begin(); |
| | 1255 | + $noticeId = htmlspecialchars( $this->getNoticeId( $noticeName ) ); |
| 1201 | 1256 | $res = $dbw->delete( 'cn_assignments', array ( 'not_id' => $noticeId ) ); |
| 1202 | 1257 | $res = $dbw->delete( 'cn_notices', array ( 'not_name' => $noticeName ) ); |
| 1203 | 1258 | $res = $dbw->delete( 'cn_notice_languages', array ( 'nl_notice_id' => $noticeId ) ); |
| 1204 | | - $res = $dbw->delete( 'cn_notice_projects', array ( 'np_notice_id' => $noticeId ) ); |
| 1205 | | - $res = $dbw->delete( 'cn_notice_countries', array ( 'nc_notice_id' => $noticeId ) ); |
| 1206 | 1259 | $dbw->commit(); |
| 1207 | | - |
| 1208 | 1260 | return; |
| 1209 | 1261 | } |
| 1210 | 1262 | } |
| — | — | @@ -1212,7 +1264,7 @@ |
| 1213 | 1265 | $dbr = wfGetDB( DB_SLAVE ); |
| 1214 | 1266 | |
| 1215 | 1267 | $eNoticeName = htmlspecialchars ( $noticeName ); |
| 1216 | | - $noticeId = CentralNotice::getNoticeId( $eNoticeName ); |
| | 1268 | + $noticeId = $this->getNoticeId( $eNoticeName ); |
| 1217 | 1269 | $templateId = $this->getTemplateId( $templateName ); |
| 1218 | 1270 | $res = $dbr->select( 'cn_assignments', 'asn_id', |
| 1219 | 1271 | array( |
| — | — | @@ -1225,7 +1277,7 @@ |
| 1226 | 1278 | } else { |
| 1227 | 1279 | $dbw = wfGetDB( DB_MASTER ); |
| 1228 | 1280 | $dbw->begin(); |
| 1229 | | - $noticeId = CentralNotice::getNoticeId( $eNoticeName ); |
| | 1281 | + $noticeId = $this->getNoticeId( $eNoticeName ); |
| 1230 | 1282 | $res = $dbw->insert( 'cn_assignments', |
| 1231 | 1283 | array( |
| 1232 | 1284 | 'tmp_id' => $templateId, |
| — | — | @@ -1265,7 +1317,7 @@ |
| 1266 | 1318 | return null; |
| 1267 | 1319 | } |
| 1268 | 1320 | |
| 1269 | | - static function getNoticeProjects( $noticeName ) { |
| | 1321 | + function getNoticeProjects( $noticeName ) { |
| 1270 | 1322 | $dbr = wfGetDB( DB_SLAVE ); |
| 1271 | 1323 | $eNoticeName = htmlspecialchars( $noticeName ); |
| 1272 | 1324 | $row = $dbr->selectRow( 'cn_notices', 'not_id', array( 'not_name' => $eNoticeName ) ); |
| — | — | @@ -1280,7 +1332,7 @@ |
| 1281 | 1333 | return $projects; |
| 1282 | 1334 | } |
| 1283 | 1335 | |
| 1284 | | - static function getNoticeLanguages( $noticeName ) { |
| | 1336 | + function getNoticeLanguages( $noticeName ) { |
| 1285 | 1337 | $dbr = wfGetDB( DB_SLAVE ); |
| 1286 | 1338 | $eNoticeName = htmlspecialchars( $noticeName ); |
| 1287 | 1339 | $row = $dbr->selectRow( 'cn_notices', 'not_id', array( 'not_name' => $eNoticeName ) ); |
| — | — | @@ -1295,7 +1347,7 @@ |
| 1296 | 1348 | return $languages; |
| 1297 | 1349 | } |
| 1298 | 1350 | |
| 1299 | | - static function getNoticeCountries( $noticeName ) { |
| | 1351 | + function getNoticeCountries( $noticeName ) { |
| 1300 | 1352 | $dbr = wfGetDB( DB_SLAVE ); |
| 1301 | 1353 | $eNoticeName = htmlspecialchars( $noticeName ); |
| 1302 | 1354 | $row = $dbr->selectRow( 'cn_notices', 'not_id', array( 'not_name' => $eNoticeName ) ); |
| — | — | @@ -1310,6 +1362,14 @@ |
| 1311 | 1363 | return $countries; |
| 1312 | 1364 | } |
| 1313 | 1365 | |
| | 1366 | + function getNoticeProjectName( $noticeName ) { |
| | 1367 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 1368 | + $eNoticeName = htmlspecialchars( $noticeName ); |
| | 1369 | + $res = $dbr->select( 'cn_notices', 'not_project', array( 'not_name' => $eNoticeName ) ); |
| | 1370 | + $row = $dbr->fetchObject( $res ); |
| | 1371 | + return $row->not_project; |
| | 1372 | + } |
| | 1373 | + |
| 1314 | 1374 | function getTemplateId( $templateName ) { |
| 1315 | 1375 | $dbr = wfGetDB( DB_SLAVE ); |
| 1316 | 1376 | $templateName = htmlspecialchars ( $templateName ); |
| — | — | @@ -1321,7 +1381,7 @@ |
| 1322 | 1382 | function removeTemplateFor( $noticeName, $templateName ) { |
| 1323 | 1383 | $dbw = wfGetDB( DB_MASTER ); |
| 1324 | 1384 | $dbw->begin(); |
| 1325 | | - $noticeId = CentralNotice::getNoticeId( $noticeName ); |
| | 1385 | + $noticeId = $this->getNoticeId( $noticeName ); |
| 1326 | 1386 | $templateId = $this->getTemplateId( $templateName ); |
| 1327 | 1387 | $dbw->delete( 'cn_assignments', array ( 'tmp_id' => $templateId, 'not_id' => $noticeId ) ); |
| 1328 | 1388 | $dbw->commit(); |
| — | — | @@ -1355,30 +1415,70 @@ |
| 1356 | 1416 | array( 'not_name' => $noticeName ) |
| 1357 | 1417 | ); |
| 1358 | 1418 | } |
| | 1419 | + |
| | 1420 | + /** |
| | 1421 | + * Update the enabled/disabled state of a campaign |
| | 1422 | + */ |
| | 1423 | + private function updateEnabled( $noticeName, $isEnabled ) { |
| | 1424 | + if ( !$this->noticeExists( $noticeName ) ) { |
| | 1425 | + $this->showError( 'centralnotice-doesnt-exist' ); |
| | 1426 | + } else { |
| | 1427 | + $dbw = wfGetDB( DB_MASTER ); |
| | 1428 | + $res = $dbw->update( 'cn_notices', |
| | 1429 | + array( 'not_enabled' => $isEnabled ), |
| | 1430 | + array( 'not_name' => $noticeName ) |
| | 1431 | + ); |
| | 1432 | + } |
| | 1433 | + } |
| 1359 | 1434 | |
| 1360 | 1435 | /** |
| 1361 | | - * Update a boolean setting on a campaign |
| 1362 | | - * @param $noticeName string: Name of the campaign |
| 1363 | | - * @param $settingName string: Name of a boolean setting (enabled, preferred, locked, or geo) |
| 1364 | | - * @param $settingValue boolean: Value to use for the setting |
| | 1436 | + * Update the preferred/not preferred state of a campaign |
| 1365 | 1437 | */ |
| 1366 | | - private function setBooleanCampaignSetting( $noticeName, $settingName, $settingValue ) { |
| | 1438 | + function updatePreferred( $noticeName, $isPreferred ) { |
| 1367 | 1439 | if ( !$this->noticeExists( $noticeName ) ) { |
| 1368 | | - // Exit quietly since campaign may have been deleted at the same time. |
| 1369 | | - return; |
| | 1440 | + $this->showError( 'centralnotice-doesnt-exist' ); |
| 1370 | 1441 | } else { |
| 1371 | | - $settingName = strtolower( $settingName ); |
| 1372 | 1442 | $dbw = wfGetDB( DB_MASTER ); |
| 1373 | 1443 | $res = $dbw->update( 'cn_notices', |
| 1374 | | - array( 'not_'.$settingName => $settingValue ), |
| | 1444 | + array( 'not_preferred' => $isPreferred ), |
| 1375 | 1445 | array( 'not_name' => $noticeName ) |
| 1376 | 1446 | ); |
| 1377 | 1447 | } |
| 1378 | 1448 | } |
| 1379 | 1449 | |
| | 1450 | + /** |
| | 1451 | + * Update the geotargeted/not geotargeted state of a campaign |
| | 1452 | + */ |
| | 1453 | + function updateGeotargeted( $noticeName, $isGeotargeted ) { |
| | 1454 | + if ( !$this->noticeExists( $noticeName ) ) { |
| | 1455 | + $this->showError( 'centralnotice-doesnt-exist' ); |
| | 1456 | + } else { |
| | 1457 | + $dbw = wfGetDB( DB_MASTER ); |
| | 1458 | + $res = $dbw->update( 'cn_notices', |
| | 1459 | + array( 'not_geo' => $isGeotargeted ), |
| | 1460 | + array( 'not_name' => $noticeName ) |
| | 1461 | + ); |
| | 1462 | + } |
| | 1463 | + } |
| | 1464 | + |
| | 1465 | + /** |
| | 1466 | + * Update the locked/unlocked state of a campaign |
| | 1467 | + */ |
| | 1468 | + function updateLock( $noticeName, $isLocked ) { |
| | 1469 | + if ( !$this->noticeExists( $noticeName ) ) { |
| | 1470 | + $this->showError( 'centralnotice-doesnt-exist' ); |
| | 1471 | + } else { |
| | 1472 | + $dbw = wfGetDB( DB_MASTER ); |
| | 1473 | + $res = $dbw->update( 'cn_notices', |
| | 1474 | + array( 'not_locked' => $isLocked ), |
| | 1475 | + array( 'not_name' => $noticeName ) |
| | 1476 | + ); |
| | 1477 | + } |
| | 1478 | + } |
| | 1479 | + |
| 1380 | 1480 | function updateWeight( $noticeName, $templateId, $weight ) { |
| 1381 | 1481 | $dbw = wfGetDB( DB_MASTER ); |
| 1382 | | - $noticeId = CentralNotice::getNoticeId( $noticeName ); |
| | 1482 | + $noticeId = $this->getNoticeId( $noticeName ); |
| 1383 | 1483 | $dbw->update( 'cn_assignments', |
| 1384 | 1484 | array ( 'tmp_weight' => $weight ), |
| 1385 | 1485 | array( |
| — | — | @@ -1523,7 +1623,7 @@ |
| 1524 | 1624 | $dbw->begin(); |
| 1525 | 1625 | |
| 1526 | 1626 | // Get the previously assigned projects |
| 1527 | | - $oldProjects = CentralNotice::getNoticeProjects( $notice ); |
| | 1627 | + $oldProjects = $this->getNoticeProjects( $notice ); |
| 1528 | 1628 | |
| 1529 | 1629 | // Get the notice id |
| 1530 | 1630 | $row = $dbw->selectRow( 'cn_notices', 'not_id', array( 'not_name' => $notice ) ); |
| — | — | @@ -1552,7 +1652,7 @@ |
| 1553 | 1653 | $dbw->begin(); |
| 1554 | 1654 | |
| 1555 | 1655 | // Get the previously assigned languages |
| 1556 | | - $oldLanguages = CentralNotice::getNoticeLanguages( $notice ); |
| | 1656 | + $oldLanguages = $this->getNoticeLanguages( $notice ); |
| 1557 | 1657 | |
| 1558 | 1658 | // Get the notice id |
| 1559 | 1659 | $row = $dbw->selectRow( 'cn_notices', 'not_id', array( 'not_name' => $notice ) ); |
| — | — | @@ -1580,7 +1680,7 @@ |
| 1581 | 1681 | $dbw = wfGetDB( DB_MASTER ); |
| 1582 | 1682 | |
| 1583 | 1683 | // Get the previously assigned languages |
| 1584 | | - $oldCountries = CentralNotice::getNoticeCountries( $notice ); |
| | 1684 | + $oldCountries = $this->getNoticeCountries( $notice ); |
| 1585 | 1685 | |
| 1586 | 1686 | // Get the notice id |
| 1587 | 1687 | $row = $dbw->selectRow( 'cn_notices', 'not_id', array( 'not_name' => $notice ) ); |
| — | — | @@ -1675,42 +1775,6 @@ |
| 1676 | 1776 | } |
| 1677 | 1777 | return $htmlOut; |
| 1678 | 1778 | } |
| 1679 | | - |
| 1680 | | - /** |
| 1681 | | - * Log any changes related to a campaign |
| 1682 | | - * @param $action string: 'created', 'modified', or 'removed' |
| 1683 | | - * @param $campaignId integer: ID of campaign |
| 1684 | | - * @param $beginSettings array of campaign settings before changes (optional) |
| 1685 | | - * @param $endSettings array of campaign settings after changes (optional) |
| 1686 | | - * @param $beginAssignments array of banner assignments before changes (optional) |
| 1687 | | - * @param $endAssignments array of banner assignments after changes (optional) |
| 1688 | | - */ |
| 1689 | | - function logCampaignChange( $action, $campaignId, $beginSettings = array(), |
| 1690 | | - $endSettings = array(), $beginAssignments = array(), $endAssignments = array() ) |
| 1691 | | - { |
| 1692 | | - global $wgUser; |
| 1693 | | - |
| 1694 | | - $dbw = wfGetDB( DB_MASTER ); |
| 1695 | | - |
| 1696 | | - $log = array( |
| 1697 | | - 'notlog_timestamp' => $dbw->timestamp(), |
| 1698 | | - 'notlog_user_id' => $wgUser->getId(), |
| 1699 | | - 'notlog_action' => $action, |
| 1700 | | - 'notlog_not_id' => $campaignId, |
| 1701 | | - 'notlog_not_name' => CentralNotice::getNoticeName( $campaignId ) |
| 1702 | | - ); |
| 1703 | | - |
| 1704 | | - foreach ( $beginSettings as $key => $value ) { |
| 1705 | | - $log['notlog_begin_'.$key] = $value; |
| 1706 | | - } |
| 1707 | | - foreach ( $endSettings as $key => $value ) { |
| 1708 | | - $log['notlog_end_'.$key] = $value; |
| 1709 | | - } |
| 1710 | | - |
| 1711 | | - $res = $dbw->insert( 'cn_notice_log', $log ); |
| 1712 | | - $log_id = $dbw->insertId(); |
| 1713 | | - return $log_id; |
| 1714 | | - } |
| 1715 | 1779 | } |
| 1716 | 1780 | |
| 1717 | 1781 | class CentralNoticePager extends TemplatePager { |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialBannerLoader.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1718 | 1782 | Merged /trunk/phase3/extensions/CentralNotice/special/SpecialBannerLoader.php:r63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,77555,77558-77560,77563-77565,77573 |
| 1719 | 1783 | Merged /branches/wmf-deployment/extensions/CentralNotice/special/SpecialBannerLoader.php:r60970 |
| 1720 | 1784 | Merged /branches/wmf/1.16wmf4/extensions/CentralNotice/special/SpecialBannerLoader.php:r67177,69199,76243,77266 |
| 1721 | 1785 | Merged /trunk/extensions/CentralNotice/special/SpecialBannerLoader.php:r62820-67552,67557,67559-71720,71725-71731,71734-71739,71748-71753,71774-71997,72058-72131,72136-73830,73847,73850,73852,73855,73959,73963,73973,73980,73983,73991,73994-73995,74000-74321,74325-74406,75376-75470,75567,75643,75646,75674,75680,75726,75849,75889,75908,75973,76141,76145,76333,76347,76351,76356-76358,76361,76363,76462,76543,76763,77622-79761,79780,79783-80145,80147-80148,80150,80152-80602,81461-83563,83565-91217 |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/special/SpecialCentralNoticeLogs.php |
| — | — | @@ -54,8 +54,7 @@ |
| 55 | 55 | $htmlOut .= Xml::closeElement( 'form' ); |
| 56 | 56 | |
| 57 | 57 | // End log selection fieldset |
| 58 | | - // Uncomment when we have multiple logs |
| 59 | | - //$htmlOut .= Xml::closeElement( 'fieldset' ); |
| | 58 | + $htmlOut .= Xml::closeElement( 'fieldset' ); |
| 60 | 59 | |
| 61 | 60 | $wgOut->addHTML( $htmlOut ); |
| 62 | 61 | |
| — | — | @@ -71,21 +70,14 @@ |
| 72 | 71 | function showLog( $logType ) { |
| 73 | 72 | global $wgOut; |
| 74 | 73 | |
| 75 | | - $pager = new CentralNoticeLogPager( $this ); |
| 76 | 74 | $htmlOut = ''; |
| 77 | 75 | |
| 78 | 76 | // Begin log fieldset |
| 79 | | - // Uncomment when we have multiple logs |
| 80 | | - //$htmlOut .= Xml::openElement( 'fieldset', array( 'class' => 'prefsection' ) ); |
| | 77 | + $htmlOut .= Xml::openElement( 'fieldset', array( 'class' => 'prefsection' ) ); |
| 81 | 78 | |
| 82 | | - // Show paginated list of log entries |
| 83 | | - $htmlOut .= Xml::tags( 'div', |
| 84 | | - array( 'class' => 'cn-pager' ), |
| 85 | | - $pager->getNavigationBar() ); |
| 86 | | - $htmlOut .= $pager->getBody(); |
| 87 | | - $htmlOut .= Xml::tags( 'div', |
| 88 | | - array( 'class' => 'cn-pager' ), |
| 89 | | - $pager->getNavigationBar() ); |
| | 79 | + $htmlOut .= Xml::tags( 'p', null, |
| | 80 | + '<i>Coming soon...</i>' |
| | 81 | + ); |
| 90 | 82 | |
| 91 | 83 | // End log fieldset |
| 92 | 84 | $htmlOut .= Xml::closeElement( 'fieldset' ); |
| — | — | @@ -94,307 +86,3 @@ |
| 95 | 87 | } |
| 96 | 88 | |
| 97 | 89 | } |
| 98 | | - |
| 99 | | -class CentralNoticeLogPager extends ReverseChronologicalPager { |
| 100 | | - var $viewPage, $special; |
| 101 | | - |
| 102 | | - function __construct( $special ) { |
| 103 | | - $this->special = $special; |
| 104 | | - parent::__construct(); |
| 105 | | - |
| 106 | | - // Override paging defaults |
| 107 | | - list( $this->mLimit, /* $offset */ ) = $this->mRequest->getLimitOffset( 20, '' ); |
| 108 | | - $this->mLimitsShown = array( 20, 50, 100 ); |
| 109 | | - |
| 110 | | - $this->viewPage = SpecialPage::getTitleFor( 'CentralNotice' ); |
| 111 | | - } |
| 112 | | - |
| 113 | | - /** |
| 114 | | - * Sort the log list by timestamp |
| 115 | | - */ |
| 116 | | - function getIndexField() { |
| 117 | | - return 'notlog_timestamp'; |
| 118 | | - } |
| 119 | | - |
| 120 | | - /** |
| 121 | | - * Pull log entries from the database |
| 122 | | - */ |
| 123 | | - function getQueryInfo() { |
| 124 | | - return array( |
| 125 | | - 'tables' => array( 'cn_notice_log' ), |
| 126 | | - 'fields' => '*', |
| 127 | | - ); |
| 128 | | - } |
| 129 | | - |
| 130 | | - /** |
| 131 | | - * Generate the content of each table row (1 row = 1 log entry) |
| 132 | | - */ |
| 133 | | - function formatRow( $row ) { |
| 134 | | - global $wgLang, $wgExtensionAssetsPath; |
| 135 | | - |
| 136 | | - // Create a user object so we can pull the name, user page, etc. |
| 137 | | - $loggedUser = User::newFromId( $row->notlog_user_id ); |
| 138 | | - // Create the user page link |
| 139 | | - $userLink = $this->getSkin()->makeLinkObj( $loggedUser->getUserPage(), |
| 140 | | - $loggedUser->getName() ); |
| 141 | | - $userTalkLink = $this->getSkin()->makeLinkObj( $loggedUser->getTalkPage(), |
| 142 | | - wfMsg ( 'centralnotice-talk-link' ) ); |
| 143 | | - |
| 144 | | - // Create the campaign link |
| 145 | | - $campaignLink = $this->getSkin()->makeLinkObj( $this->viewPage, |
| 146 | | - htmlspecialchars( $row->notlog_not_name ), |
| 147 | | - 'method=listNoticeDetail¬ice=' . urlencode( $row->notlog_not_name ) ); |
| 148 | | - |
| 149 | | - // Begin log entry primary row |
| 150 | | - $htmlOut = Xml::openElement( 'tr' ); |
| 151 | | - |
| 152 | | - $htmlOut .= Xml::openElement( 'td', array( 'valign' => 'top' ) ); |
| 153 | | - if ( $row->notlog_action !== 'removed' ) { |
| 154 | | - $htmlOut .= '<a href="javascript:toggleDisplay(\''.$row->notlog_id.'\')">'. |
| 155 | | - '<img src="'.$wgExtensionAssetsPath.'/CentralNotice/collapsed.png" id="cn-collapsed-'.$row->notlog_id.'" style="display:block;vertical-align:baseline;"/>'. |
| 156 | | - '<img src="'.$wgExtensionAssetsPath.'/CentralNotice/uncollapsed.png" id="cn-uncollapsed-'.$row->notlog_id.'" style="display:none;vertical-align:baseline;"/>'. |
| 157 | | - '</a>'; |
| 158 | | - } |
| 159 | | - $htmlOut .= Xml::closeElement( 'td' ); |
| 160 | | - $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top', 'class' => 'primary' ), |
| 161 | | - $wgLang->date( $row->notlog_timestamp ) . ' ' . $wgLang->time( $row->notlog_timestamp ) |
| 162 | | - ); |
| 163 | | - $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top', 'class' => 'primary' ), |
| 164 | | - wfMsg ( 'centralnotice-user-links', $userLink, $userTalkLink ) |
| 165 | | - ); |
| 166 | | - $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top', 'class' => 'primary' ), |
| 167 | | - $row->notlog_action |
| 168 | | - ); |
| 169 | | - $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top', 'class' => 'primary' ), |
| 170 | | - $campaignLink |
| 171 | | - ); |
| 172 | | - $htmlOut .= Xml::tags( 'td', array(), |
| 173 | | - ' ' |
| 174 | | - ); |
| 175 | | - |
| 176 | | - // End log entry primary row |
| 177 | | - $htmlOut .= Xml::closeElement( 'tr' ); |
| 178 | | - |
| 179 | | - if ( $row->notlog_action !== 'removed' ) { |
| 180 | | - // Begin log entry secondary row |
| 181 | | - $htmlOut .= Xml::openElement( 'tr', array( 'id' => 'cn-log-details-'.$row->notlog_id, 'style' => 'display:none;' ) ); |
| 182 | | - |
| 183 | | - $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top' ), |
| 184 | | - ' ' // force a table cell in older browsers |
| 185 | | - ); |
| 186 | | - $htmlOut .= Xml::openElement( 'td', array( 'valign' => 'top', 'colspan' => '5' ) ); |
| 187 | | - if ( $row->notlog_action == 'created' ) { |
| 188 | | - $htmlOut .= $this->showInitialSettings( $row ); |
| 189 | | - } else if ( $row->notlog_action == 'modified' ) { |
| 190 | | - $htmlOut .= $this->showChanges( $row ); |
| 191 | | - } |
| 192 | | - $htmlOut .= Xml::closeElement( 'td' ); |
| 193 | | - |
| 194 | | - // End log entry primary row |
| 195 | | - $htmlOut .= Xml::closeElement( 'tr' ); |
| 196 | | - } |
| 197 | | - |
| 198 | | - return $htmlOut; |
| 199 | | - } |
| 200 | | - |
| 201 | | - function showInitialSettings( $row ) { |
| 202 | | - global $wgLang; |
| 203 | | - $details = ''; |
| 204 | | - $details .= wfMsg ( |
| 205 | | - 'centralnotice-log-label', |
| 206 | | - wfMsg ( 'centralnotice-start-date' ), |
| 207 | | - $wgLang->date( $row->notlog_end_start ).' '.$wgLang->time( $row->notlog_end_start ) |
| 208 | | - )."<br/>"; |
| 209 | | - $details .= wfMsg ( |
| 210 | | - 'centralnotice-log-label', |
| 211 | | - wfMsg ( 'centralnotice-end-date' ), |
| 212 | | - $wgLang->date( $row->notlog_end_end ).' '.$wgLang->time( $row->notlog_end_end ) |
| 213 | | - )."<br/>"; |
| 214 | | - $details .= wfMsg ( |
| 215 | | - 'centralnotice-log-label', |
| 216 | | - wfMsg ( 'centralnotice-projects' ), |
| 217 | | - $row->notlog_end_projects |
| 218 | | - )."<br/>"; |
| 219 | | - $language_count = count( explode ( ', ', $row->notlog_end_languages ) ); |
| 220 | | - $languageList = ''; |
| 221 | | - if ( $language_count > 15 ) { |
| 222 | | - $languageList = wfMsg ( 'centralnotice-multiple-languages', $language_count ); |
| 223 | | - } elseif ( $language_count > 0 ) { |
| 224 | | - $languageList = $row->notlog_end_languages; |
| 225 | | - } |
| 226 | | - $details .= wfMsg ( |
| 227 | | - 'centralnotice-log-label', |
| 228 | | - wfMsg ( 'centralnotice-languages' ), |
| 229 | | - $languageList |
| 230 | | - )."<br/>"; |
| 231 | | - $details .= wfMsg ( |
| 232 | | - 'centralnotice-log-label', |
| 233 | | - wfMsg ( 'centralnotice-geo' ), |
| 234 | | - ($row->notlog_end_geo ? 'on' : 'off') |
| 235 | | - )."<br/>"; |
| 236 | | - if ( $row->notlog_end_geo ) { |
| 237 | | - $country_count = count( explode ( ', ', $row->notlog_end_countries ) ); |
| 238 | | - $countryList = ''; |
| 239 | | - if ( $country_count > 20 ) { |
| 240 | | - $countryList = wfMsg ( 'centralnotice-multiple-countries', $country_count ); |
| 241 | | - } elseif ( $country_count > 0 ) { |
| 242 | | - $countryList = $row->notlog_end_countries; |
| 243 | | - } |
| 244 | | - $details .= wfMsg ( |
| 245 | | - 'centralnotice-log-label', |
| 246 | | - wfMsg ( 'centralnotice-countries' ), |
| 247 | | - $countryList |
| 248 | | - )."<br/>"; |
| 249 | | - } |
| 250 | | - return $details; |
| 251 | | - } |
| 252 | | - |
| 253 | | - function showChanges( $row ) { |
| 254 | | - global $wgLang; |
| 255 | | - $details = ''; |
| 256 | | - if ( $row->notlog_begin_start !== $row->notlog_end_start ) { |
| 257 | | - $details .= wfMsg ( |
| 258 | | - 'centralnotice-log-label', |
| 259 | | - wfMsg ( 'centralnotice-start-date' ), |
| 260 | | - wfMsg ( |
| 261 | | - 'centralnotice-changed', |
| 262 | | - $wgLang->date( $row->notlog_begin_start ).' '.$wgLang->time( $row->notlog_begin_start ), |
| 263 | | - $wgLang->date( $row->notlog_end_start ).' '.$wgLang->time( $row->notlog_end_start ) |
| 264 | | - ) |
| 265 | | - )."<br/>"; |
| 266 | | - } |
| 267 | | - if ( $row->notlog_begin_end !== $row->notlog_end_end ) { |
| 268 | | - $details .= wfMsg ( |
| 269 | | - 'centralnotice-log-label', |
| 270 | | - wfMsg ( 'centralnotice-end-date' ), |
| 271 | | - wfMsg ( |
| 272 | | - 'centralnotice-changed', |
| 273 | | - $wgLang->date( $row->notlog_begin_end ).' '.$wgLang->time( $row->notlog_begin_end ), |
| 274 | | - $wgLang->date( $row->notlog_end_end ).' '.$wgLang->time( $row->notlog_end_end ) |
| 275 | | - ) |
| 276 | | - )."<br/>"; |
| 277 | | - } |
| 278 | | - $details .= $this->testBooleanChange( 'enabled', $row ); |
| 279 | | - $details .= $this->testBooleanChange( 'preferred', $row ); |
| 280 | | - $details .= $this->testBooleanChange( 'locked', $row ); |
| 281 | | - $details .= $this->testBooleanChange( 'geo', $row ); |
| 282 | | - $details .= $this->testSetChange( 'projects', $row ); |
| 283 | | - $details .= $this->testSetChange( 'languages', $row ); |
| 284 | | - $details .= $this->testSetChange( 'countries', $row ); |
| 285 | | - if ( $row->notlog_begin_banners !== $row->notlog_end_banners ) { |
| 286 | | - // Show changes to banner weights and assignment |
| 287 | | - $beginBannersObject = json_decode( $row->notlog_begin_banners ); |
| 288 | | - $endBannersObject = json_decode( $row->notlog_end_banners ); |
| 289 | | - $beginBanners = array(); |
| 290 | | - $endBanners = array(); |
| 291 | | - foreach( $beginBannersObject as $key => $weight ) { |
| 292 | | - $beginBanners[$key] = $key.' ('.$weight.')'; |
| 293 | | - } |
| 294 | | - foreach( $endBannersObject as $key => $weight ) { |
| 295 | | - $endBanners[$key] = $key.' ('.$weight.')'; |
| 296 | | - } |
| 297 | | - if ( $beginBanners ) { |
| 298 | | - $before = implode( ', ', $beginBanners ); |
| 299 | | - } else { |
| 300 | | - $before = wfMsg ( 'centralnotice-no-assignments' ); |
| 301 | | - } |
| 302 | | - if ( $endBanners ) { |
| 303 | | - $after = implode( ', ', $endBanners ); |
| 304 | | - } else { |
| 305 | | - $after = wfMsg ( 'centralnotice-no-assignments' ); |
| 306 | | - } |
| 307 | | - $details .= wfMsg ( |
| 308 | | - 'centralnotice-log-label', |
| 309 | | - wfMsg ( 'centralnotice-templates' ), |
| 310 | | - wfMsg ( 'centralnotice-changed', $before, $after) |
| 311 | | - )."<br/>"; |
| 312 | | - } |
| 313 | | - return $details; |
| 314 | | - } |
| 315 | | - |
| 316 | | - private function testBooleanChange( $param, $row ) { |
| 317 | | - $result = ''; |
| 318 | | - $beginField = 'notlog_begin_'.$param; |
| 319 | | - $endField = 'notlog_end_'.$param; |
| 320 | | - if ( $row->$beginField !== $row->$endField ) { |
| 321 | | - $result .= wfMsg ( |
| 322 | | - 'centralnotice-log-label', |
| 323 | | - wfMsg ( 'centralnotice-'.$param ), |
| 324 | | - wfMsg ( |
| 325 | | - 'centralnotice-changed', |
| 326 | | - ( $row->$beginField ? wfMsg ( 'centralnotice-on' ) : wfMsg ( 'centralnotice-off' ) ), |
| 327 | | - ( $row->$endField ? wfMsg ( 'centralnotice-on' ) : wfMsg ( 'centralnotice-off' ) ) |
| 328 | | - ) |
| 329 | | - )."<br/>"; |
| 330 | | - } |
| 331 | | - return $result; |
| 332 | | - } |
| 333 | | - |
| 334 | | - private function testSetChange( $param, $row ) { |
| 335 | | - $result = ''; |
| 336 | | - $beginField = 'notlog_begin_'.$param; |
| 337 | | - $endField = 'notlog_end_'.$param; |
| 338 | | - if ( $row->$beginField !== $row->$endField ) { |
| 339 | | - $beginSet = array(); |
| 340 | | - $endSet = array(); |
| 341 | | - if ( $row->$beginField ) { |
| 342 | | - $beginSet = explode( ', ', $row->$beginField ); |
| 343 | | - } |
| 344 | | - if ( $row->$endField ) { |
| 345 | | - $endSet = explode( ', ', $row->$endField ); |
| 346 | | - } |
| 347 | | - $added = array_diff( $endSet, $beginSet ); |
| 348 | | - $removed = array_diff( $beginSet, $endSet ); |
| 349 | | - $differences = ''; |
| 350 | | - if ( $added ) { |
| 351 | | - $differences .= wfMsg ( 'centralnotice-added', implode( ', ', $added ) ); |
| 352 | | - if ( $removed ) $differences .= '; '; |
| 353 | | - } |
| 354 | | - if ( $removed ) { |
| 355 | | - $differences .= wfMsg ( 'centralnotice-removed', implode( ', ', $removed ) ); |
| 356 | | - } |
| 357 | | - $result .= wfMsg ( |
| 358 | | - 'centralnotice-log-label', |
| 359 | | - wfMsg ( 'centralnotice-'.$param ), |
| 360 | | - $differences |
| 361 | | - )."<br/>"; |
| 362 | | - } |
| 363 | | - return $result; |
| 364 | | - } |
| 365 | | - |
| 366 | | - /** |
| 367 | | - * Specify table headers |
| 368 | | - */ |
| 369 | | - function getStartBody() { |
| 370 | | - $htmlOut = ''; |
| 371 | | - $htmlOut .= Xml::openElement( 'table', array( 'id' => 'cn-campaign-logs', 'cellpadding' => 3 ) ); |
| 372 | | - $htmlOut .= Xml::openElement( 'tr' ); |
| 373 | | - $htmlOut .= Xml::element( 'th', array( 'style' => 'width: 20px;' ) ); |
| 374 | | - $htmlOut .= Xml::element( 'th', array( 'align' => 'left', 'style' => 'width: 130px;' ), |
| 375 | | - wfMsg ( 'centralnotice-timestamp' ) |
| 376 | | - ); |
| 377 | | - $htmlOut .= Xml::element( 'th', array( 'align' => 'left', 'style' => 'width: 160px;' ), |
| 378 | | - wfMsg ( 'centralnotice-user' ) |
| 379 | | - ); |
| 380 | | - $htmlOut .= Xml::element( 'th', array( 'align' => 'left', 'style' => 'width: 100px;' ), |
| 381 | | - wfMsg ( 'centralnotice-action' ) |
| 382 | | - ); |
| 383 | | - $htmlOut .= Xml::element( 'th', array( 'align' => 'left', 'style' => 'width: 160px;' ), |
| 384 | | - wfMsg ( 'centralnotice-notice' ) |
| 385 | | - ); |
| 386 | | - $htmlOut .= Xml::tags( 'td', array(), |
| 387 | | - ' ' |
| 388 | | - ); |
| 389 | | - $htmlOut .= Xml::closeElement( 'tr' ); |
| 390 | | - return $htmlOut; |
| 391 | | - } |
| 392 | | - |
| 393 | | - /** |
| 394 | | - * Close table |
| 395 | | - */ |
| 396 | | - function getEndBody() { |
| 397 | | - $htmlOut = ''; |
| 398 | | - $htmlOut .= Xml::closeElement( 'table' ); |
| 399 | | - return $htmlOut; |
| 400 | | - } |
| 401 | | -} |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/centralnotice.css |
| — | — | @@ -57,21 +57,6 @@ |
| 58 | 58 | margin-left:1.6em; |
| 59 | 59 | margin-right:1.6em; |
| 60 | 60 | } |
| 61 | | -#preferences table#cn-campaign-logs { |
| 62 | | - width: auto; |
| 63 | | -} |
| 64 | | -#preferences table#cn-campaign-logs td.primary { |
| 65 | | - background-color: #F0F0F0; |
| 66 | | -} |
| 67 | | -#preferences .cn-new-value { |
| 68 | | - color: #006400; |
| 69 | | -} |
| 70 | | -#preferences .cn-old-value { |
| 71 | | - color: #8B0000; |
| 72 | | -} |
| 73 | | -#preferences .cn-log-label { |
| 74 | | - font-weight: bold; |
| 75 | | -} |
| 76 | 61 | |
| 77 | 62 | /* Vector-specific definitions */ |
| 78 | 63 | body.skin-vector #preferences fieldset.prefsection { |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/patches/patch-notice_log.sql |
| — | — | @@ -1,33 +0,0 @@ |
| 2 | | - |
| 3 | | -CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_notice_log ( |
| 4 | | - `notlog_id` int unsigned NOT NULL PRIMARY KEY auto_increment, |
| 5 | | - `notlog_timestamp` binary(14) NOT NULL, |
| 6 | | - `notlog_user_id` int unsigned NOT NULL, |
| 7 | | - `notlog_action` enum('created','modified','removed') NOT NULL DEFAULT 'modified', |
| 8 | | - `notlog_not_id` int unsigned NOT NULL, |
| 9 | | - `notlog_not_name` varchar(255) DEFAULT NULL, |
| 10 | | - `notlog_begin_projects` varchar(255) DEFAULT NULL, |
| 11 | | - `notlog_end_projects` varchar(255) DEFAULT NULL, |
| 12 | | - `notlog_begin_languages` text, |
| 13 | | - `notlog_end_languages` text, |
| 14 | | - `notlog_begin_countries` text, |
| 15 | | - `notlog_end_countries` text, |
| 16 | | - `notlog_begin_start` char(14) DEFAULT NULL, |
| 17 | | - `notlog_end_start` char(14) DEFAULT NULL, |
| 18 | | - `notlog_begin_end` char(14) DEFAULT NULL, |
| 19 | | - `notlog_end_end` char(14) DEFAULT NULL, |
| 20 | | - `notlog_begin_enabled` tinyint(1) DEFAULT NULL, |
| 21 | | - `notlog_end_enabled` tinyint(1) DEFAULT NULL, |
| 22 | | - `notlog_begin_preferred` tinyint(1) DEFAULT NULL, |
| 23 | | - `notlog_end_preferred` tinyint(1) DEFAULT NULL, |
| 24 | | - `notlog_begin_locked` tinyint(1) DEFAULT NULL, |
| 25 | | - `notlog_end_locked` tinyint(1) DEFAULT NULL, |
| 26 | | - `notlog_begin_geo` tinyint(1) DEFAULT NULL, |
| 27 | | - `notlog_end_geo` tinyint(1) DEFAULT NULL, |
| 28 | | - `notlog_begin_banners` text, |
| 29 | | - `notlog_end_banners` text |
| 30 | | -) /*$wgDBTableOptions*/; |
| 31 | | -CREATE INDEX /*i*/notlog_timestamp ON /*_*/cn_notice_log (notlog_timestamp); |
| 32 | | -CREATE INDEX /*i*/notlog_user_id ON /*_*/cn_notice_log (notlog_user_id, notlog_timestamp); |
| 33 | | -CREATE INDEX /*i*/notlog_not_id ON /*_*/cn_notice_log (notlog_not_id, notlog_timestamp); |
| \ No newline at end of file |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/patches/patch-notice_logs.sql |
| — | — | @@ -0,0 +1,34 @@ |
| | 2 | +-- Update to allow for logging of changes to campaign settings. |
| | 3 | + |
| | 4 | +CREATE TABLE IF NOT EXISTS /*$wgDBprefix*/cn_notice_log ( |
| | 5 | + `notlog_id` int unsigned NOT NULL PRIMARY KEY auto_increment, |
| | 6 | + `notlog_timestamp` binary(14) NOT NULL, |
| | 7 | + `notlog_user_id` int unsigned NOT NULL, |
| | 8 | + `notlog_action` enum('created','modified','removed') NOT NULL DEFAULT 'modified', |
| | 9 | + `notlog_not_id` int unsigned NOT NULL, |
| | 10 | + `notlog_begin_name` varchar(255), |
| | 11 | + `notlog_end_name` varchar(255), |
| | 12 | + `notlog_begin_projects` varchar(255), |
| | 13 | + `notlog_end_projects` varchar(255), |
| | 14 | + `notlog_begin_languages` text, |
| | 15 | + `notlog_end_languages` text, |
| | 16 | + `notlog_begin_countries` text, |
| | 17 | + `notlog_end_countries` text, |
| | 18 | + `notlog_begin_start` char(14), |
| | 19 | + `notlog_end_start` char(14), |
| | 20 | + `notlog_begin_end` char(14), |
| | 21 | + `notlog_end_end` char(14), |
| | 22 | + `notlog_begin_enabled` tinyint(1), |
| | 23 | + `notlog_end_enabled` tinyint(1), |
| | 24 | + `notlog_begin_preferred` tinyint(1), |
| | 25 | + `notlog_end_preferred` tinyint(1), |
| | 26 | + `notlog_begin_locked` tinyint(1), |
| | 27 | + `notlog_end_locked` tinyint(1), |
| | 28 | + `notlog_begin_geo` tinyint(1), |
| | 29 | + `notlog_end_geo` tinyint(1), |
| | 30 | + `notlog_begin_assignments` text, |
| | 31 | + `notlog_end_assignments` text |
| | 32 | +) /*$wgDBTableOptions*/; |
| | 33 | +CREATE INDEX /*i*/notlog_timestamp ON /*_*/cn_notice_log (notlog_timestamp); |
| | 34 | +CREATE INDEX /*i*/notlog_user_id ON /*_*/cn_notice_log (notlog_user_id, notlog_timestamp); |
| | 35 | +CREATE INDEX /*i*/notlog_not_id ON /*_*/cn_notice_log (notlog_not_id, notlog_timestamp); |
| \ No newline at end of file |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/patches/patch-notice_logs.sql |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 36 | + native |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.sql |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 37 | Reverse-merged /trunk/extensions/CentralNotice/CentralNotice.sql:r91118-92408 |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.i18n.php |
| — | — | @@ -39,9 +39,7 @@ |
| 40 | 40 | 'centralnotice-show-notices' => 'Show campaigns', |
| 41 | 41 | 'centralnotice-list-templates' => 'List banners', |
| 42 | 42 | 'centralnotice-multiple-projects' => 'Multiple ($1)', |
| 43 | | - 'centralnotice-multiple-languages' => 'Multiple ($1)', |
| 44 | | - 'centralnotice-multiple-countries' => 'Multiple ($1)', |
| 45 | | - 'centralnotice-all-projects' => 'All projects', |
| | 43 | + 'centralnotice-multiple-languages' => 'Multiple ($1)', 'centralnotice-all-projects' => 'All projects', |
| 46 | 44 | 'centralnotice-language-listing' => '$1 - $2', |
| 47 | 45 | 'centralnotice-translations' => 'Translations', |
| 48 | 46 | 'centralnotice-translate-to' => 'Translate to', |
| — | — | @@ -133,7 +131,7 @@ |
| 134 | 132 | 'centralnotice-banner-fundraising' => 'This is a fundraising banner', |
| 135 | 133 | 'centralnotice-banner-fundraising-help' => 'Create an anchor tag in the banner body with id="cn_fundraising_link" and enter one or more landing pages below, for example, "JimmyAppeal01". The href of the link will be constructed automatically.', |
| 136 | 134 | 'centralnotice-banner-landing-pages' => 'Landing pages (comma-separated):', |
| 137 | | - 'centralnotice-geo' => 'Geotargeted', |
| | 135 | + 'centralnotice-geotargeted' => 'Geotargeted', |
| 138 | 136 | 'centralnotice-countries' => 'Countries', |
| 139 | 137 | 'centralnotice-allocation' => 'Allocation', |
| 140 | 138 | 'centralnotice-view-allocation' => 'View banner allocation', |
| — | — | @@ -148,19 +146,6 @@ |
| 149 | 147 | 'centralnotice-preferred' => 'Preferred', |
| 150 | 148 | 'centralnotice-logs' => 'Logs', |
| 151 | 149 | 'centralnotice-view-logs' => 'View logs', |
| 152 | | - 'centralnotice-timestamp' => 'Timestamp', |
| 153 | | - 'centralnotice-user' => 'User', |
| 154 | | - 'centralnotice-action' => 'Action', |
| 155 | | - 'centralnotice-changed' => 'Changed from <span class="cn-old-value">$1</span> to <span class="cn-new-value">$2</span>', |
| 156 | | - 'centralnotice-on' => 'on', |
| 157 | | - 'centralnotice-off' => 'off', |
| 158 | | - 'centralnotice-added' => 'Added <span class="cn-new-value">$1</span>', |
| 159 | | - 'centralnotice-removed' => 'Removed <span class="cn-old-value">$1</span>', |
| 160 | | - 'centralnotice-banners-changed' => 'Banner assignments were changed', |
| 161 | | - 'centralnotice-no-assignments' => 'no banners assigned', |
| 162 | | - 'centralnotice-talk-link' => 'talk', |
| 163 | | - 'centralnotice-user-links' => '$1 ($2)', |
| 164 | | - 'centralnotice-log-label' => '<span class="cn-log-label">$1:</span> $2', |
| 165 | 150 | ); |
| 166 | 151 | |
| 167 | 152 | /** Message documentation (Message documentation) |
| — | — | @@ -189,22 +174,14 @@ |
| 190 | 175 | 'centralnotice-summary' => 'Used in Special:CentralNotice', |
| 191 | 176 | 'centralnotice-end-date' => '{{Identical|End date}}', |
| 192 | 177 | 'centralnotice-enabled' => '{{Identical|Enabled}}', |
| 193 | | - 'centralnotice-modify' => 'Submit button on: |
| 194 | | -* "change translation language" dialog box on [[m:Special:NoticeTemplate]] |
| 195 | | -* "view banner allocation" on [[m:Special:BannerAllocation]] |
| 196 | | -* any others? |
| 197 | | - |
| 198 | | -{{Identical|Submit}}', |
| | 178 | + 'centralnotice-modify' => '{{Identical|Submit}}', |
| 199 | 179 | 'centralnotice-save-banner' => 'Label for the submit button which saves a CentralNotice banner.', |
| 200 | 180 | 'centralnotice-preview' => '{{Identical|Preview}}', |
| 201 | 181 | 'centralnotice-nopreview' => '{{Identical|Nopreview}}', |
| 202 | 182 | 'centralnotice-remove' => '{{Identical|Remove}}', |
| 203 | 183 | 'centralnotice-translate-heading' => 'Fieldset label. $1 is a name of a template.', |
| 204 | | - 'centralnotice-manage' => 'Title of sub-page of [http://meta.wikimedia.org/wiki/Special:CentralNotice Manage Central Notice] special page.', |
| 205 | 184 | 'centralnotice-add' => '{{Identical|Add}}', |
| 206 | | - 'centralnotice-multiple-languages' => '$1 is the number of languages in which the notice is available. It is always greater than 3. This message is in the column "languages" in the table.', |
| 207 | | - 'centralnotice-multiple-countries' => '$1 is the number of countries in which the notice is available.', |
| 208 | | - 'centralnotice-all-projects' => 'Data entry in the column "Projects" in the table on the [[m:Special:CentralNotice|Central Notice]] special page.', |
| | 185 | + 'centralnotice-multiple-languages' => '$1 is the number of languages in which the notice is available. It is always greater than 3. This message in the column "languages" in the table.', |
| 209 | 186 | 'centralnotice-language-listing' => 'A language listing for the language multi-select box. First parameter is the language code. Second parameter is the name of the language.', |
| 210 | 187 | 'centralnotice-translations' => '{{Identical|Translation}}', |
| 211 | 188 | 'centralnotice-translate' => '{{Identical|Translate}}', |
| — | — | @@ -232,27 +209,15 @@ |
| 233 | 210 | 'centralnotice-insert' => '{{Identical|Insert}}', |
| 234 | 211 | 'centralnotice-hide-button' => 'See also {{msg|Centralnotice-expand-button}}.', |
| 235 | 212 | 'centralnotice-expand-button' => 'See also {{msg|Centralnotice-hide-button}}.', |
| 236 | | - 'centralnotice-geo' => 'Used to label a checkbox which activates geotargeting', |
| 237 | | - 'centralnotice-allocation' => 'Tab for sub-page [[m:BannerAllocation|banner allocation]] to central notice special page.', |
| 238 | | - 'centralnotice-view-allocation' => 'Heading of dialog box on [[m:Special:BannerAllocation|banner allocation]] special page.', |
| 239 | | - 'centralnotice-allocation-instructions' => 'Dialog box instructions on [[m:Special:BannerAllocation|banner allocation]] special page.', |
| | 213 | + 'centralnotice-geotargeted' => 'Used to label a checkbox which activates geotargeting', |
| 240 | 214 | 'centralnotice-languages' => '{{Identical|Language}}', |
| 241 | | - 'centralnotice-projects' => 'Column heading of a table in the [http://meta.wikimedia.org/wiki/Special:CentralNotice Manage Central Notice] special page |
| 242 | | - |
| 243 | | -{{Identical|Project}}', |
| | 215 | + 'centralnotice-projects' => '{{Identical|Project}}', |
| 244 | 216 | 'centralnotice-country' => '{{Identical|Country}}', |
| 245 | | - 'centralnotice-no-allocation' => 'Message for nil result to query on [[m:Special:BannerAllocation|banner allocation]] special page.', |
| 246 | 217 | 'centralnotice-allocation-description' => 'A description of the environment the allocation of which is being described. |
| 247 | 218 | * $1 is the language code for the site (e.g "en"). |
| 248 | 219 | * $2 is the project name for the site (e.g. "wikipedia"). |
| 249 | 220 | * $3 is the country code (e.g. "US").', |
| 250 | 221 | 'centralnotice-logs' => 'Label for tab which displays a log of changes', |
| 251 | | - 'centralnotice-user' => '{{Identical|User}}', |
| 252 | | - 'centralnotice-action' => '{{Identical|Action}}', |
| 253 | | - 'centralnotice-no-assignments' => 'Appears in the middle of a sentence; should be all lower case.', |
| 254 | | - 'centralnotice-talk-link' => 'Link for user talk page; should be lower case.', |
| 255 | | - 'centralnotice-user-links' => '$1 is a link to the user page, $2 is a link to the user talk page.', |
| 256 | | - 'centralnotice-log-label' => '$1 is a label for a setting, $2 is the value of the setting (or changes to the setting)', |
| 257 | 222 | ); |
| 258 | 223 | |
| 259 | 224 | /** Afrikaans (Afrikaans) |
| — | — | @@ -450,7 +415,6 @@ |
| 451 | 416 | 'centralnotice' => 'مدير الإخطار المركزي', |
| 452 | 417 | 'noticetemplate' => 'إداري الإخطار المركزي', |
| 453 | 418 | 'bannerallocation' => 'أخطار الإداري المركزي', |
| 454 | | - 'centralnoticelogs' => 'إداري الإخطار المركزي', |
| 455 | 419 | 'right-centralnotice-admin' => 'أدر الإخطارات المركزية', |
| 456 | 420 | 'action-centralnotice-admin' => 'التحكم بالإعلانات المركزية', |
| 457 | 421 | 'centralnotice-desc' => 'يضيف إعلانا مركزيا للموقع', |
| — | — | @@ -568,7 +532,7 @@ |
| 569 | 533 | 'centralnotice-banner-fundraising' => 'هذا هو شعار جمع التبرعات.', |
| 570 | 534 | 'centralnotice-banner-fundraising-help' => 'إنشاء علامة ارتساء في نص الشعار مع معرف = "cn_fundraising_link"، وقم بإدخال واحد أو أكثر الصفحات المقصودة أدناه، على سبيل المثال، "JimmyAppeal01". سيتم تعبيد href الارتباط تلقائياً.', |
| 571 | 535 | 'centralnotice-banner-landing-pages' => 'الصفحات المقصودة (مفصولة بفواصل) :', |
| 572 | | - 'centralnotice-geo' => 'الاستهداف الجغرافي', |
| | 536 | + 'centralnotice-geotargeted' => 'الاستهداف الجغرافي', |
| 573 | 537 | 'centralnotice-countries' => 'الدول', |
| 574 | 538 | 'centralnotice-allocation' => 'تخصيص', |
| 575 | 539 | 'centralnotice-view-allocation' => 'موقع عرض الشعار', |
| — | — | @@ -582,11 +546,6 @@ |
| 583 | 547 | 'centralnotice-documentwrite-error' => 'لا يمكن إستخدام التعبير document.write() في داخل الشعار. |
| 584 | 548 | للحصول على مزيد من المعلومات راجع http://meta.wikimedia.org/wiki/Help:CentralNotice .', |
| 585 | 549 | 'centralnotice-preferred' => 'مفضل', |
| 586 | | - 'centralnotice-logs' => 'سجلات', |
| 587 | | - 'centralnotice-view-logs' => 'عرض السجلات', |
| 588 | | - 'centralnotice-timestamp' => 'طابع زمني', |
| 589 | | - 'centralnotice-user' => 'مستخدم', |
| 590 | | - 'centralnotice-action' => 'فعل', |
| 591 | 550 | ); |
| 592 | 551 | |
| 593 | 552 | /** Aramaic (ܐܪܡܝܐ) |
| — | — | @@ -945,7 +904,7 @@ |
| 946 | 905 | 'centralnotice-banner-type' => 'Баннер төрө:', |
| 947 | 906 | 'centralnotice-banner-hidable' => 'Статик/йәшерелеүсән', |
| 948 | 907 | 'centralnotice-banner-collapsible' => 'Төрөлөүсән', |
| 949 | | - 'centralnotice-geo' => 'Геобәйләнеш', |
| | 908 | + 'centralnotice-geotargeted' => 'Геобәйләнеш', |
| 950 | 909 | 'centralnotice-countries' => 'Илдәр', |
| 951 | 910 | 'centralnotice-allocation' => 'Урынлашыу', |
| 952 | 911 | 'centralnotice-view-allocation' => 'Баннерҙарҙың урынлашыуын ҡарау', |
| — | — | @@ -961,15 +920,6 @@ |
| 962 | 921 | 'centralnotice-preferred' => 'Өҫтөнлөк бирелгән', |
| 963 | 922 | ); |
| 964 | 923 | |
| 965 | | -/** Bavarian (Boarisch) |
| 966 | | - * @author Mucalexx |
| 967 | | - */ |
| 968 | | -$messages['bar'] = array( |
| 969 | | - 'centralnotice-translate-to' => 'Ywersetzen auf', |
| 970 | | - 'centralnotice-translate' => 'Ywersetzen', |
| 971 | | - 'centralnotice-english' => 'Englisch', |
| 972 | | -); |
| 973 | | - |
| 974 | 924 | /** Southern Balochi (بلوچی مکرانی) |
| 975 | 925 | * @author Mostafadaneshvar |
| 976 | 926 | */ |
| — | — | @@ -1046,7 +996,6 @@ |
| 1047 | 997 | 'centralnotice-list-templates' => 'Сьпіс паведамленьняў', |
| 1048 | 998 | 'centralnotice-multiple-projects' => 'некалькі ($1)', |
| 1049 | 999 | 'centralnotice-multiple-languages' => 'некалькі ($1)', |
| 1050 | | - 'centralnotice-multiple-countries' => 'Некалькі ($1)', |
| 1051 | 1000 | 'centralnotice-all-projects' => 'Усе праекты', |
| 1052 | 1001 | 'centralnotice-translations' => 'Пераклады', |
| 1053 | 1002 | 'centralnotice-translate-to' => 'Пераклад на', |
| — | — | @@ -1138,7 +1087,7 @@ |
| 1139 | 1088 | 'centralnotice-banner-fundraising' => 'Гэта банэр для збору ахвяраваньняў', |
| 1140 | 1089 | 'centralnotice-banner-fundraising-help' => 'Стварыце тэг спасылкі ў зьмесьце банэра з id="cn_fundraising_link" і пазначце адну ці некалькі мэтавых старонак, напрыклад, «JimmyAppeal01». Атрыбут href будзе створаны аўтаматычна.', |
| 1141 | 1090 | 'centralnotice-banner-landing-pages' => 'Мэтавыя старонкі (праз коску):', |
| 1142 | | - 'centralnotice-geo' => 'Геаграфічная прывязка', |
| | 1091 | + 'centralnotice-geotargeted' => 'Геаграфічная прывязка', |
| 1143 | 1092 | 'centralnotice-countries' => 'Краіны', |
| 1144 | 1093 | 'centralnotice-allocation' => 'Прызначэньне', |
| 1145 | 1094 | 'centralnotice-view-allocation' => 'Паказаць разьмяшчэньне банэра', |
| — | — | @@ -1154,10 +1103,6 @@ |
| 1155 | 1104 | 'centralnotice-preferred' => 'Пажадана', |
| 1156 | 1105 | 'centralnotice-logs' => 'Журналы падзеяў', |
| 1157 | 1106 | 'centralnotice-view-logs' => 'Паказаць журнал падзеяў', |
| 1158 | | - 'centralnotice-timestamp' => 'Дата/час', |
| 1159 | | - 'centralnotice-user' => 'Удзельнік', |
| 1160 | | - 'centralnotice-action' => 'Дзеяньне', |
| 1161 | | - 'centralnotice-changed' => 'Зьмяніць з <span class="cn-old-value">$1</span> на <span class="cn-new-value">$2</span>', |
| 1162 | 1107 | ); |
| 1163 | 1108 | |
| 1164 | 1109 | /** Bulgarian (Български) |
| — | — | @@ -1353,7 +1298,7 @@ |
| 1354 | 1299 | 'centralnotice-banner-type' => 'ব্যানারের ধরন:', |
| 1355 | 1300 | 'centralnotice-banner-hidable' => 'স্ট্যাটিক/লুকানোযোগ্য', |
| 1356 | 1301 | 'centralnotice-banner-collapsible' => 'ভাঁজযোগ্য', |
| 1357 | | - 'centralnotice-geo' => 'স্থানাংকলক্ষ্য', |
| | 1302 | + 'centralnotice-geotargeted' => 'স্থানাংকলক্ষ্য', |
| 1358 | 1303 | 'centralnotice-countries' => 'দেশ', |
| 1359 | 1304 | 'centralnotice-languages' => 'ভাষা', |
| 1360 | 1305 | 'centralnotice-projects' => 'প্রকল্প', |
| — | — | @@ -1507,7 +1452,7 @@ |
| 1508 | 1453 | 'centralnotice-banner-fundraising' => "Ur giton dastum arc'hant eo hemañ", |
| 1509 | 1454 | 'centralnotice-banner-fundraising-help' => 'Krouiñ ur valizenn eoriañ e-korf ar giton gant id = "cn_fundraising_link" ha merkit ur bajenn dal pe meur a hini a-is, da skouer, "JimmyAppeal01". Savet e vo href al liamm ent emgefre.', |
| 1510 | 1455 | 'centralnotice-banner-landing-pages' => 'Pajennoù pal (dispartiet dre skejoù) :', |
| 1511 | | - 'centralnotice-geo' => "Geolec'hiet", |
| | 1456 | + 'centralnotice-geotargeted' => "Geolec'hiet", |
| 1512 | 1457 | 'centralnotice-countries' => 'Broioù', |
| 1513 | 1458 | 'centralnotice-allocation' => 'Skorenn', |
| 1514 | 1459 | 'centralnotice-view-allocation' => 'Gwelout skorenn ar giton', |
| — | — | @@ -1650,7 +1595,7 @@ |
| 1651 | 1596 | 'centralnotice-banner-fundraising' => 'Ovo je plakat za donacije', |
| 1652 | 1597 | 'centralnotice-banner-fundraising-help' => 'Pravi oznaku za uklapanje u tijelo banera sa id="cn_fundraising_link" i unosi jedan ili više ciljnih članaka ispod, naprimjer, "JimmyAppeal01". Oznaka href za link će biti automatski napravljen.', |
| 1653 | 1598 | 'centralnotice-banner-landing-pages' => 'Ciljne stranice (razdvojene zarezima):', |
| 1654 | | - 'centralnotice-geo' => 'Geociljano', |
| | 1599 | + 'centralnotice-geotargeted' => 'Geociljano', |
| 1655 | 1600 | 'centralnotice-countries' => 'Države', |
| 1656 | 1601 | 'centralnotice-allocation' => 'Raspoređivanje', |
| 1657 | 1602 | 'centralnotice-view-allocation' => 'Pogledaj dodjelu obavještenja', |
| — | — | @@ -1795,7 +1740,7 @@ |
| 1796 | 1741 | 'centralnotice-banner-type' => 'Tipus de pancarta:', |
| 1797 | 1742 | 'centralnotice-banner-hidable' => 'Estàtic/Amagable', |
| 1798 | 1743 | 'centralnotice-banner-collapsible' => 'Plegable', |
| 1799 | | - 'centralnotice-geo' => 'Geolocalitzat', |
| | 1744 | + 'centralnotice-geotargeted' => 'Geolocalitzat', |
| 1800 | 1745 | 'centralnotice-countries' => 'Països', |
| 1801 | 1746 | 'centralnotice-allocation' => 'Assignació', |
| 1802 | 1747 | 'centralnotice-view-allocation' => 'Veure la disposició de la pancarta', |
| — | — | @@ -1965,7 +1910,7 @@ |
| 1966 | 1911 | 'centralnotice-banner-fundraising' => 'Tohle je banner pro fundraising', |
| 1967 | 1912 | 'centralnotice-banner-fundraising-help' => 'V těle banneru vytvořte odkaz s id="cn_fundraising_link" a níže zadejte jednu nebo více cílových stránek, například „JimmyAppeal01“. U odkazu se href vyplní automaticky.', |
| 1968 | 1913 | 'centralnotice-banner-landing-pages' => 'Cílové stránky (oddělené čárkou):', |
| 1969 | | - 'centralnotice-geo' => 'Zeměpisně cílené', |
| | 1914 | + 'centralnotice-geotargeted' => 'Zeměpisně cílené', |
| 1970 | 1915 | 'centralnotice-countries' => 'Země', |
| 1971 | 1916 | 'centralnotice-allocation' => 'Přidělení', |
| 1972 | 1917 | 'centralnotice-view-allocation' => 'Zobrazit přidělení bannerů', |
| — | — | @@ -1988,7 +1933,7 @@ |
| 1989 | 1934 | * @author Xxglennxx |
| 1990 | 1935 | */ |
| 1991 | 1936 | $messages['cy'] = array( |
| 1992 | | - 'centralnotice' => 'Gweinyddu hysbysiadau canolog', |
| | 1937 | + 'centralnotice' => "Gweinyddu'r hysbysiad canolog", |
| 1993 | 1938 | 'noticetemplate' => "Gweinyddu'r hysbysiad canolog", |
| 1994 | 1939 | 'bannerallocation' => "Gweinyddu'r hysbysiad canolog", |
| 1995 | 1940 | 'right-centralnotice-admin' => 'Gweinyddu hysbysiadau canolog', |
| — | — | @@ -2000,7 +1945,7 @@ |
| 2001 | 1946 | 'centralnotice-notice-name' => "Enw'r hysbysiad", |
| 2002 | 1947 | 'centralnotice-end-date' => 'Dyddiad y daw i ben', |
| 2003 | 1948 | 'centralnotice-enabled' => 'Wedi ei alluogi', |
| 2004 | | - 'centralnotice-modify' => 'Dangoser', |
| | 1949 | + 'centralnotice-modify' => 'Gosoder', |
| 2005 | 1950 | 'centralnotice-save-banner' => 'Cadwer y baner', |
| 2006 | 1951 | 'centralnotice-preview' => 'Rhagolwg', |
| 2007 | 1952 | 'centralnotice-add-new' => 'Ychwanegu hysbysiad canolog newydd', |
| — | — | @@ -2014,9 +1959,6 @@ |
| 2015 | 1960 | 'centralnotice-add-template' => 'Ychwanegu nodyn', |
| 2016 | 1961 | 'centralnotice-show-notices' => 'Dangos yr hysbysiadau', |
| 2017 | 1962 | 'centralnotice-list-templates' => "Rhestru'r nodiadau", |
| 2018 | | - 'centralnotice-multiple-projects' => 'Nifer ($1)', |
| 2019 | | - 'centralnotice-multiple-languages' => 'Nifer ($1)', |
| 2020 | | - 'centralnotice-all-projects' => 'Pob prosiect', |
| 2021 | 1963 | 'centralnotice-translations' => 'Cyfieithiadau', |
| 2022 | 1964 | 'centralnotice-translate-to' => "Cyfieithu i'r", |
| 2023 | 1965 | 'centralnotice-translate' => 'Cyfieithu', |
| — | — | @@ -2056,7 +1998,6 @@ |
| 2057 | 1999 | 'centralnotice-end-time' => 'Amser y daw i ben (UTC)', |
| 2058 | 2000 | 'centralnotice-no-templates' => 'Ni chanfuwyd unrhyw faner. |
| 2059 | 2001 | Ychwanegwch rai!', |
| 2060 | | - 'centralnotice-available-templates' => 'Y baneri sydd ar gael', |
| 2061 | 2002 | 'centralnotice-weights' => 'Pwysau', |
| 2062 | 2003 | 'centralnotice-notice-is-locked' => "Mae'r hysbysiad wedi ei gloi. |
| 2063 | 2004 | Ni chaiff ei dynnu i ffwrdd", |
| — | — | @@ -2072,24 +2013,13 @@ |
| 2073 | 2014 | 'centralnotice-close-button' => 'Botwm cau', |
| 2074 | 2015 | 'centralnotice-translate-button' => 'Cyswllt i annog cyfieithu', |
| 2075 | 2016 | 'centralnotice-donate-button' => 'Botwm rhoi', |
| 2076 | | - 'centralnotice-banner-display' => 'Dangos i:', |
| 2077 | 2017 | 'centralnotice-banner-anonymous' => 'Defnyddwyr anhysbys', |
| 2078 | | - 'centralnotice-banner-logged-in' => 'Defnyddwyr sydd wedi mewngofnodi', |
| 2079 | | - 'centralnotice-banner-fundraising' => 'Mae hwn yn faner codi arian', |
| 2080 | 2018 | 'centralnotice-countries' => 'Gwledydd', |
| 2081 | | - 'centralnotice-allocation' => 'Dyraniad', |
| 2082 | | - 'centralnotice-view-allocation' => 'Gweld dyraniad baneri', |
| 2083 | | - 'centralnotice-allocation-instructions' => 'Dewiswch y cyfuniad o feysydd yr hoffech weld dyraniad y baneri arno:', |
| | 2019 | + 'centralnotice-view-allocation' => 'Gweld dosbarthiad y faner', |
| 2084 | 2020 | 'centralnotice-languages' => 'Ieithoedd', |
| 2085 | | - 'centralnotice-projects' => 'Prosiectau', |
| 2086 | 2021 | 'centralnotice-country' => 'Gwlad', |
| 2087 | | - 'centralnotice-no-allocation' => 'Dim baneri wedi eu dyrannu.', |
| 2088 | | - 'centralnotice-allocation-description' => 'Dyraniad y baneri ar $1.$2 yn $3:', |
| 2089 | 2022 | 'centralnotice-percentage' => 'Canran', |
| 2090 | 2023 | 'centralnotice-preferred' => 'Gorau gennych', |
| 2091 | | - 'centralnotice-logs' => 'Logiau', |
| 2092 | | - 'centralnotice-view-logs' => 'Gweld y logiau', |
| 2093 | | - 'centralnotice-user' => 'Defnyddiwr', |
| 2094 | 2024 | ); |
| 2095 | 2025 | |
| 2096 | 2026 | /** Danish (Dansk) |
| — | — | @@ -2187,7 +2117,6 @@ |
| 2188 | 2118 | * @author Metalhead64 |
| 2189 | 2119 | * @author Purodha |
| 2190 | 2120 | * @author Raimond Spekking |
| 2191 | | - * @author Robby |
| 2192 | 2121 | * @author The Evil IP address |
| 2193 | 2122 | * @author Umherirrender |
| 2194 | 2123 | */ |
| — | — | @@ -2222,7 +2151,6 @@ |
| 2223 | 2152 | 'centralnotice-list-templates' => 'Vorlagen auflisten', |
| 2224 | 2153 | 'centralnotice-multiple-projects' => 'mehrere ($1)', |
| 2225 | 2154 | 'centralnotice-multiple-languages' => 'mehrere ($1)', |
| 2226 | | - 'centralnotice-multiple-countries' => 'mehrere ($1)', |
| 2227 | 2155 | 'centralnotice-all-projects' => 'Alle Projekte', |
| 2228 | 2156 | 'centralnotice-translations' => 'Übersetzungen', |
| 2229 | 2157 | 'centralnotice-translate-to' => 'Übersetzen in', |
| — | — | @@ -2314,7 +2242,7 @@ |
| 2315 | 2243 | 'centralnotice-banner-fundraising' => 'Dies ist ein Fundraisingbanner', |
| 2316 | 2244 | 'centralnotice-banner-fundraising-help' => 'Ein Ankerelement im Korpus des Banners mit id="cn_fundraising_link" erstellen sowie eine oder mehrere Zielseiten, wie bspw. "JimmysAufruf01". Das href-Attribut des Links wird automatisch erstellt.', |
| 2317 | 2245 | 'centralnotice-banner-landing-pages' => 'Zielseiten (durch Kommata getrennt):', |
| 2318 | | - 'centralnotice-geo' => 'Geo-anvisiert', |
| | 2246 | + 'centralnotice-geotargeted' => 'Geo-anvisiert', |
| 2319 | 2247 | 'centralnotice-countries' => 'Staaten', |
| 2320 | 2248 | 'centralnotice-allocation' => 'Anordnung', |
| 2321 | 2249 | 'centralnotice-view-allocation' => 'Anordnung der Vorlagen ansehen', |
| — | — | @@ -2330,17 +2258,6 @@ |
| 2331 | 2259 | 'centralnotice-preferred' => 'Bevorzugt', |
| 2332 | 2260 | 'centralnotice-logs' => 'Logbücher', |
| 2333 | 2261 | 'centralnotice-view-logs' => 'Logbücher ansehen', |
| 2334 | | - 'centralnotice-timestamp' => 'Zeitstempel', |
| 2335 | | - 'centralnotice-user' => 'Benutzer', |
| 2336 | | - 'centralnotice-action' => 'Aktion', |
| 2337 | | - 'centralnotice-changed' => 'Von <span class="cn-old-value">$1</span> zu <span class="cn-new-value">$2</span> geändert', |
| 2338 | | - 'centralnotice-on' => 'an', |
| 2339 | | - 'centralnotice-off' => 'aus', |
| 2340 | | - 'centralnotice-added' => '<span class="cn-new-value">$1</span> hinzugefügt', |
| 2341 | | - 'centralnotice-removed' => '<span class="cn-old-value">$1</span> entfernt', |
| 2342 | | - 'centralnotice-banners-changed' => 'Bannerzuordnungen wurden geändert', |
| 2343 | | - 'centralnotice-no-assignments' => 'keine Banner zugeordnet', |
| 2344 | | - 'centralnotice-talk-link' => 'Diskussion', |
| 2345 | 2262 | ); |
| 2346 | 2263 | |
| 2347 | 2264 | /** German (formal address) (Deutsch (Sie-Form)) |
| — | — | @@ -2561,7 +2478,7 @@ |
| 2562 | 2479 | 'centralnotice-banner-type' => 'Chórgojowy typ:', |
| 2563 | 2480 | 'centralnotice-banner-hidable' => 'Statiski/Chowajobny', |
| 2564 | 2481 | 'centralnotice-banner-collapsible' => 'Fałdujobny', |
| 2565 | | - 'centralnotice-geo' => 'Geolokalizěrowany', |
| | 2482 | + 'centralnotice-geotargeted' => 'Geolokalizěrowany', |
| 2566 | 2483 | 'centralnotice-countries' => 'Kraje', |
| 2567 | 2484 | 'centralnotice-allocation' => 'Zrědowanje', |
| 2568 | 2485 | 'centralnotice-view-allocation' => 'Zrědowanje banarja se woglědaś', |
| — | — | @@ -2712,7 +2629,7 @@ |
| 2713 | 2630 | 'centralnotice-banner-type' => 'Τύπος banner:', |
| 2714 | 2631 | 'centralnotice-banner-hidable' => 'Στατικό / Αποκρύψιμο', |
| 2715 | 2632 | 'centralnotice-banner-collapsible' => 'Πτυσσόμενο', |
| 2716 | | - 'centralnotice-geo' => 'Γεωγραφικά στοχοποιημένο', |
| | 2633 | + 'centralnotice-geotargeted' => 'Γεωγραφικά στοχοποιημένο', |
| 2717 | 2634 | 'centralnotice-countries' => 'Χώρες', |
| 2718 | 2635 | 'centralnotice-allocation' => 'Κατανομή', |
| 2719 | 2636 | 'centralnotice-view-allocation' => 'Δείτε κατανομή banner', |
| — | — | @@ -2851,7 +2768,7 @@ |
| 2852 | 2769 | 'centralnotice-banner-type' => 'Rubanda tipo:', |
| 2853 | 2770 | 'centralnotice-banner-hidable' => 'Statika/Kaŝebla', |
| 2854 | 2771 | 'centralnotice-banner-collapsible' => 'Maletendebla', |
| 2855 | | - 'centralnotice-geo' => 'Ŝalti geografian lokigadon', |
| | 2772 | + 'centralnotice-geotargeted' => 'Ŝalti geografian lokigadon', |
| 2856 | 2773 | 'centralnotice-countries' => 'Landoj', |
| 2857 | 2774 | 'centralnotice-allocation' => 'Asigno', |
| 2858 | 2775 | 'centralnotice-view-allocation' => 'Vidi asignon de reklamrubando', |
| — | — | @@ -2875,7 +2792,6 @@ |
| 2876 | 2793 | * @author Imre |
| 2877 | 2794 | * @author Locos epraix |
| 2878 | 2795 | * @author McDutchie |
| 2879 | | - * @author Mor |
| 2880 | 2796 | * @author Muro de Aguas |
| 2881 | 2797 | * @author Peter17 |
| 2882 | 2798 | * @author Remember the dot |
| — | — | @@ -2934,7 +2850,7 @@ |
| 2935 | 2851 | No se ha añadido', |
| 2936 | 2852 | 'centralnotice-notice-doesnt-exist' => 'La campaña no existe.', |
| 2937 | 2853 | 'centralnotice-remove-notice-doesnt-exist' => 'La campaña no existe. |
| 2938 | | -Nada que eliminar.', |
| | 2854 | +Nada que remover.', |
| 2939 | 2855 | 'centralnotice-banner-doesnt-exist' => 'La pancarta no existe.', |
| 2940 | 2856 | 'centralnotice-template-still-bound' => 'La plantilla todavía está enlazada a un aviso. |
| 2941 | 2857 | No se borrará.', |
| — | — | @@ -3001,7 +2917,7 @@ |
| 3002 | 2918 | 'centralnotice-banner-hidable' => 'Estático/Ocultable', |
| 3003 | 2919 | 'centralnotice-banner-collapsible' => 'Colapsable', |
| 3004 | 2920 | 'centralnotice-banner-fundraising' => 'Esto es un anuncio de la campaña de recaudación de fondos', |
| 3005 | | - 'centralnotice-geo' => 'Geosegmentado', |
| | 2921 | + 'centralnotice-geotargeted' => 'Geosegmentado', |
| 3006 | 2922 | 'centralnotice-countries' => 'Países', |
| 3007 | 2923 | 'centralnotice-allocation' => 'Asignación', |
| 3008 | 2924 | 'centralnotice-view-allocation' => 'Asignación de visualización de pancarta', |
| — | — | @@ -3123,7 +3039,7 @@ |
| 3124 | 3040 | 'centralnotice-banner-logged-in' => 'Sisseloginud kasutajatele', |
| 3125 | 3041 | 'centralnotice-banner-type' => 'Malli tüüp:', |
| 3126 | 3042 | 'centralnotice-banner-collapsible' => 'Kokkulükatav', |
| 3127 | | - 'centralnotice-geo' => 'Kohamääranguga', |
| | 3043 | + 'centralnotice-geotargeted' => 'Kohamääranguga', |
| 3128 | 3044 | 'centralnotice-countries' => 'Riigid', |
| 3129 | 3045 | 'centralnotice-allocation' => 'Ülesseadmine', |
| 3130 | 3046 | 'centralnotice-view-allocation' => 'Mallide ülesseade vaatamine', |
| — | — | @@ -3326,7 +3242,7 @@ |
| 3327 | 3243 | 'centralnotice-banner-type' => 'نوع پرچم:', |
| 3328 | 3244 | 'centralnotice-banner-hidable' => 'ایستا/نهفتنی', |
| 3329 | 3245 | 'centralnotice-banner-collapsible' => 'متلاشیپذیر', |
| 3330 | | - 'centralnotice-geo' => 'دارای تخصیص جغرفیایی', |
| | 3246 | + 'centralnotice-geotargeted' => 'دارای تخصیص جغرفیایی', |
| 3331 | 3247 | 'centralnotice-countries' => 'کشورها', |
| 3332 | 3248 | 'centralnotice-allocation' => 'تخصیص', |
| 3333 | 3249 | 'centralnotice-view-allocation' => 'نمایش تخصیص آگهی', |
| — | — | @@ -3468,7 +3384,7 @@ |
| 3469 | 3385 | 'centralnotice-banner-type' => 'Bannerityyppi', |
| 3470 | 3386 | 'centralnotice-banner-hidable' => 'Pysyvä/Piilotettava', |
| 3471 | 3387 | 'centralnotice-banner-collapsible' => 'Piilotettava', |
| 3472 | | - 'centralnotice-geo' => 'Maantieteellisesti suunnattu', |
| | 3388 | + 'centralnotice-geotargeted' => 'Maantieteellisesti suunnattu', |
| 3473 | 3389 | 'centralnotice-countries' => 'Maat', |
| 3474 | 3390 | 'centralnotice-allocation' => 'Jakaminen', |
| 3475 | 3391 | 'centralnotice-view-allocation' => 'Näytä bannerin jakaminen', |
| — | — | @@ -3619,7 +3535,7 @@ |
| 3620 | 3536 | 'centralnotice-banner-fundraising' => "Il s'agit d'une bannière de levée de fonds", |
| 3621 | 3537 | 'centralnotice-banner-fundraising-help' => 'Créer une balise d\'ancrage dans le corps de la bannière avec id = "cn_fundraising_link" et entrez un ou plusieurs pages de destination ci-dessous, par exemple, "JimmyAppeal01". Le href du lien sera construit automatiquement.', |
| 3622 | 3538 | 'centralnotice-banner-landing-pages' => 'Pages de destination (séparées par des virgules):', |
| 3623 | | - 'centralnotice-geo' => 'Géolocalisé', |
| | 3539 | + 'centralnotice-geotargeted' => 'Géolocalisé', |
| 3624 | 3540 | 'centralnotice-countries' => 'Pays', |
| 3625 | 3541 | 'centralnotice-allocation' => 'Allocation', |
| 3626 | 3542 | 'centralnotice-view-allocation' => 'Voir la disposition de bannière', |
| — | — | @@ -3758,7 +3674,7 @@ |
| 3759 | 3675 | 'centralnotice-banner-type' => 'Tipo de baniére :', |
| 3760 | 3676 | 'centralnotice-banner-hidable' => 'Statica / cachâbla', |
| 3761 | 3677 | 'centralnotice-banner-collapsible' => 'Rèductibla', |
| 3762 | | - 'centralnotice-geo' => 'G·eolocalisâ', |
| | 3678 | + 'centralnotice-geotargeted' => 'G·eolocalisâ', |
| 3763 | 3679 | 'centralnotice-countries' => 'Payis', |
| 3764 | 3680 | 'centralnotice-allocation' => 'Alocacion', |
| 3765 | 3681 | 'centralnotice-view-allocation' => 'Vêre l’alocacion de baniére', |
| — | — | @@ -3770,8 +3686,6 @@ |
| 3771 | 3687 | 'centralnotice-allocation-description' => 'Alocacion de baniére por $1.$2 en $3 :', |
| 3772 | 3688 | 'centralnotice-percentage' => 'Porcentâjo', |
| 3773 | 3689 | 'centralnotice-preferred' => 'Prèferâ', |
| 3774 | | - 'centralnotice-logs' => 'Jornals', |
| 3775 | | - 'centralnotice-view-logs' => 'Vêre los jornals', |
| 3776 | 3690 | ); |
| 3777 | 3691 | |
| 3778 | 3692 | /** Irish (Gaeilge) |
| — | — | @@ -3906,7 +3820,7 @@ |
| 3907 | 3821 | 'centralnotice-banner-fundraising' => 'Este é un cartel da recadación de fondos', |
| 3908 | 3822 | 'centralnotice-banner-fundraising-help' => 'Cree unha etiqueta de largo no corpo do cartel con id="cn_fundraising_link" e insira a continuación unha ou máis páxina de destino; por exemplo, "JimmyAppeal01". O parámetro href da ligazón construirase automaticamente.', |
| 3909 | 3823 | 'centralnotice-banner-landing-pages' => 'Páxinas de destino (separadas por comas):', |
| 3910 | | - 'centralnotice-geo' => 'Localizado xeograficamente', |
| | 3824 | + 'centralnotice-geotargeted' => 'Localizado xeograficamente', |
| 3911 | 3825 | 'centralnotice-countries' => 'Países', |
| 3912 | 3826 | 'centralnotice-allocation' => 'Asignación', |
| 3913 | 3827 | 'centralnotice-view-allocation' => 'Ollar a asignación do modelo', |
| — | — | @@ -4069,7 +3983,7 @@ |
| 4070 | 3984 | 'centralnotice-banner-type' => 'Bannertyp:', |
| 4071 | 3985 | 'centralnotice-banner-hidable' => 'Statisch/Uusbländbar', |
| 4072 | 3986 | 'centralnotice-banner-collapsible' => 'Yyklappbar', |
| 4073 | | - 'centralnotice-geo' => 'Geo-aavisiert', |
| | 3987 | + 'centralnotice-geotargeted' => 'Geo-aavisiert', |
| 4074 | 3988 | 'centralnotice-countries' => 'Länder', |
| 4075 | 3989 | 'centralnotice-allocation' => 'Zuewysig', |
| 4076 | 3990 | 'centralnotice-view-allocation' => 'Aaornig vu dr Banner aaluege', |
| — | — | @@ -4122,7 +4036,6 @@ |
| 4123 | 4037 | 'centralnotice-list-templates' => 'רשימת תבניות', |
| 4124 | 4038 | 'centralnotice-multiple-projects' => 'מרובים ($1)', |
| 4125 | 4039 | 'centralnotice-multiple-languages' => 'מרובות ($1)', |
| 4126 | | - 'centralnotice-multiple-countries' => 'מרובות ($1)', |
| 4127 | 4040 | 'centralnotice-all-projects' => 'כל המיזמים', |
| 4128 | 4041 | 'centralnotice-translations' => 'תרגומים', |
| 4129 | 4042 | 'centralnotice-translate-to' => 'תרגום ל', |
| — | — | @@ -4214,7 +4127,7 @@ |
| 4215 | 4128 | 'centralnotice-banner-fundraising' => 'זוהי כרזת התרמה', |
| 4216 | 4129 | 'centralnotice-banner-fundraising-help' => 'נא ליצור תג עוגן בגוף הכּרזה עם id="cn_fundraising_link" ולהזין דף נחיתה אחד או יותר בהמשך, למשל "JimmyAppeal01". ערך ה־href של הקישור ייבנה באופן אוטומטי.', |
| 4217 | 4130 | 'centralnotice-banner-landing-pages' => 'דפי נחיתה (מופרדים בפסיקים):', |
| 4218 | | - 'centralnotice-geo' => 'ממוקד גאוגרפית', |
| | 4131 | + 'centralnotice-geotargeted' => 'ממוקד גאוגרפית', |
| 4219 | 4132 | 'centralnotice-countries' => 'מדינות', |
| 4220 | 4133 | 'centralnotice-allocation' => 'הקצאה', |
| 4221 | 4134 | 'centralnotice-view-allocation' => 'צפייה בהקצאת הבאנר', |
| — | — | @@ -4230,17 +4143,6 @@ |
| 4231 | 4144 | 'centralnotice-preferred' => 'מועדפת', |
| 4232 | 4145 | 'centralnotice-logs' => 'יומנים', |
| 4233 | 4146 | 'centralnotice-view-logs' => 'הצגת יומנים', |
| 4234 | | - 'centralnotice-timestamp' => 'חותם זמן', |
| 4235 | | - 'centralnotice-user' => 'משתמש', |
| 4236 | | - 'centralnotice-action' => 'פעולה', |
| 4237 | | - 'centralnotice-changed' => 'שונה מהערך <span class="cn-old-value">$1</span> לערך <span class="cn-new-value">$2</span>', |
| 4238 | | - 'centralnotice-on' => 'פעיל', |
| 4239 | | - 'centralnotice-off' => 'כבוי', |
| 4240 | | - 'centralnotice-added' => 'נוסף: <span class="cn-new-value">$1</span>', |
| 4241 | | - 'centralnotice-removed' => 'הוסר: <span class="cn-old-value">$1</span>', |
| 4242 | | - 'centralnotice-banners-changed' => 'הקצאות של כרזות שונו', |
| 4243 | | - 'centralnotice-no-assignments' => 'לא הוקצו כרזות', |
| 4244 | | - 'centralnotice-talk-link' => 'שיחה', |
| 4245 | 4147 | ); |
| 4246 | 4148 | |
| 4247 | 4149 | /** Hindi (हिन्दी) |
| — | — | @@ -4382,7 +4284,7 @@ |
| 4383 | 4285 | 'centralnotice-banner-type' => 'Tip obavijesti:', |
| 4384 | 4286 | 'centralnotice-banner-hidable' => 'Statični/Dinamični', |
| 4385 | 4287 | 'centralnotice-banner-collapsible' => 'Moguće sakriti', |
| 4386 | | - 'centralnotice-geo' => 'Geociljano', |
| | 4288 | + 'centralnotice-geotargeted' => 'Geociljano', |
| 4387 | 4289 | 'centralnotice-countries' => 'Države', |
| 4388 | 4290 | 'centralnotice-allocation' => 'Dodjela', |
| 4389 | 4291 | 'centralnotice-view-allocation' => 'Prikaži raspodjelu obavijesti', |
| — | — | @@ -4519,7 +4421,7 @@ |
| 4520 | 4422 | 'centralnotice-banner-type' => 'Chorhojowy typ:', |
| 4521 | 4423 | 'centralnotice-banner-hidable' => 'Statiski/Chowajomny', |
| 4522 | 4424 | 'centralnotice-banner-collapsible' => 'Fałdujomny', |
| 4523 | | - 'centralnotice-geo' => 'Geolokalizowany', |
| | 4425 | + 'centralnotice-geotargeted' => 'Geolokalizowany', |
| 4524 | 4426 | 'centralnotice-countries' => 'Kraje', |
| 4525 | 4427 | 'centralnotice-allocation' => 'Přidźělenje', |
| 4526 | 4428 | 'centralnotice-view-allocation' => 'Přidźělenje chorhoje sej wobhladać', |
| — | — | @@ -4658,7 +4560,7 @@ |
| 4659 | 4561 | 'centralnotice-banner-type' => 'Hirdetés típusa:', |
| 4660 | 4562 | 'centralnotice-banner-hidable' => 'Statikus/elrejthető', |
| 4661 | 4563 | 'centralnotice-banner-collapsible' => 'Becsukható', |
| 4662 | | - 'centralnotice-geo' => 'Célzás földrajzi hely szerint', |
| | 4564 | + 'centralnotice-geotargeted' => 'Célzás földrajzi hely szerint', |
| 4663 | 4565 | 'centralnotice-countries' => 'Országok', |
| 4664 | 4566 | 'centralnotice-allocation' => 'Kiosztás', |
| 4665 | 4567 | 'centralnotice-view-allocation' => 'Hirdetéskiosztás megtekintése', |
| — | — | @@ -4708,7 +4610,6 @@ |
| 4709 | 4611 | 'centralnotice-list-templates' => 'Listar bandieras', |
| 4710 | 4612 | 'centralnotice-multiple-projects' => 'multiple ($1)', |
| 4711 | 4613 | 'centralnotice-multiple-languages' => 'multiple ($1)', |
| 4712 | | - 'centralnotice-multiple-countries' => 'Multiple ($1)', |
| 4713 | 4614 | 'centralnotice-all-projects' => 'Tote le projectos', |
| 4714 | 4615 | 'centralnotice-translations' => 'Traductiones', |
| 4715 | 4616 | 'centralnotice-translate-to' => 'Traducer in', |
| — | — | @@ -4800,7 +4701,7 @@ |
| 4801 | 4702 | 'centralnotice-banner-fundraising' => 'Isto es un bandiera de collecta de fundos', |
| 4802 | 4703 | 'centralnotice-banner-fundraising-help' => 'Crea un etiquetta de ancora in le corpore del bandiera con id="cn_fundraising_link" e entra un o plus paginas de arrivata hic infra, per exemplo "AppelloJimmy01". Le "href" del ligamine essera construite automaticamente.', |
| 4803 | 4704 | 'centralnotice-banner-landing-pages' => 'Paginas de arrivata (separate per commas):', |
| 4804 | | - 'centralnotice-geo' => 'Localisation geographic', |
| | 4705 | + 'centralnotice-geotargeted' => 'Localisation geographic', |
| 4805 | 4706 | 'centralnotice-countries' => 'Paises', |
| 4806 | 4707 | 'centralnotice-allocation' => 'Allocation', |
| 4807 | 4708 | 'centralnotice-view-allocation' => 'Vider allocation de bandieras', |
| — | — | @@ -4816,17 +4717,6 @@ |
| 4817 | 4718 | 'centralnotice-preferred' => 'Preferite', |
| 4818 | 4719 | 'centralnotice-logs' => 'Registros', |
| 4819 | 4720 | 'centralnotice-view-logs' => 'Vider registros', |
| 4820 | | - 'centralnotice-timestamp' => 'Data e hora', |
| 4821 | | - 'centralnotice-user' => 'Usator', |
| 4822 | | - 'centralnotice-action' => 'Action', |
| 4823 | | - 'centralnotice-changed' => 'Cambiate de <span class="cn-old-value">$1</span> a <span class="cn-new-value">$2</span>', |
| 4824 | | - 'centralnotice-on' => 'active', |
| 4825 | | - 'centralnotice-off' => 'inactive', |
| 4826 | | - 'centralnotice-added' => '<span class="cn-new-value">$1</span> addite', |
| 4827 | | - 'centralnotice-removed' => '<span class="cn-old-value">$1</span> removite', |
| 4828 | | - 'centralnotice-banners-changed' => 'Assignationes de bandieras ha essite cambiate', |
| 4829 | | - 'centralnotice-no-assignments' => 'nulle bandieras assignate', |
| 4830 | | - 'centralnotice-talk-link' => 'discussion', |
| 4831 | 4721 | ); |
| 4832 | 4722 | |
| 4833 | 4723 | /** Indonesian (Bahasa Indonesia) |
| — | — | @@ -4955,7 +4845,7 @@ |
| 4956 | 4846 | 'centralnotice-banner-type' => 'Jenis panji:', |
| 4957 | 4847 | 'centralnotice-banner-hidable' => 'Statis/Dapat disembunyikan', |
| 4958 | 4848 | 'centralnotice-banner-collapsible' => 'Dapat dibuka', |
| 4959 | | - 'centralnotice-geo' => 'Ditargetgeokan', |
| | 4849 | + 'centralnotice-geotargeted' => 'Ditargetgeokan', |
| 4960 | 4850 | 'centralnotice-countries' => 'Negara', |
| 4961 | 4851 | 'centralnotice-allocation' => 'Alokasi', |
| 4962 | 4852 | 'centralnotice-view-allocation' => 'Lihat alokasi pengumuman', |
| — | — | @@ -4993,7 +4883,7 @@ |
| 4994 | 4884 | 'centralnotice-project-name' => 'Áhà orürü', |
| 4995 | 4885 | 'centralnotice-start-date' => 'Bìdó ubochi', |
| 4996 | 4886 | 'centralnotice-message' => 'Ozi', |
| 4997 | | - 'centralnotice-clone-name' => 'Áhà:', |
| | 4887 | + 'centralnotice-clone-name' => 'Áhà', |
| 4998 | 4888 | ); |
| 4999 | 4889 | |
| 5000 | 4890 | /** Ingush (ГІалгІай Ğalğaj) |
| — | — | @@ -5048,7 +4938,6 @@ |
| 5049 | 4939 | 'centralnotice' => 'Gestione avviso centralizzato', |
| 5050 | 4940 | 'noticetemplate' => 'Gestione avviso centralizzato', |
| 5051 | 4941 | 'bannerallocation' => 'Gestione avviso centralizzato', |
| 5052 | | - 'centralnoticelogs' => 'Gestione avviso centralizzato', |
| 5053 | 4942 | 'right-centralnotice-admin' => 'Gestisce gli avvisi centralizzati', |
| 5054 | 4943 | 'action-centralnotice-admin' => 'gestire gli avvisi centralizzati', |
| 5055 | 4944 | 'centralnotice-desc' => 'Aggiunge un avviso centralizzato a inizio pagina (sitenotice)', |
| — | — | @@ -5149,7 +5038,6 @@ |
| 5150 | 5039 | 'centralnotice-banner-type' => 'Tipo banner:', |
| 5151 | 5040 | 'centralnotice-banner-hidable' => 'Fisso/Nascondibile', |
| 5152 | 5041 | 'centralnotice-banner-collapsible' => 'Contraibile', |
| 5153 | | - 'centralnotice-banner-fundraising' => 'Questo è un banner per la raccolta fondi', |
| 5154 | 5042 | 'centralnotice-countries' => 'Paesi', |
| 5155 | 5043 | 'centralnotice-languages' => 'Lingue', |
| 5156 | 5044 | 'centralnotice-projects' => 'Progetti', |
| — | — | @@ -5158,15 +5046,6 @@ |
| 5159 | 5047 | 'centralnotice-documentwrite-error' => 'Non è possibile usare document.write() dentro un banner. |
| 5160 | 5048 | Vedi http://meta.wikimedia.org/wiki/Help:CentralNotice per maggiori informazioni.', |
| 5161 | 5049 | 'centralnotice-preferred' => 'Preferito', |
| 5162 | | - 'centralnotice-logs' => 'Log', |
| 5163 | | - 'centralnotice-view-logs' => 'Vedi i log', |
| 5164 | | - 'centralnotice-timestamp' => 'Data e ora', |
| 5165 | | - 'centralnotice-user' => 'Utente', |
| 5166 | | - 'centralnotice-action' => 'Azione', |
| 5167 | | - 'centralnotice-changed' => 'Modificato da <span class="cn-old-value">$1</span> a <span class="cn-new-value">$2</span>', |
| 5168 | | - 'centralnotice-added' => 'Aggiunto <span class="cn-new-value">$1</span>', |
| 5169 | | - 'centralnotice-removed' => 'Rimosso <span class="cn-old-value">$1</span>', |
| 5170 | | - 'centralnotice-talk-link' => 'discussione', |
| 5171 | 5050 | ); |
| 5172 | 5051 | |
| 5173 | 5052 | /** Japanese (日本語) |
| — | — | @@ -5183,7 +5062,6 @@ |
| 5184 | 5063 | 'centralnotice' => '中央管理通知の管理', |
| 5185 | 5064 | 'noticetemplate' => '中央管理通知の管理', |
| 5186 | 5065 | 'bannerallocation' => '中央管理通知の管理', |
| 5187 | | - 'centralnoticelogs' => '中央管理通知管理', |
| 5188 | 5066 | 'right-centralnotice-admin' => '中央管理通知の管理', |
| 5189 | 5067 | 'action-centralnotice-admin' => '中央管理通知の管理', |
| 5190 | 5068 | 'centralnotice-desc' => '中央管理のサイト通知を追加する', |
| — | — | @@ -5294,8 +5172,7 @@ |
| 5295 | 5173 | 'centralnotice-banner-type' => 'テンプレートの種類：', |
| 5296 | 5174 | 'centralnotice-banner-hidable' => '固定/非表示可', |
| 5297 | 5175 | 'centralnotice-banner-collapsible' => '折りたたみ', |
| 5298 | | - 'centralnotice-banner-fundraising' => 'これは資金調達のバナーです', |
| 5299 | | - 'centralnotice-geo' => '対象地域', |
| | 5176 | + 'centralnotice-geotargeted' => '対象地域', |
| 5300 | 5177 | 'centralnotice-countries' => '国', |
| 5301 | 5178 | 'centralnotice-allocation' => '割り当て', |
| 5302 | 5179 | 'centralnotice-view-allocation' => 'テンプレートの割り当てを表示', |
| — | — | @@ -5506,7 +5383,7 @@ |
| 5507 | 5384 | 'centralnotice-banner-type' => 'ბანერის ტიპი:', |
| 5508 | 5385 | 'centralnotice-banner-hidable' => 'სტატიკური/დაფარული', |
| 5509 | 5386 | 'centralnotice-banner-collapsible' => 'დასაკეცი', |
| 5510 | | - 'centralnotice-geo' => 'გეო-მიზნობრივი', |
| | 5387 | + 'centralnotice-geotargeted' => 'გეო-მიზნობრივი', |
| 5511 | 5388 | 'centralnotice-countries' => 'ქვეყნები', |
| 5512 | 5389 | 'centralnotice-allocation' => 'განაწილება', |
| 5513 | 5390 | 'centralnotice-view-allocation' => 'თარგების განაწილების ხილვა', |
| — | — | @@ -5608,7 +5485,7 @@ |
| 5609 | 5486 | 'centralnotice-banner-hidable' => 'នឹងថ្កល់/អាចលាក់បាន', |
| 5610 | 5487 | 'centralnotice-banner-collapsible' => 'អាចបង្រួញបាន', |
| 5611 | 5488 | 'centralnotice-banner-fundraising' => 'នេះជាបដាសំរាប់ឃោសនារៃអង្គាសប្រាក់', |
| 5612 | | - 'centralnotice-geo' => 'អាចកំនត់តំបន់សំរាប់បង្ហាញ', |
| | 5489 | + 'centralnotice-geotargeted' => 'អាចកំនត់តំបន់សំរាប់បង្ហាញ', |
| 5613 | 5490 | 'centralnotice-countries' => 'ប្រទេស', |
| 5614 | 5491 | 'centralnotice-languages' => 'ភាសា', |
| 5615 | 5492 | 'centralnotice-projects' => 'គំរោង', |
| — | — | @@ -5748,7 +5625,7 @@ |
| 5749 | 5626 | 'centralnotice-banner-type' => '배너 유형:', |
| 5750 | 5627 | 'centralnotice-banner-hidable' => '정적/숨길 수 있음', |
| 5751 | 5628 | 'centralnotice-banner-collapsible' => '접을 수 있음', |
| 5752 | | - 'centralnotice-geo' => '특정 지역을 대상으로 공지', |
| | 5629 | + 'centralnotice-geotargeted' => '특정 지역을 대상으로 공지', |
| 5753 | 5630 | 'centralnotice-countries' => '국가', |
| 5754 | 5631 | 'centralnotice-allocation' => '배당', |
| 5755 | 5632 | 'centralnotice-languages' => '언어', |
| — | — | @@ -5766,7 +5643,6 @@ |
| 5767 | 5644 | 'centralnotice' => 'Zentraal Nohreschte verwallde', |
| 5768 | 5645 | 'noticetemplate' => 'Zentraal Nohreschte verwallde', |
| 5769 | 5646 | 'bannerallocation' => 'Zentraal Nohreschte verwallde', |
| 5770 | | - 'centralnoticelogs' => 'Verwalldung vun de zentraal Nohreschte', |
| 5771 | 5647 | 'right-centralnotice-admin' => 'Zentraal Nohreschte verwallde', |
| 5772 | 5648 | 'action-centralnotice-admin' => 'zentraal Nohreschte ze verwallde', |
| 5773 | 5649 | 'centralnotice-desc' => "Brengk en zentraale ''sitenotice'' en et wiki", |
| — | — | @@ -5793,7 +5669,6 @@ |
| 5794 | 5670 | 'centralnotice-list-templates' => 'Banner_Schablohne opleßte', |
| 5795 | 5671 | 'centralnotice-multiple-projects' => 'etlijje ($1)', |
| 5796 | 5672 | 'centralnotice-multiple-languages' => 'etlijje ($1)', |
| 5797 | | - 'centralnotice-multiple-countries' => 'etlijje ($1)', |
| 5798 | 5673 | 'centralnotice-all-projects' => 'All Projäkte', |
| 5799 | 5674 | 'centralnotice-language-listing' => '$1 — $2', |
| 5800 | 5675 | 'centralnotice-translations' => 'Övversäzonge', |
| — | — | @@ -5885,10 +5760,7 @@ |
| 5886 | 5761 | 'centralnotice-banner-type' => 'De Zoot Banner_Schablohn:', |
| 5887 | 5762 | 'centralnotice-banner-hidable' => 'Faß udder ußschaltbaa', |
| 5888 | 5763 | 'centralnotice-banner-collapsible' => 'Enklappbaa', |
| 5889 | | - 'centralnotice-banner-fundraising' => 'Dat es en Banner_Schablohn för noh Jeld ze froore', |
| 5890 | | - 'centralnotice-banner-fundraising-help' => 'Donn ene Anker en dä Banner_Schablohn ongerbrenge met <code lang="en">id="cn_fundraising_link"</code> un en Zielsigg udder mieh dovun, esu jät wi „Dem Jimmy-singe-Oproof-01“. E <code lang="en">href</code>-Kommando fö dä Lenk kriss De automattesch dobei jemaat.', |
| 5891 | | - 'centralnotice-banner-landing-pages' => 'Zielsigge för aanzekumme, med Kommas dozwesche', |
| 5892 | | - 'centralnotice-geo' => 'Met Koodinaate op de Ääd', |
| | 5764 | + 'centralnotice-geotargeted' => 'Met Koodinaate op de Ääd', |
| 5893 | 5765 | 'centralnotice-countries' => 'Länder', |
| 5894 | 5766 | 'centralnotice-allocation' => 'Verdeilong', |
| 5895 | 5767 | 'centralnotice-view-allocation' => 'De Banner_Schablohne iehr Zohdeilong beloore', |
| — | — | @@ -5902,19 +5774,6 @@ |
| 5903 | 5775 | 'centralnotice-documentwrite-error' => 'Mer künne <code lang="en">document.write()</code> nit ennerhallef vun ene Banner_Schablohn bruche. |
| 5904 | 5776 | Loor op http://meta.wikimedia.org/wiki/Help:CentralNotice wann De mieh weße wells.', |
| 5905 | 5777 | 'centralnotice-preferred' => 'Förjetrocke!', |
| 5906 | | - 'centralnotice-logs' => 'Logböcher', |
| 5907 | | - 'centralnotice-view-logs' => 'Logböcher aanloore', |
| 5908 | | - 'centralnotice-timestamp' => 'Dattum un Zick', |
| 5909 | | - 'centralnotice-user' => '{{ns:User}}', |
| 5910 | | - 'centralnotice-action' => 'Wat jedonn?', |
| 5911 | | - 'centralnotice-changed' => 'Vun <span class="cn-old-value">$1</span> op <span class="cn-new-value">$2</span> verändert.', |
| 5912 | | - 'centralnotice-on' => 'aan', |
| 5913 | | - 'centralnotice-off' => 'uß', |
| 5914 | | - 'centralnotice-added' => '<span class="cn-new-value">$1</span> dobei jedonn.', |
| 5915 | | - 'centralnotice-removed' => '<span class="cn-new-value">$1</span> fott jenumme.', |
| 5916 | | - 'centralnotice-banners-changed' => 'Banner_Schablohne woodte anders udder neu zohjedeilt', |
| 5917 | | - 'centralnotice-no-assignments' => 'Kein Banner_Schablohne zohjedeilt', |
| 5918 | | - 'centralnotice-talk-link' => 'klaafe', |
| 5919 | 5778 | ); |
| 5920 | 5779 | |
| 5921 | 5780 | /** Kurdish (Latin) (Kurdî (Latin)) |
| — | — | @@ -5987,7 +5846,6 @@ |
| 5988 | 5847 | 'centralnotice-list-templates' => 'Lëscht vun de Banneren', |
| 5989 | 5848 | 'centralnotice-multiple-projects' => 'méi ($1)', |
| 5990 | 5849 | 'centralnotice-multiple-languages' => 'méi ($1)', |
| 5991 | | - 'centralnotice-multiple-countries' => 'Méi ($1)', |
| 5992 | 5850 | 'centralnotice-all-projects' => 'All Projeten', |
| 5993 | 5851 | 'centralnotice-translations' => 'Iwwersetzungen', |
| 5994 | 5852 | 'centralnotice-translate-to' => 'Iwwersetzen op', |
| — | — | @@ -6077,7 +5935,7 @@ |
| 6078 | 5936 | 'centralnotice-banner-hidable' => 'Statesch/Ka verstoppt ginn', |
| 6079 | 5937 | 'centralnotice-banner-collapsible' => 'Aklappbar', |
| 6080 | 5938 | 'centralnotice-banner-fundraising' => "Dëst ass e Banner vun enger Campagne fir Don'en ze sammelen", |
| 6081 | | - 'centralnotice-geo' => 'Geografesch geziilt', |
| | 5939 | + 'centralnotice-geotargeted' => 'Geografesch geziilt', |
| 6082 | 5940 | 'centralnotice-countries' => 'Länner', |
| 6083 | 5941 | 'centralnotice-allocation' => 'Dispositioun', |
| 6084 | 5942 | 'centralnotice-view-allocation' => 'Dispositioun vum Banner weisen', |
| — | — | @@ -6092,15 +5950,6 @@ |
| 6093 | 5951 | Kuckt http://meta.wikimedia.org/wiki/Help:CentralNotice fir méi Informatiounen.', |
| 6094 | 5952 | 'centralnotice-preferred' => 'Am léiwsten', |
| 6095 | 5953 | 'centralnotice-logs' => 'Logbicher', |
| 6096 | | - 'centralnotice-view-logs' => 'Logbicher weisen', |
| 6097 | | - 'centralnotice-timestamp' => 'Zäitstempel', |
| 6098 | | - 'centralnotice-user' => 'Benotzer', |
| 6099 | | - 'centralnotice-action' => 'Aktioun', |
| 6100 | | - 'centralnotice-on' => 'un', |
| 6101 | | - 'centralnotice-off' => 'aus', |
| 6102 | | - 'centralnotice-added' => '<span class="cn-new-value">$1</span> derbäigesat', |
| 6103 | | - 'centralnotice-removed' => '<span class="cn-old-value">$1</span> ewechgeholl', |
| 6104 | | - 'centralnotice-talk-link' => 'Diskussioun', |
| 6105 | 5954 | ); |
| 6106 | 5955 | |
| 6107 | 5956 | /** Lingua Franca Nova (Lingua Franca Nova) |
| — | — | @@ -6233,7 +6082,7 @@ |
| 6234 | 6083 | 'centralnotice-banner-type' => 'Vaantiep:', |
| 6235 | 6084 | 'centralnotice-banner-hidable' => 'Statisch/verbergbaar', |
| 6236 | 6085 | 'centralnotice-banner-collapsible' => 'inklapbaar', |
| 6237 | | - 'centralnotice-geo' => 'Geografische doele', |
| | 6086 | + 'centralnotice-geotargeted' => 'Geografische doele', |
| 6238 | 6087 | 'centralnotice-countries' => 'Lenj', |
| 6239 | 6088 | 'centralnotice-allocation' => 'Toewiezing', |
| 6240 | 6089 | 'centralnotice-view-allocation' => 'Betrach vaantoewiezing', |
| — | — | @@ -6319,7 +6168,7 @@ |
| 6320 | 6169 | 'centralnotice-banner-type' => 'Pranešimo tipas:', |
| 6321 | 6170 | 'centralnotice-banner-hidable' => 'Statinis/Paslepiamas', |
| 6322 | 6171 | 'centralnotice-banner-collapsible' => 'Sutraukiamas', |
| 6323 | | - 'centralnotice-geo' => 'Taikomas geografiškai', |
| | 6172 | + 'centralnotice-geotargeted' => 'Taikomas geografiškai', |
| 6324 | 6173 | 'centralnotice-countries' => 'Valstybės', |
| 6325 | 6174 | 'centralnotice-languages' => 'Kalbos', |
| 6326 | 6175 | 'centralnotice-projects' => 'Projektai', |
| — | — | @@ -6477,7 +6326,6 @@ |
| 6478 | 6327 | 'centralnotice-list-templates' => 'Наведи шаблони', |
| 6479 | 6328 | 'centralnotice-multiple-projects' => 'повеќе ($1)', |
| 6480 | 6329 | 'centralnotice-multiple-languages' => 'повеќе ($1)', |
| 6481 | | - 'centralnotice-multiple-countries' => 'Повеќе ($1)', |
| 6482 | 6330 | 'centralnotice-all-projects' => 'Сите проекти', |
| 6483 | 6331 | 'centralnotice-translations' => 'Преводи', |
| 6484 | 6332 | 'centralnotice-translate-to' => 'Преведи на', |
| — | — | @@ -6569,7 +6417,7 @@ |
| 6570 | 6418 | 'centralnotice-banner-fundraising' => 'Ова е плакат за прибирање на средства', |
| 6571 | 6419 | 'centralnotice-banner-fundraising-help' => 'Создајте ознака за вкотвување во содржината на плакатот со id="cn_fundraising_link" и внесете една или повеќе целни страници, како на пр. „JimmyAppeal01“. href на врската ќе се исконструира автоматски.', |
| 6572 | 6420 | 'centralnotice-banner-landing-pages' => 'Целни страници (одделени со запирки):', |
| 6573 | | - 'centralnotice-geo' => 'Геобележано', |
| | 6421 | + 'centralnotice-geotargeted' => 'Геобележано', |
| 6574 | 6422 | 'centralnotice-countries' => 'Земји', |
| 6575 | 6423 | 'centralnotice-allocation' => 'Распределба', |
| 6576 | 6424 | 'centralnotice-view-allocation' => 'Преглед на распределбата на плакати', |
| — | — | @@ -6584,17 +6432,6 @@ |
| 6585 | 6433 | 'centralnotice-preferred' => 'Претпочитано', |
| 6586 | 6434 | 'centralnotice-logs' => 'Дневници', |
| 6587 | 6435 | 'centralnotice-view-logs' => 'Погл. дневници', |
| 6588 | | - 'centralnotice-timestamp' => 'Време и датум', |
| 6589 | | - 'centralnotice-user' => 'Корисник', |
| 6590 | | - 'centralnotice-action' => 'Дејство', |
| 6591 | | - 'centralnotice-changed' => 'Изменето од <span class="cn-old-value">$1</span> на <span class="cn-new-value">$2</span>', |
| 6592 | | - 'centralnotice-on' => 'вкл', |
| 6593 | | - 'centralnotice-off' => 'искл', |
| 6594 | | - 'centralnotice-added' => 'Додадено <span class="cn-new-value">$1</span>', |
| 6595 | | - 'centralnotice-removed' => 'Отстрането <span class="cn-old-value">$1</span>', |
| 6596 | | - 'centralnotice-banners-changed' => 'Задавањата на плакатите се изменети', |
| 6597 | | - 'centralnotice-no-assignments' => 'нема зададено плакати', |
| 6598 | | - 'centralnotice-talk-link' => 'разговор', |
| 6599 | 6436 | ); |
| 6600 | 6437 | |
| 6601 | 6438 | /** Malayalam (മലയാളം) |
| — | — | @@ -6632,9 +6469,8 @@ |
| 6633 | 6470 | 'centralnotice-list-templates' => 'ഫലകങ്ങൾ പട്ടികവത്കരിക്കുക', |
| 6634 | 6471 | 'centralnotice-multiple-projects' => 'നിരവധി ($1)', |
| 6635 | 6472 | 'centralnotice-multiple-languages' => 'നിരവധി ($1)', |
| 6636 | | - 'centralnotice-multiple-countries' => 'നിരവധി ($1)', |
| 6637 | 6473 | 'centralnotice-all-projects' => 'എല്ലാ പദ്ധതികളും', |
| 6638 | | - 'centralnotice-translations' => 'പരിഭാഷകൾ', |
| | 6474 | + 'centralnotice-translations' => 'തർജ്ജമകൾ', |
| 6639 | 6475 | 'centralnotice-translate-to' => 'ഇതിലേയ്ക്ക് തർജ്ജമ ചെയ്യുക', |
| 6640 | 6476 | 'centralnotice-translate' => 'തർജ്ജമ ചെയ്യുക', |
| 6641 | 6477 | 'centralnotice-english' => 'ഇംഗ്ലീഷ്', |
| — | — | @@ -6723,7 +6559,7 @@ |
| 6724 | 6560 | 'centralnotice-banner-collapsible' => 'ചുരുക്കാവുന്നത്', |
| 6725 | 6561 | 'centralnotice-banner-fundraising' => 'ഇത് ഫണ്ട്റൈസിങ് എഴുത്തുപട്ടയാണ്', |
| 6726 | 6562 | 'centralnotice-banner-landing-pages' => 'എത്തിച്ചേരേണ്ട താളുകൾ (അങ്കുശത്താൽ വേർതിരിച്ച്):', |
| 6727 | | - 'centralnotice-geo' => 'ഭൂപ്രദേശങ്ങൾ ലക്ഷ്യമാക്കിയവ', |
| | 6563 | + 'centralnotice-geotargeted' => 'ഭൂപ്രദേശങ്ങൾ ലക്ഷ്യമാക്കിയവ', |
| 6728 | 6564 | 'centralnotice-countries' => 'രാജ്യങ്ങൾ', |
| 6729 | 6565 | 'centralnotice-allocation' => 'വിന്യാസം', |
| 6730 | 6566 | 'centralnotice-view-allocation' => 'എഴുത്തുപട്ടയ്ക്ക് അനുവദിച്ചിരിക്കുന്ന സ്ഥാനം കാണുക', |
| — | — | @@ -6739,15 +6575,6 @@ |
| 6740 | 6576 | 'centralnotice-preferred' => 'അഭിലഷണീയമായുള്ളത്', |
| 6741 | 6577 | 'centralnotice-logs' => 'പ്രവർത്തനരേഖകൾ', |
| 6742 | 6578 | 'centralnotice-view-logs' => 'പ്രവർത്തനരേഖകൾ കാണുക', |
| 6743 | | - 'centralnotice-timestamp' => 'സമയമുദ്ര', |
| 6744 | | - 'centralnotice-user' => 'ഉപയോക്താവ്', |
| 6745 | | - 'centralnotice-action' => 'നടപടി', |
| 6746 | | - 'centralnotice-changed' => '<span class="cn-old-value">$1</span> എന്നത് <span class="cn-new-value">$2</span> എന്നാക്കി മാറ്റിയിരിക്കുന്നു', |
| 6747 | | - 'centralnotice-on' => 'സജ്ജമാക്കുക', |
| 6748 | | - 'centralnotice-off' => 'പ്രവർത്തനരഹിതമാക്കുക', |
| 6749 | | - 'centralnotice-added' => '<span class="cn-new-value">$1</span> കൂട്ടിച്ചേർത്തിരിക്കുന്നു', |
| 6750 | | - 'centralnotice-removed' => '<span class="cn-old-value">$1</span> നീക്കം ചെയ്തിരിക്കുന്നു', |
| 6751 | | - 'centralnotice-talk-link' => 'സംവാദം', |
| 6752 | 6579 | ); |
| 6753 | 6580 | |
| 6754 | 6581 | /** Mongolian (Монгол) |
| — | — | @@ -6813,35 +6640,28 @@ |
| 6814 | 6641 | $messages['ms'] = array( |
| 6815 | 6642 | 'centralnotice' => 'Pentadbiran pemberitahuan pusat', |
| 6816 | 6643 | 'noticetemplate' => 'Pentadbiran pemberitahuan pusat', |
| 6817 | | - 'bannerallocation' => 'Pentadbiran pemberitahuan pusat', |
| 6818 | | - 'centralnoticelogs' => 'Pentadbiran pemberitahuan pusat', |
| 6819 | 6644 | 'right-centralnotice-admin' => 'Mengurus pemberitahuan pusat', |
| 6820 | 6645 | 'action-centralnotice-admin' => 'mengurus pemberitahuan pusat', |
| 6821 | | - 'centralnotice-desc' => 'Menambahkan pemberitahuan pusat', |
| 6822 | | - 'centralnotice-summary' => 'Anda boleh menggunakan modul ini untuk menyunting pemberitahuan pusat yang disediakan. |
| 6823 | | -Anda juga boleh menambahkan atau membuang pemberitahuan yang lama.', |
| 6824 | | - 'centralnotice-query' => 'Ubah suai kempen semasa', |
| 6825 | | - 'centralnotice-notice-name' => 'Nama kempen', |
| | 6646 | + 'centralnotice-desc' => 'Menambah pemberitahuan pusat', |
| | 6647 | + 'centralnotice-summary' => 'Anda boleh menggunakan modul ini untuk menyunting pemberitahuan pusat yang disediakan. Anda juga boleh menambah atau membuang pemberitahuan yang lama.', |
| | 6648 | + 'centralnotice-query' => 'Ubah suai pemberitahuan semasa', |
| | 6649 | + 'centralnotice-notice-name' => 'Nama pemberitahuan', |
| 6826 | 6650 | 'centralnotice-end-date' => 'Tarikh tamat', |
| 6827 | 6651 | 'centralnotice-enabled' => 'Dihidupkan', |
| 6828 | 6652 | 'centralnotice-modify' => 'Serahkan', |
| 6829 | | - 'centralnotice-save-banner' => 'Simpan sepanduk', |
| 6830 | 6653 | 'centralnotice-preview' => 'Pralihat', |
| 6831 | 6654 | 'centralnotice-nopreview' => '(Tiada pralihat)', |
| 6832 | | - 'centralnotice-add-new' => 'Tambahkan kempen baru', |
| | 6655 | + 'centralnotice-add-new' => 'Tambah pemberitahuan pusat baru', |
| 6833 | 6656 | 'centralnotice-remove' => 'Buang', |
| 6834 | 6657 | 'centralnotice-translate-heading' => 'Penterjemahan $1', |
| 6835 | | - 'centralnotice-manage' => 'Urus kempen', |
| 6836 | | - 'centralnotice-manage-templates' => 'Urus sepanduk', |
| | 6658 | + 'centralnotice-manage' => 'Urus pemberitahuan pusat', |
| 6837 | 6659 | 'centralnotice-add' => 'Tambahkan', |
| 6838 | | - 'centralnotice-add-notice' => 'Tambahkan kempen', |
| 6839 | | - 'centralnotice-edit-notice' => 'Sunting kempen', |
| | 6660 | + 'centralnotice-add-notice' => 'Tambah pemberitahuan', |
| 6840 | 6661 | 'centralnotice-add-template' => 'Tambah templat', |
| 6841 | | - 'centralnotice-show-notices' => 'Paparkan kempen', |
| | 6662 | + 'centralnotice-show-notices' => 'Papar pemberitahuan', |
| 6842 | 6663 | 'centralnotice-list-templates' => 'Senarai templat', |
| 6843 | 6664 | 'centralnotice-multiple-projects' => 'Berbilang ($1)', |
| 6844 | 6665 | 'centralnotice-multiple-languages' => 'Berbilang ($1)', |
| 6845 | | - 'centralnotice-multiple-countries' => 'Berbilang ($1)', |
| 6846 | 6666 | 'centralnotice-all-projects' => 'Semua projek', |
| 6847 | 6667 | 'centralnotice-translations' => 'Terjemahan', |
| 6848 | 6668 | 'centralnotice-translate-to' => 'Terjemah', |
| — | — | @@ -6855,19 +6675,12 @@ |
| 6856 | 6676 | 'centralnotice-locked' => 'Dikunci', |
| 6857 | 6677 | 'centralnotice-notice' => 'Kempen', |
| 6858 | 6678 | 'centralnotice-notice-heading' => 'Kempen: $1', |
| 6859 | | - 'centralnotice-notices' => 'Kempen', |
| 6860 | | - 'centralnotice-notice-exists' => 'Kempen telah pun wujud. |
| 6861 | | -Tidak boleh ditambahkan.', |
| 6862 | | - 'centralnotice-no-language' => 'Tiada bahasa dipilih untuk kempen. Tidak boleh ditambahkan.', |
| 6863 | | - 'centralnotice-no-project' => 'Tiada projek dipilih untuk kempen. Tidak boleh ditambahkan.', |
| 6864 | | - 'centralnotice-template-exists' => 'Sepanduk telah pun wujud. |
| 6865 | | -Tidak boleh ditambahkan.', |
| | 6679 | + 'centralnotice-notices' => 'Pemberitahuan', |
| | 6680 | + 'centralnotice-notice-exists' => 'Pemberitahuan telah pun wujud dan tidak ditambah.', |
| | 6681 | + 'centralnotice-template-exists' => 'Templat telah pun wujud dan tidak ditambah.', |
| 6866 | 6682 | 'centralnotice-notice-doesnt-exist' => 'Kempen tidak wujud.', |
| 6867 | | - 'centralnotice-remove-notice-doesnt-exist' => 'Kempen tidak wujud. |
| 6868 | | -Tiada apa untuk dibuang.', |
| 6869 | 6683 | 'centralnotice-banner-doesnt-exist' => 'Sepanduk tak wujud.', |
| 6870 | | - 'centralnotice-template-still-bound' => 'Sepanduk masih terikat dengan kempen. |
| 6871 | | -Tidak boleh dibuang.', |
| | 6684 | + 'centralnotice-template-still-bound' => 'Templat masih digunakan untuk pemberitahuan dan tidak dibuang.', |
| 6872 | 6685 | 'centralnotice-template-body' => 'Kandungan templat:', |
| 6873 | 6686 | 'centralnotice-day' => 'Hari', |
| 6874 | 6687 | 'centralnotice-year' => 'Tahun', |
| — | — | @@ -6899,7 +6712,6 @@ |
| 6900 | 6713 | 'centralnotice-number-uses' => 'Penggunaan', |
| 6901 | 6714 | 'centralnotice-settings' => 'Tetapan', |
| 6902 | 6715 | 'centralnotice-edit-template' => 'Sunting templat', |
| 6903 | | - 'centralnotice-edit-template-summary' => 'Untuk mencipta pesanan yang boleh disetempatkan, sertakan rentetan bertanda dalam tiga pasang tanda pendakap, cth. {{{jimbo-quote}}}.', |
| 6904 | 6716 | 'centralnotice-message' => 'Pesanan', |
| 6905 | 6717 | 'centralnotice-message-not-set' => 'Pesanan tidak ditetapkan', |
| 6906 | 6718 | 'centralnotice-clone' => 'Salin', |
| — | — | @@ -6909,48 +6721,12 @@ |
| 6910 | 6722 | 'centralnotice-insert' => 'Masukkan: $1', |
| 6911 | 6723 | 'centralnotice-hide-button' => 'Sorokkan pautan', |
| 6912 | 6724 | 'centralnotice-collapse-button' => 'Lipat pautan', |
| 6913 | | - 'centralnotice-expand-button' => 'Kembangkan pautan', |
| | 6725 | + 'centralnotice-expand-button' => 'Bentangkan pautan', |
| 6914 | 6726 | 'centralnotice-close-button' => 'Butang tutup', |
| 6915 | 6727 | 'centralnotice-translate-button' => 'Pautan bantu menterjemah', |
| 6916 | | - 'centralnotice-donate-button' => 'Butang derma', |
| 6917 | | - 'centralnotice-expanded-banner' => 'Sepanduk kembang', |
| 6918 | | - 'centralnotice-collapsed-banner' => 'Sepanduk terlipat', |
| 6919 | | - 'centralnotice-banner-display' => 'Paparkan ke:', |
| 6920 | | - 'centralnotice-banner-anonymous' => 'Pengguna tanpa nama', |
| 6921 | | - 'centralnotice-banner-logged-in' => 'Pengguna log masuk', |
| 6922 | | - 'centralnotice-banner-type' => 'Jenis sepanduk:', |
| 6923 | | - 'centralnotice-banner-hidable' => 'Statik/Boleh sorok', |
| 6924 | | - 'centralnotice-banner-collapsible' => 'Boleh lipat', |
| 6925 | | - 'centralnotice-banner-fundraising' => 'Ini ialah sepanduk pungut derma', |
| 6926 | | - 'centralnotice-banner-fundraising-help' => 'Cipta tag sauh dalam badan sepanduk dengan id="cn_fundraising_link" dan isikan satu atau lebih laman pendaratan di bawah, contohnya, "JimmyAppeal01". href pautan akan dibina secara automatik.', |
| 6927 | | - 'centralnotice-banner-landing-pages' => 'Laman pendaratan (diasingkan dengan tanda koma):', |
| 6928 | | - 'centralnotice-geo' => 'Digeosasar', |
| 6929 | | - 'centralnotice-countries' => 'Negara', |
| 6930 | | - 'centralnotice-allocation' => 'Peruntukan', |
| 6931 | | - 'centralnotice-view-allocation' => 'Lihat peruntukan sepanduk', |
| 6932 | | - 'centralnotice-allocation-instructions' => 'Pilih persekitaran yang mana anda ingin melihat peruntukan sepanduk:', |
| 6933 | 6728 | 'centralnotice-languages' => 'Bahasa', |
| 6934 | | - 'centralnotice-projects' => 'Projek', |
| 6935 | 6729 | 'centralnotice-country' => 'Negara', |
| 6936 | | - 'centralnotice-no-allocation' => 'Tiada sepanduk diperuntukkan.', |
| 6937 | | - 'centralnotice-allocation-description' => 'Peruntukan sepanduk untuk $1.$2 di $3:', |
| 6938 | | - 'centralnotice-percentage' => 'Peratusan', |
| 6939 | | - 'centralnotice-documentwrite-error' => 'document.write() tidak boleh digunakan di dalam sepanduk. |
| 6940 | | -Rujuk http://meta.wikimedia.org/wiki/Help:CentralNotice untuk maklumat lanjut.', |
| 6941 | 6730 | 'centralnotice-preferred' => 'Dipilih', |
| 6942 | | - 'centralnotice-logs' => 'Log', |
| 6943 | | - 'centralnotice-view-logs' => 'Lihat log', |
| 6944 | | - 'centralnotice-timestamp' => 'Cop masa', |
| 6945 | | - 'centralnotice-user' => 'Pengguna', |
| 6946 | | - 'centralnotice-action' => 'Tindakan', |
| 6947 | | - 'centralnotice-changed' => 'Ditukar dari <span class="cn-old-value">$1</span> ke <span class="cn-new-value">$2</span>', |
| 6948 | | - 'centralnotice-on' => 'buka', |
| 6949 | | - 'centralnotice-off' => 'tutup', |
| 6950 | | - 'centralnotice-added' => '<span class="cn-new-value">$1</span> ditambahkan', |
| 6951 | | - 'centralnotice-removed' => '<span class="cn-new-value">$1</span> dibuang', |
| 6952 | | - 'centralnotice-banners-changed' => 'Peruntukan sepanduk diubah', |
| 6953 | | - 'centralnotice-no-assignments' => 'tiada sepanduk yang diberikan', |
| 6954 | | - 'centralnotice-talk-link' => 'bincang', |
| 6955 | 6731 | ); |
| 6956 | 6732 | |
| 6957 | 6733 | /** Maltese (Malti) |
| — | — | @@ -7173,7 +6949,6 @@ |
| 7174 | 6950 | 'centralnotice-list-templates' => 'Sjablonen weergeven', |
| 7175 | 6951 | 'centralnotice-multiple-projects' => 'meerdere ($1)', |
| 7176 | 6952 | 'centralnotice-multiple-languages' => 'meerdere ($1)', |
| 7177 | | - 'centralnotice-multiple-countries' => 'Meerdere ($1)', |
| 7178 | 6953 | 'centralnotice-all-projects' => 'Alle projecten', |
| 7179 | 6954 | 'centralnotice-translations' => 'Vertalingen', |
| 7180 | 6955 | 'centralnotice-translate-to' => 'Vertalen naar', |
| — | — | @@ -7266,7 +7041,7 @@ |
| 7267 | 7042 | 'centralnotice-banner-fundraising' => 'Dit is een fondsenwervingsbanner', |
| 7268 | 7043 | 'centralnotice-banner-fundraising-help' => 'Maak een ankertag in de body van de banner met id="cn_fundraising_link" en voer hieronder een of meer bestemmingspagina\'s in, bijvoorbeeld "JimmyAppeal01". De href voor de verwijzing wordt automatisch geconstrueerd.', |
| 7269 | 7044 | 'centralnotice-banner-landing-pages' => "Landingspagina's (kommagescheiden):", |
| 7270 | | - 'centralnotice-geo' => 'Geografische doelen', |
| | 7045 | + 'centralnotice-geotargeted' => 'Geografische doelen', |
| 7271 | 7046 | 'centralnotice-countries' => 'Landen', |
| 7272 | 7047 | 'centralnotice-allocation' => 'Toewijzing', |
| 7273 | 7048 | 'centralnotice-view-allocation' => 'Bannertoewijzing bekijken', |
| — | — | @@ -7282,17 +7057,6 @@ |
| 7283 | 7058 | 'centralnotice-preferred' => 'Voorkeur', |
| 7284 | 7059 | 'centralnotice-logs' => 'Logboeken', |
| 7285 | 7060 | 'centralnotice-view-logs' => 'Logboeken bekijken', |
| 7286 | | - 'centralnotice-timestamp' => 'Tijdstip', |
| 7287 | | - 'centralnotice-user' => 'Gebruiker', |
| 7288 | | - 'centralnotice-action' => 'Handeling', |
| 7289 | | - 'centralnotice-changed' => 'Gewijzigd van <span class="cn-old-value">$1</span> naar <span class="cn-new-value">$2</span>', |
| 7290 | | - 'centralnotice-on' => 'aan', |
| 7291 | | - 'centralnotice-off' => 'af', |
| 7292 | | - 'centralnotice-added' => '<span class="cn-new-value">$1</span> toegevoegd', |
| 7293 | | - 'centralnotice-removed' => '<span class="cn-old-value">$1</span> verwijderd', |
| 7294 | | - 'centralnotice-banners-changed' => 'Bannertoewijzingen zijn gewijzigd', |
| 7295 | | - 'centralnotice-no-assignments' => 'geen banners toegewezen', |
| 7296 | | - 'centralnotice-talk-link' => 'overleg', |
| 7297 | 7061 | ); |
| 7298 | 7062 | |
| 7299 | 7063 | /** Norwegian Nynorsk (Norsk (nynorsk)) |
| — | — | @@ -7502,7 +7266,7 @@ |
| 7503 | 7267 | 'centralnotice-banner-type' => 'Banner type:', |
| 7504 | 7268 | 'centralnotice-banner-hidable' => 'Statisk/skjulbar', |
| 7505 | 7269 | 'centralnotice-banner-collapsible' => 'Sammenleggbar', |
| 7506 | | - 'centralnotice-geo' => 'Geografisk målrettet', |
| | 7270 | + 'centralnotice-geotargeted' => 'Geografisk målrettet', |
| 7507 | 7271 | 'centralnotice-countries' => 'Land', |
| 7508 | 7272 | 'centralnotice-allocation' => 'Tildeling', |
| 7509 | 7273 | 'centralnotice-view-allocation' => 'Vis bannertildeling', |
| — | — | @@ -7707,7 +7471,6 @@ |
| 7708 | 7472 | 'centralnotice-list-templates' => 'Lista szablonów', |
| 7709 | 7473 | 'centralnotice-multiple-projects' => 'wiele ($1)', |
| 7710 | 7474 | 'centralnotice-multiple-languages' => 'wiele ($1)', |
| 7711 | | - 'centralnotice-multiple-countries' => 'Wiele ($1)', |
| 7712 | 7475 | 'centralnotice-all-projects' => 'Wszystkie projekty', |
| 7713 | 7476 | 'centralnotice-translations' => 'Tłumaczenia', |
| 7714 | 7477 | 'centralnotice-translate-to' => 'Przetłumacz na', |
| — | — | @@ -7792,7 +7555,7 @@ |
| 7793 | 7556 | 'centralnotice-banner-fundraising' => 'Baner zbiórki pieniędzy', |
| 7794 | 7557 | 'centralnotice-banner-fundraising-help' => 'Utwórz znacznik kotwicy w ciele banera z id="cn_fundraising_link" i wprowadź jedną lub więcej stron docelowych, na przykład "ApelJimmiego01". Dla linku href zostanie wygenerowane automatycznie.', |
| 7795 | 7558 | 'centralnotice-banner-landing-pages' => 'Strony docelowe (rozdzielone przecinkami):', |
| 7796 | | - 'centralnotice-geo' => 'Geograficznie nakierowane', |
| | 7559 | + 'centralnotice-geotargeted' => 'Geograficznie nakierowane', |
| 7797 | 7560 | 'centralnotice-countries' => 'Kraje', |
| 7798 | 7561 | 'centralnotice-allocation' => 'Przydział', |
| 7799 | 7562 | 'centralnotice-view-allocation' => 'Zobacz przydziały dla banera', |
| — | — | @@ -7808,17 +7571,6 @@ |
| 7809 | 7572 | 'centralnotice-preferred' => 'Preferowany', |
| 7810 | 7573 | 'centralnotice-logs' => 'Rejestr operacji', |
| 7811 | 7574 | 'centralnotice-view-logs' => 'Rejestr odsłon', |
| 7812 | | - 'centralnotice-timestamp' => 'Data i czas', |
| 7813 | | - 'centralnotice-user' => 'Użytkownik', |
| 7814 | | - 'centralnotice-action' => 'Akcja', |
| 7815 | | - 'centralnotice-changed' => 'Zmieniono z <span class="cn-old-value">$1</span> na <span class="cn-new-value">$2</span>', |
| 7816 | | - 'centralnotice-on' => 'włączone', |
| 7817 | | - 'centralnotice-off' => 'wyłączone', |
| 7818 | | - 'centralnotice-added' => 'Dodano <span class="cn-new-value">$1</span>', |
| 7819 | | - 'centralnotice-removed' => 'Usunięto <span class="cn-old-value">$1</span>', |
| 7820 | | - 'centralnotice-banners-changed' => 'Zmieniono przydział banera', |
| 7821 | | - 'centralnotice-no-assignments' => 'brak przydzielonych banerów', |
| 7822 | | - 'centralnotice-talk-link' => 'dyskusja', |
| 7823 | 7575 | ); |
| 7824 | 7576 | |
| 7825 | 7577 | /** Piedmontese (Piemontèis) |
| — | — | @@ -7943,7 +7695,7 @@ |
| 7944 | 7696 | 'centralnotice-banner-type' => 'Sòrt ëd tilèt:', |
| 7945 | 7697 | 'centralnotice-banner-hidable' => 'Stàtich/Stërmàbil', |
| 7946 | 7698 | 'centralnotice-banner-collapsible' => 'Strenzìbil', |
| 7947 | | - 'centralnotice-geo' => 'Geolocalisà', |
| | 7699 | + 'centralnotice-geotargeted' => 'Geolocalisà', |
| 7948 | 7700 | 'centralnotice-countries' => 'Pais', |
| 7949 | 7701 | 'centralnotice-allocation' => 'Alocassion', |
| 7950 | 7702 | 'centralnotice-view-allocation' => 'Vëdde la disposission dël tilèt', |
| — | — | @@ -8048,9 +7800,8 @@ |
| 8049 | 7801 | 'centralnotice-add-template' => 'Adicionar um modelo', |
| 8050 | 7802 | 'centralnotice-show-notices' => 'Mostrar avisos', |
| 8051 | 7803 | 'centralnotice-list-templates' => 'Listar modelos', |
| 8052 | | - 'centralnotice-multiple-projects' => 'Múltiplos ($1)', |
| 8053 | | - 'centralnotice-multiple-languages' => 'Múltiplas ($1)', |
| 8054 | | - 'centralnotice-multiple-countries' => 'Múltiplos ($1)', |
| | 7804 | + 'centralnotice-multiple-projects' => 'múltiplas ($1)', |
| | 7805 | + 'centralnotice-multiple-languages' => 'múltiplas ($1)', |
| 8055 | 7806 | 'centralnotice-all-projects' => 'Todos os projetos', |
| 8056 | 7807 | 'centralnotice-translations' => 'Traduções', |
| 8057 | 7808 | 'centralnotice-translate-to' => 'Traduzir para', |
| — | — | @@ -8068,7 +7819,7 @@ |
| 8069 | 7820 | 'centralnotice-notice-exists' => 'O aviso já existe. |
| 8070 | 7821 | Não será adicionado.', |
| 8071 | 7822 | 'centralnotice-no-language' => 'Não foi seleccionada uma língua para o aviso centralizado. O aviso não será adicionado.', |
| 8072 | | - 'centralnotice-no-project' => 'Não foi seleccionado um projecto para o aviso centralizado. O aviso não será adicionado.', |
| | 7823 | + 'centralnotice-no-project' => 'Nenhum projeto foi selecionado para a campanha. Não acrescentado.', |
| 8073 | 7824 | 'centralnotice-template-exists' => 'O modelo já existe. |
| 8074 | 7825 | Não será adicionado.', |
| 8075 | 7826 | 'centralnotice-notice-doesnt-exist' => 'O aviso não existe.', |
| — | — | @@ -8142,7 +7893,7 @@ |
| 8143 | 7894 | 'centralnotice-banner-fundraising' => 'Este é um modelo de angariação de fundos', |
| 8144 | 7895 | 'centralnotice-banner-fundraising-help' => 'Crie uma âncora no corpo do modelo com id="cn_fundraising_link" e introduza abaixo uma ou mais páginas de destino. Por exemplo, "ApeloJimmy01". O parâmetro href do link será construído automaticamente.', |
| 8145 | 7896 | 'centralnotice-banner-landing-pages' => 'Páginas de destino (separadas por vírgulas):', |
| 8146 | | - 'centralnotice-geo' => 'Com segmentação geográfica', |
| | 7897 | + 'centralnotice-geotargeted' => 'Com segmentação geográfica', |
| 8147 | 7898 | 'centralnotice-countries' => 'Países', |
| 8148 | 7899 | 'centralnotice-allocation' => 'Atribuição', |
| 8149 | 7900 | 'centralnotice-view-allocation' => 'Ver atribuição de modelos', |
| — | — | @@ -8158,17 +7909,6 @@ |
| 8159 | 7910 | 'centralnotice-preferred' => 'Preferido', |
| 8160 | 7911 | 'centralnotice-logs' => 'Registos', |
| 8161 | 7912 | 'centralnotice-view-logs' => 'Ver registos', |
| 8162 | | - 'centralnotice-timestamp' => 'Data e hora', |
| 8163 | | - 'centralnotice-user' => 'Utilizador', |
| 8164 | | - 'centralnotice-action' => 'Acção', |
| 8165 | | - 'centralnotice-changed' => 'Alterado de <span class="cn-old-value">$1</span> para <span class="cn-new-value">$2</span>', |
| 8166 | | - 'centralnotice-on' => 'activo', |
| 8167 | | - 'centralnotice-off' => 'inactivo', |
| 8168 | | - 'centralnotice-added' => '<span class="cn-new-value">$1</span> foi adicionado', |
| 8169 | | - 'centralnotice-removed' => '<span class="cn-old-value">$1</span> foi removido', |
| 8170 | | - 'centralnotice-banners-changed' => 'As atribuições de modelos foram alteradas', |
| 8171 | | - 'centralnotice-no-assignments' => 'não há modelos atribuídos', |
| 8172 | | - 'centralnotice-talk-link' => 'discussão', |
| 8173 | 7913 | ); |
| 8174 | 7914 | |
| 8175 | 7915 | /** Brazilian Portuguese (Português do Brasil) |
| — | — | @@ -8208,7 +7948,6 @@ |
| 8209 | 7949 | 'centralnotice-list-templates' => 'Listar modelos', |
| 8210 | 7950 | 'centralnotice-multiple-projects' => 'múltiplas ($1)', |
| 8211 | 7951 | 'centralnotice-multiple-languages' => 'múltiplas ($1)', |
| 8212 | | - 'centralnotice-multiple-countries' => 'Múltiplos ($1)', |
| 8213 | 7952 | 'centralnotice-all-projects' => 'Todos os projetos', |
| 8214 | 7953 | 'centralnotice-translations' => 'Traduções', |
| 8215 | 7954 | 'centralnotice-translate-to' => 'Traduzir para', |
| — | — | @@ -8300,7 +8039,7 @@ |
| 8301 | 8040 | 'centralnotice-banner-fundraising' => 'Este é um banner de angariação de fundos', |
| 8302 | 8041 | 'centralnotice-banner-fundraising-help' => 'Crie uma âncora no corpo do banner com id="cn_fundraising_link" e introduza abaixo uma ou mais páginas de destino. Por exemplo, "ApeloJimmy01". O parâmetro href do link será construído automaticamente.', |
| 8303 | 8042 | 'centralnotice-banner-landing-pages' => 'Páginas de destino (separadas por vírgulas):', |
| 8304 | | - 'centralnotice-geo' => 'Localizado geograficamente', |
| | 8043 | + 'centralnotice-geotargeted' => 'Localizado geograficamente', |
| 8305 | 8044 | 'centralnotice-countries' => 'Países', |
| 8306 | 8045 | 'centralnotice-allocation' => 'Atribuição', |
| 8307 | 8046 | 'centralnotice-view-allocation' => 'Ver atribuição de modelos', |
| — | — | @@ -8316,17 +8055,6 @@ |
| 8317 | 8056 | 'centralnotice-preferred' => 'Preferido', |
| 8318 | 8057 | 'centralnotice-logs' => 'Registros', |
| 8319 | 8058 | 'centralnotice-view-logs' => 'Ver registros', |
| 8320 | | - 'centralnotice-timestamp' => 'Data e hora', |
| 8321 | | - 'centralnotice-user' => 'Usuário', |
| 8322 | | - 'centralnotice-action' => 'Ação', |
| 8323 | | - 'centralnotice-changed' => 'Alterado de <span class="cn-old-value">$1</span> para <span class="cn-new-value">$2</span>', |
| 8324 | | - 'centralnotice-on' => 'ativo', |
| 8325 | | - 'centralnotice-off' => 'inativo', |
| 8326 | | - 'centralnotice-added' => '<span class="cn-new-value">$1</span> foi adicionado', |
| 8327 | | - 'centralnotice-removed' => '<span class="cn-old-value">$1</span> foi removido', |
| 8328 | | - 'centralnotice-banners-changed' => 'As atribuições do banner foram alteradas', |
| 8329 | | - 'centralnotice-no-assignments' => 'não há banners atribuídos', |
| 8330 | | - 'centralnotice-talk-link' => 'discussão', |
| 8331 | 8059 | ); |
| 8332 | 8060 | |
| 8333 | 8061 | /** Quechua (Runa Simi) |
| — | — | @@ -8450,7 +8178,7 @@ |
| 8451 | 8179 | 'centralnotice-banner-type' => 'Unancha laya:', |
| 8452 | 8180 | 'centralnotice-banner-hidable' => 'Ranuy/Pakana', |
| 8453 | 8181 | 'centralnotice-banner-collapsible' => 'Thuñichina', |
| 8454 | | - 'centralnotice-geo' => 'Allpapacha taripanachasqa', |
| | 8182 | + 'centralnotice-geotargeted' => 'Allpapacha taripanachasqa', |
| 8455 | 8183 | 'centralnotice-countries' => 'Mama llaqtakuna', |
| 8456 | 8184 | 'centralnotice-allocation' => 'Ñiqinchay', |
| 8457 | 8185 | 'centralnotice-view-allocation' => 'Unancha ñiqinchayta qhaway', |
| — | — | @@ -8591,9 +8319,7 @@ |
| 8592 | 8320 | 'centralnotice-banner-type' => 'Tip banner:', |
| 8593 | 8321 | 'centralnotice-banner-hidable' => 'Static/Ascuns', |
| 8594 | 8322 | 'centralnotice-banner-collapsible' => 'Reductibil', |
| 8595 | | - 'centralnotice-banner-fundraising' => 'Acesta este un banner pentru strângerea de fonduri', |
| 8596 | | - 'centralnotice-banner-landing-pages' => 'Pagini de destinație (separate prin virgulă):', |
| 8597 | | - 'centralnotice-geo' => 'Geolocalizat', |
| | 8323 | + 'centralnotice-geotargeted' => 'Geolocalizat', |
| 8598 | 8324 | 'centralnotice-countries' => 'Țări', |
| 8599 | 8325 | 'centralnotice-allocation' => 'Alocare', |
| 8600 | 8326 | 'centralnotice-view-allocation' => 'Vedeți alocarea bannerului', |
| — | — | @@ -8601,16 +8327,10 @@ |
| 8602 | 8328 | 'centralnotice-projects' => 'Proiecte', |
| 8603 | 8329 | 'centralnotice-country' => 'Țară', |
| 8604 | 8330 | 'centralnotice-no-allocation' => 'Niciun banner alocat.', |
| 8605 | | - 'centralnotice-allocation-description' => 'Alocare de banner pentru $1.$2 în $3:', |
| 8606 | 8331 | 'centralnotice-percentage' => 'Procentaj', |
| 8607 | 8332 | 'centralnotice-documentwrite-error' => 'document.write() nu poate fi folosit într-un banner. |
| 8608 | 8333 | Vedeți http://meta.wikimedia.org/wiki/Help:CentralNotice pentru mai multe informații.', |
| 8609 | 8334 | 'centralnotice-preferred' => 'Preferat', |
| 8610 | | - 'centralnotice-logs' => 'Jurnale', |
| 8611 | | - 'centralnotice-view-logs' => 'Vezi jurnale', |
| 8612 | | - 'centralnotice-timestamp' => 'Data și ora', |
| 8613 | | - 'centralnotice-user' => 'Utilizator', |
| 8614 | | - 'centralnotice-action' => 'Acțiune', |
| 8615 | 8335 | ); |
| 8616 | 8336 | |
| 8617 | 8337 | /** Tarandíne (Tarandíne) |
| — | — | @@ -8735,7 +8455,7 @@ |
| 8736 | 8456 | 'centralnotice-banner-type' => 'Tipe de banner:', |
| 8737 | 8457 | 'centralnotice-banner-hidable' => 'Stateche/Scunnibbele', |
| 8738 | 8458 | 'centralnotice-banner-collapsible' => 'Collassabbele', |
| 8739 | | - 'centralnotice-geo' => 'Geo referenziate', |
| | 8459 | + 'centralnotice-geotargeted' => 'Geo referenziate', |
| 8740 | 8460 | 'centralnotice-countries' => 'Paìse', |
| 8741 | 8461 | 'centralnotice-allocation' => 'Allocazione', |
| 8742 | 8462 | 'centralnotice-view-allocation' => "Visualizze l'assignazione d'u banner", |
| — | — | @@ -8882,7 +8602,7 @@ |
| 8883 | 8603 | 'centralnotice-banner-fundraising' => 'Это баннер сбора средств', |
| 8884 | 8604 | 'centralnotice-banner-fundraising-help' => 'Создайте тег ссылки в тела баннера с id="cn_fundraising_link" и укажите ниже одну или несколько целевых страниц, например, «JimmyAppeal01». Поле HREF ссылки будет создано автоматически.', |
| 8885 | 8605 | 'centralnotice-banner-landing-pages' => 'Целевые страницы (через запятую):', |
| 8886 | | - 'centralnotice-geo' => 'Геопривязка', |
| | 8606 | + 'centralnotice-geotargeted' => 'Геопривязка', |
| 8887 | 8607 | 'centralnotice-countries' => 'Страны', |
| 8888 | 8608 | 'centralnotice-allocation' => 'Распределение', |
| 8889 | 8609 | 'centralnotice-view-allocation' => 'Просмотр размещения баннеров', |
| — | — | @@ -8898,9 +8618,6 @@ |
| 8899 | 8619 | 'centralnotice-preferred' => 'Желательно', |
| 8900 | 8620 | 'centralnotice-logs' => 'Журналы', |
| 8901 | 8621 | 'centralnotice-view-logs' => 'Просмотр журналов', |
| 8902 | | - 'centralnotice-timestamp' => 'Дата/время', |
| 8903 | | - 'centralnotice-user' => 'Участник', |
| 8904 | | - 'centralnotice-action' => 'Действие', |
| 8905 | 8622 | ); |
| 8906 | 8623 | |
| 8907 | 8624 | /** Rusyn (Русиньскый) |
| — | — | @@ -9018,7 +8735,7 @@ |
| 9019 | 8736 | 'centralnotice-banner-type' => 'Тіп банера:', |
| 9020 | 8737 | 'centralnotice-banner-hidable' => 'Статічный / Сховательный', |
| 9021 | 8738 | 'centralnotice-banner-collapsible' => 'Зложытельный', |
| 9022 | | - 'centralnotice-geo' => 'Ґеоґрафічно цілене', |
| | 8739 | + 'centralnotice-geotargeted' => 'Ґеоґрафічно цілене', |
| 9023 | 8740 | 'centralnotice-countries' => 'Країны', |
| 9024 | 8741 | 'centralnotice-allocation' => 'Придїлїня', |
| 9025 | 8742 | 'centralnotice-view-allocation' => 'Зобразити придїлїня баверів', |
| — | — | @@ -9157,7 +8874,7 @@ |
| 9158 | 8875 | 'centralnotice-banner-hidable' => 'Статическэй / Кистэниллэр', |
| 9159 | 8876 | 'centralnotice-banner-collapsible' => 'Кыччатыллар', |
| 9160 | 8877 | 'centralnotice-banner-fundraising' => 'Харчы хомуйуу бааннера', |
| 9161 | | - 'centralnotice-geo' => 'Сиргэ баайыы', |
| | 8878 | + 'centralnotice-geotargeted' => 'Сиргэ баайыы', |
| 9162 | 8879 | 'centralnotice-countries' => 'Дойдулар', |
| 9163 | 8880 | 'centralnotice-allocation' => 'Тарҕаныыта', |
| 9164 | 8881 | 'centralnotice-view-allocation' => 'Бааннердар ханна баалларын көрүү', |
| — | — | @@ -9390,7 +9107,7 @@ |
| 9391 | 9108 | 'centralnotice-banner-type' => 'බැනර වර්ගය:', |
| 9392 | 9109 | 'centralnotice-banner-hidable' => 'ස්ථිතික/සැඟවිය හැකි', |
| 9393 | 9110 | 'centralnotice-banner-collapsible' => 'කුඩා කළ හැකි', |
| 9394 | | - 'centralnotice-geo' => 'භූමි එල්ල කළ (geotargeted)', |
| | 9111 | + 'centralnotice-geotargeted' => 'භූමි එල්ල කළ (geotargeted)', |
| 9395 | 9112 | 'centralnotice-countries' => 'රටවල්', |
| 9396 | 9113 | 'centralnotice-allocation' => 'වෙන්කිරීම', |
| 9397 | 9114 | 'centralnotice-view-allocation' => 'බැනරයේ වෙන්කිරීම පෙන්වන්න', |
| — | — | @@ -9516,7 +9233,7 @@ |
| 9517 | 9234 | 'centralnotice-banner-type' => 'Typ oznamu:', |
| 9518 | 9235 | 'centralnotice-banner-hidable' => 'Statický/skrývateľný', |
| 9519 | 9236 | 'centralnotice-banner-collapsible' => 'Zbaliteľný', |
| 9520 | | - 'centralnotice-geo' => 'Geograficky cielený', |
| | 9237 | + 'centralnotice-geotargeted' => 'Geograficky cielený', |
| 9521 | 9238 | 'centralnotice-countries' => 'Krajiny', |
| 9522 | 9239 | 'centralnotice-allocation' => 'Alokácia', |
| 9523 | 9240 | 'centralnotice-view-allocation' => 'Zobraziť alokáciu oznamu', |
| — | — | @@ -9566,7 +9283,6 @@ |
| 9567 | 9284 | 'centralnotice-list-templates' => 'Seznam pasic', |
| 9568 | 9285 | 'centralnotice-multiple-projects' => 'več ($1)', |
| 9569 | 9286 | 'centralnotice-multiple-languages' => 'več ($1)', |
| 9570 | | - 'centralnotice-multiple-countries' => 'Več ($1)', |
| 9571 | 9287 | 'centralnotice-all-projects' => 'Vsi projekti', |
| 9572 | 9288 | 'centralnotice-translations' => 'Prevodi', |
| 9573 | 9289 | 'centralnotice-translate-to' => 'Prevedi v', |
| — | — | @@ -9658,7 +9374,7 @@ |
| 9659 | 9375 | 'centralnotice-banner-fundraising' => 'To je donatorska pasica', |
| 9660 | 9376 | 'centralnotice-banner-fundraising-help' => 'Ustvarite sidrno oznako v telesu pasice z id="cn_fundraising_link" in spodaj vnesite eno ali več ciljnih strani, na primer "JimmyAppeal01". Celotna povezava bo ustvarjena samodejno.', |
| 9661 | 9377 | 'centralnotice-banner-landing-pages' => 'Ciljne strani (ločene z vejicami):', |
| 9662 | | - 'centralnotice-geo' => 'Geociljano', |
| | 9378 | + 'centralnotice-geotargeted' => 'Geociljano', |
| 9663 | 9379 | 'centralnotice-countries' => 'Države', |
| 9664 | 9380 | 'centralnotice-allocation' => 'Dodelitev', |
| 9665 | 9381 | 'centralnotice-view-allocation' => 'Ogled dodelitve pasic', |
| — | — | @@ -9674,17 +9390,6 @@ |
| 9675 | 9391 | 'centralnotice-preferred' => 'Prednostno', |
| 9676 | 9392 | 'centralnotice-logs' => 'Dnevniki', |
| 9677 | 9393 | 'centralnotice-view-logs' => 'Ogled dnevnikov', |
| 9678 | | - 'centralnotice-timestamp' => 'Časovni žig', |
| 9679 | | - 'centralnotice-user' => 'Uporabnik', |
| 9680 | | - 'centralnotice-action' => 'Dejanje', |
| 9681 | | - 'centralnotice-changed' => 'Spremenjeno iz <span class="cn-old-value">$1</span> v <span class="cn-new-value">$2</span>', |
| 9682 | | - 'centralnotice-on' => 'vklopljeno', |
| 9683 | | - 'centralnotice-off' => 'izklopljeno', |
| 9684 | | - 'centralnotice-added' => 'Dodano <span class="cn-new-value">$1</span>', |
| 9685 | | - 'centralnotice-removed' => 'Odstranjeno <span class="cn-old-value">$1</span>', |
| 9686 | | - 'centralnotice-banners-changed' => 'Naloge pasice so spremenjene', |
| 9687 | | - 'centralnotice-no-assignments' => 'ni dodeljenih pasic', |
| 9688 | | - 'centralnotice-talk-link' => 'pogovor', |
| 9689 | 9394 | ); |
| 9690 | 9395 | |
| 9691 | 9396 | /** Albanian (Shqip) |
| — | — | @@ -9814,7 +9519,7 @@ |
| 9815 | 9520 | 'centralnotice-banner-fundraising' => 'Ky është një flamur për mbledhjen e fondeve', |
| 9816 | 9521 | 'centralnotice-banner-fundraising-help' => 'Krijo një spirancë tag në trup flamurin me id = "cn_fundraising_link" dhe hyjnë në një apo më shumë faqe ulje më poshtë, për shembull, "JimmyAppeal01". Href e lidhjes do të ndërtohet automatikisht.', |
| 9817 | 9522 | 'centralnotice-banner-landing-pages' => 'Faqet ulje (comma-ndarë):', |
| 9818 | | - 'centralnotice-geo' => 'Geo-objektiv', |
| | 9523 | + 'centralnotice-geotargeted' => 'Geo-objektiv', |
| 9819 | 9524 | 'centralnotice-countries' => 'Shtetet', |
| 9820 | 9525 | 'centralnotice-allocation' => 'Rregullimi', |
| 9821 | 9526 | 'centralnotice-view-allocation' => 'Shikoni rregullimin e Stampës', |
| — | — | @@ -10072,11 +9777,9 @@ |
| 10073 | 9778 | * @author Cohan |
| 10074 | 9779 | * @author Fluff |
| 10075 | 9780 | * @author Lejonel |
| 10076 | | - * @author Lokal Profil |
| 10077 | 9781 | * @author M.M.S. |
| 10078 | 9782 | * @author Najami |
| 10079 | 9783 | * @author Tobulos1 |
| 10080 | | - * @author WikiPhoenix |
| 10081 | 9784 | */ |
| 10082 | 9785 | $messages['sv'] = array( |
| 10083 | 9786 | 'centralnotice' => 'Centralmeddelande-administration', |
| — | — | @@ -10196,7 +9899,7 @@ |
| 10197 | 9900 | 'centralnotice-banner-type' => 'Bannertyp:', |
| 10198 | 9901 | 'centralnotice-banner-hidable' => 'Statisk/gömbar', |
| 10199 | 9902 | 'centralnotice-banner-collapsible' => 'Hopfällbar', |
| 10200 | | - 'centralnotice-geo' => 'Geografiskt fokuserat', |
| | 9903 | + 'centralnotice-geotargeted' => 'Geografiskt fokuserat', |
| 10201 | 9904 | 'centralnotice-countries' => 'Länder', |
| 10202 | 9905 | 'centralnotice-allocation' => 'Tilldelning', |
| 10203 | 9906 | 'centralnotice-view-allocation' => 'Visa bannertilldelning', |
| — | — | @@ -10210,15 +9913,6 @@ |
| 10211 | 9914 | 'centralnotice-documentwrite-error' => 'document.write() kan inte användas inom en banner. |
| 10212 | 9915 | Se http://meta.wikimedia.org/wiki/Help:CentralNotice för mer information.', |
| 10213 | 9916 | 'centralnotice-preferred' => 'Föredragen', |
| 10214 | | - 'centralnotice-logs' => 'Loggar', |
| 10215 | | - 'centralnotice-view-logs' => 'Visa loggar', |
| 10216 | | - 'centralnotice-timestamp' => 'Tidsstämpel', |
| 10217 | | - 'centralnotice-user' => 'Användare', |
| 10218 | | - 'centralnotice-action' => 'Åtgärd', |
| 10219 | | - 'centralnotice-on' => 'på', |
| 10220 | | - 'centralnotice-off' => 'av', |
| 10221 | | - 'centralnotice-added' => 'Lade till <span class="cn-new-value">$1</span>', |
| 10222 | | - 'centralnotice-removed' => 'Tog bort <span class="cn-old-value">$1</span>', |
| 10223 | 9917 | ); |
| 10224 | 9918 | |
| 10225 | 9919 | /** Swahili (Kiswahili) |
| — | — | @@ -10817,7 +10511,7 @@ |
| 10818 | 10512 | 'centralnotice-banner-type' => 'Banner görnüşi:', |
| 10819 | 10513 | 'centralnotice-banner-hidable' => 'Statik/Gizlenilýän', |
| 10820 | 10514 | 'centralnotice-banner-collapsible' => 'Düýrlenýän', |
| 10821 | | - 'centralnotice-geo' => 'Geo-bellikli', |
| | 10515 | + 'centralnotice-geotargeted' => 'Geo-bellikli', |
| 10822 | 10516 | 'centralnotice-countries' => 'Ýurtlar', |
| 10823 | 10517 | 'centralnotice-allocation' => 'Ýerleşiş', |
| 10824 | 10518 | 'centralnotice-view-allocation' => 'Bannerleriň ýerleşişini görkez', |
| — | — | @@ -10948,7 +10642,7 @@ |
| 10949 | 10643 | 'centralnotice-banner-type' => 'Uri ng bandera:', |
| 10950 | 10644 | 'centralnotice-banner-hidable' => 'Hindi tumitinag/Maitatago', |
| 10951 | 10645 | 'centralnotice-banner-collapsible' => 'Maititiklop', |
| 10952 | | - 'centralnotice-geo' => 'Puntiryang heograpiya', |
| | 10646 | + 'centralnotice-geotargeted' => 'Puntiryang heograpiya', |
| 10953 | 10647 | 'centralnotice-countries' => 'Mga bansa', |
| 10954 | 10648 | 'centralnotice-allocation' => 'Paglalaan', |
| 10955 | 10649 | 'centralnotice-view-allocation' => 'Tingnan ang kabahagi ng bandera', |
| — | — | @@ -11096,7 +10790,7 @@ |
| 11097 | 10791 | 'centralnotice-banner-type' => 'Afiş türü:', |
| 11098 | 10792 | 'centralnotice-banner-hidable' => 'Statik/Gizlenebilir', |
| 11099 | 10793 | 'centralnotice-banner-collapsible' => 'Daralabilir', |
| 11100 | | - 'centralnotice-geo' => 'Geo-hedefli', |
| | 10794 | + 'centralnotice-geotargeted' => 'Geo-hedefli', |
| 11101 | 10795 | 'centralnotice-countries' => 'Ülkeler', |
| 11102 | 10796 | 'centralnotice-allocation' => 'Tahsis', |
| 11103 | 10797 | 'centralnotice-view-allocation' => 'Afiş tahsisini gör', |
| — | — | @@ -11219,7 +10913,7 @@ |
| 11220 | 10914 | 'centralnotice-banner-type' => 'Өлгенең төре:', |
| 11221 | 10915 | 'centralnotice-banner-hidable' => 'Тикторышлы/ Ябылучан', |
| 11222 | 10916 | 'centralnotice-banner-collapsible' => 'Ябылучан', |
| 11223 | | - 'centralnotice-geo' => 'Геоялгану', |
| | 10917 | + 'centralnotice-geotargeted' => 'Геоялгану', |
| 11224 | 10918 | 'centralnotice-countries' => 'Илләр', |
| 11225 | 10919 | 'centralnotice-allocation' => 'Таралу', |
| 11226 | 10920 | 'centralnotice-view-allocation' => 'Өлгеләрнең таралуын карау', |
| — | — | @@ -11386,7 +11080,7 @@ |
| 11387 | 11081 | 'centralnotice-banner-type' => 'Тип банера:', |
| 11388 | 11082 | 'centralnotice-banner-hidable' => 'Статичний / Приховуваний', |
| 11389 | 11083 | 'centralnotice-banner-collapsible' => 'Що згортається', |
| 11390 | | - 'centralnotice-geo' => "Геоприв'язка", |
| | 11084 | + 'centralnotice-geotargeted' => "Геоприв'язка", |
| 11391 | 11085 | 'centralnotice-countries' => 'Країни', |
| 11392 | 11086 | 'centralnotice-allocation' => 'Розподіл', |
| 11393 | 11087 | 'centralnotice-view-allocation' => 'Переглянути розміщення банера', |
| — | — | @@ -11520,7 +11214,7 @@ |
| 11521 | 11215 | 'centralnotice-banner-type' => 'Tipo de banner:', |
| 11522 | 11216 | 'centralnotice-banner-hidable' => 'Statico/Che se sara', |
| 11523 | 11217 | 'centralnotice-banner-collapsible' => 'Che se sara', |
| 11524 | | - 'centralnotice-geo' => 'Geolocalisà', |
| | 11218 | + 'centralnotice-geotargeted' => 'Geolocalisà', |
| 11525 | 11219 | 'centralnotice-countries' => 'Paesi', |
| 11526 | 11220 | 'centralnotice-allocation' => 'Alocassion', |
| 11527 | 11221 | 'centralnotice-view-allocation' => 'Varda la disposission dei banner', |
| — | — | @@ -11641,7 +11335,6 @@ |
| 11642 | 11336 | 'centralnotice-list-templates' => 'Liệt kê các bảng', |
| 11643 | 11337 | 'centralnotice-multiple-projects' => 'đa ngữ ($1)', |
| 11644 | 11338 | 'centralnotice-multiple-languages' => 'đa ngữ ($1)', |
| 11645 | | - 'centralnotice-multiple-countries' => 'Đa quốc gia ($1)', |
| 11646 | 11339 | 'centralnotice-all-projects' => 'Tất cả các dự án', |
| 11647 | 11340 | 'centralnotice-language-listing' => '$1 – $2', |
| 11648 | 11341 | 'centralnotice-translations' => 'Bản dịch', |
| — | — | @@ -11723,7 +11416,7 @@ |
| 11724 | 11417 | 'centralnotice-banner-fundraising' => 'Đây là một biểu ngữ gây quỹ', |
| 11725 | 11418 | 'centralnotice-banner-fundraising-help' => 'Tạo một thẻ neo trong phần chính của biểu ngữ có thuộc tính id="cn_fundraising_link" và nhập tên của ít nhất một trang đích ở dưới, thí dụ “JimmyAppeal01”. Thuộc tính href của liên kết sẽ được biên soạn tự động.', |
| 11726 | 11419 | 'centralnotice-banner-landing-pages' => 'Các trang đích (định giới bằng dấu phẩy):', |
| 11727 | | - 'centralnotice-geo' => 'Mục tiêu địa lý', |
| | 11420 | + 'centralnotice-geotargeted' => 'Mục tiêu địa lý', |
| 11728 | 11421 | 'centralnotice-countries' => 'Quốc gia', |
| 11729 | 11422 | 'centralnotice-allocation' => 'Phân bổ', |
| 11730 | 11423 | 'centralnotice-view-allocation' => 'Xem cách phân phối bảng', |
| — | — | @@ -11739,17 +11432,6 @@ |
| 11740 | 11433 | 'centralnotice-preferred' => 'Nổi bật hơn', |
| 11741 | 11434 | 'centralnotice-logs' => 'Nhật trình', |
| 11742 | 11435 | 'centralnotice-view-logs' => 'Xem nhật trình', |
| 11743 | | - 'centralnotice-timestamp' => 'Thời gian', |
| 11744 | | - 'centralnotice-user' => 'Người dùng', |
| 11745 | | - 'centralnotice-action' => 'Tác vụ', |
| 11746 | | - 'centralnotice-changed' => 'Thay đổi từ <span class="cn-old-value">$1</span> thành <span class="cn-new-value">$2</span>', |
| 11747 | | - 'centralnotice-on' => 'bật', |
| 11748 | | - 'centralnotice-off' => 'tắt', |
| 11749 | | - 'centralnotice-added' => 'Thêm <span class="cn-new-value">$1</span>', |
| 11750 | | - 'centralnotice-removed' => 'Gỡ <span class="cn-old-value">$1</span>', |
| 11751 | | - 'centralnotice-banners-changed' => 'Đã thay đổi các chỉ định biểu ngữ', |
| 11752 | | - 'centralnotice-no-assignments' => 'không chỉ định biểu ngữ', |
| 11753 | | - 'centralnotice-talk-link' => 'thảo luận', |
| 11754 | 11436 | ); |
| 11755 | 11437 | |
| 11756 | 11438 | /** Volapük (Volapük) |
| — | — | @@ -12024,7 +11706,7 @@ |
| 12025 | 11707 | 'centralnotice-settings' => '设置', |
| 12026 | 11708 | 'centralnotice-edit-template' => '编辑模板', |
| 12027 | 11709 | 'centralnotice-edit-template-summary' => '欲创建一个可本地化的消息，请用三对花括号分隔含连字符的字符串，例如{{{jimbo-quote}}}。', |
| 12028 | | - 'centralnotice-message' => '信息', |
| | 11710 | + 'centralnotice-message' => '消息', |
| 12029 | 11711 | 'centralnotice-message-not-set' => '没有设置消息', |
| 12030 | 11712 | 'centralnotice-clone' => '建立副本', |
| 12031 | 11713 | 'centralnotice-clone-notice' => '创建一个模板的副本', |
| — | — | @@ -12047,7 +11729,7 @@ |
| 12048 | 11730 | 'centralnotice-banner-collapsible' => '可收缩', |
| 12049 | 11731 | 'centralnotice-banner-fundraising' => '这是一个筹款横幅', |
| 12050 | 11732 | 'centralnotice-banner-landing-pages' => '登录页（逗号分隔）：', |
| 12051 | | - 'centralnotice-geo' => '已地理定位的', |
| | 11733 | + 'centralnotice-geotargeted' => '已地理定位的', |
| 12052 | 11734 | 'centralnotice-countries' => '国家', |
| 12053 | 11735 | 'centralnotice-allocation' => '配额', |
| 12054 | 11736 | 'centralnotice-view-allocation' => '察看横幅配额', |
| — | — | @@ -12190,7 +11872,7 @@ |
| 12191 | 11873 | 'centralnotice-banner-type' => '橫幅類型：', |
| 12192 | 11874 | 'centralnotice-banner-hidable' => '靜態可隱藏', |
| 12193 | 11875 | 'centralnotice-banner-collapsible' => '可摺疊', |
| 12194 | | - 'centralnotice-geo' => '已地理定位的', |
| | 11876 | + 'centralnotice-geotargeted' => '已地理定位的', |
| 12195 | 11877 | 'centralnotice-countries' => '國家', |
| 12196 | 11878 | 'centralnotice-allocation' => '分配', |
| 12197 | 11879 | 'centralnotice-view-allocation' => '查看橫幅分配', |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.db.php |
| — | — | @@ -118,73 +118,13 @@ |
| 119 | 119 | |
| 120 | 120 | return $notices; |
| 121 | 121 | } |
| 122 | | - |
| 123 | | - /* |
| 124 | | - * Return settings for a campaign |
| 125 | | - * @param $campaignName string: The name of the campaign |
| 126 | | - * @param $detailed boolean: Whether or not to include targeting and banner assignment info |
| 127 | | - * @return an array of settings |
| 128 | | - */ |
| 129 | | - static function getCampaignSettings( $campaignName, $detailed = true ) { |
| 130 | | - global $wgCentralDBname; |
| 131 | | - |
| 132 | | - $dbr = wfGetDB( DB_SLAVE, array(), $wgCentralDBname ); |
| 133 | | - |
| 134 | | - $campaign = array(); |
| 135 | 122 | |
| 136 | | - // Get campaign info from database |
| 137 | | - $row = $dbr->selectRow( 'cn_notices', |
| 138 | | - array( |
| 139 | | - 'not_id', |
| 140 | | - 'not_start', |
| 141 | | - 'not_end', |
| 142 | | - 'not_enabled', |
| 143 | | - 'not_preferred', |
| 144 | | - 'not_locked', |
| 145 | | - 'not_geo' |
| 146 | | - ), |
| 147 | | - array( 'not_name' => $campaignName ), |
| 148 | | - __METHOD__ |
| 149 | | - ); |
| 150 | | - if ( $row ) { |
| 151 | | - $campaign = array( |
| 152 | | - 'start' => $row->not_start, |
| 153 | | - 'end' => $row->not_end, |
| 154 | | - 'enabled' => $row->not_enabled, |
| 155 | | - 'preferred' => $row->not_preferred, |
| 156 | | - 'locked' => $row->not_locked, |
| 157 | | - 'geo' => $row->not_geo |
| 158 | | - ); |
| 159 | | - } |
| 160 | | - |
| 161 | | - if ( $detailed ) { |
| 162 | | - $projects = CentralNotice::getNoticeProjects( $campaignName ); |
| 163 | | - $languages = CentralNotice::getNoticeLanguages( $campaignName ); |
| 164 | | - $geo_countries = CentralNotice::getNoticeCountries( $campaignName ); |
| 165 | | - $campaign['projects'] = implode( ", ", $projects ); |
| 166 | | - $campaign['languages'] = implode( ", ", $languages ); |
| 167 | | - $campaign['countries'] = implode( ", ", $geo_countries ); |
| 168 | | - |
| 169 | | - $bannersIn = CentralNoticeDB::getCampaignBanners( $row->not_id ); |
| 170 | | - $bannersOut = array(); |
| 171 | | - // All we want are the banner names and weights |
| 172 | | - foreach ( $bannersIn as $key => $row ) { |
| 173 | | - $outKey = $bannersIn[$key]['name']; |
| 174 | | - $bannersOut[$outKey] = $bannersIn[$key]['weight']; |
| 175 | | - } |
| 176 | | - // Encode into a JSON string for storage |
| 177 | | - $campaign['banners'] = FormatJson::encode( $bannersOut ); |
| 178 | | - } |
| 179 | | - |
| 180 | | - return $campaign; |
| 181 | | - } |
| 182 | | - |
| 183 | 123 | /* |
| 184 | 124 | * Given one or more campaign ids, return all banners bound to them |
| 185 | 125 | * @param $campaigns An array of id numbers |
| 186 | 126 | * @return a 2D array of banners with associated weights and settings |
| 187 | 127 | */ |
| 188 | | - static function getCampaignBanners( $campaigns ) { |
| | 128 | + static function selectBannersAssigned( $campaigns ) { |
| 189 | 129 | global $wgCentralDBname; |
| 190 | 130 | |
| 191 | 131 | $dbr = wfGetDB( DB_SLAVE, array(), $wgCentralDBname ); |
| — | — | @@ -230,90 +170,6 @@ |
| 231 | 171 | return $templates; |
| 232 | 172 | } |
| 233 | 173 | |
| 234 | | - /** |
| 235 | | - * Lookup function for active banners under a given language/project/location. This function is |
| 236 | | - * called by SpecialBannerListLoader::getJsonList() in order to build the banner list JSON for |
| 237 | | - * each project. |
| 238 | | - * @return a 2D array of running banners with associated weights and settings |
| 239 | | - */ |
| 240 | | - static function getBannersByTarget( $project, $language, $location = null ) { |
| 241 | | - global $wgCentralDBname; |
| 242 | | - |
| 243 | | - $campaigns = array(); |
| 244 | | - $dbr = wfGetDB( DB_SLAVE, array(), $wgCentralDBname ); |
| 245 | | - $encTimestamp = $dbr->addQuotes( $dbr->timestamp() ); |
| 246 | | - |
| 247 | | - // Pull non-geotargeted campaigns |
| 248 | | - $campaignResults1 = $dbr->select( |
| 249 | | - array( |
| 250 | | - 'cn_notices', |
| 251 | | - 'cn_notice_projects', |
| 252 | | - 'cn_notice_languages' |
| 253 | | - ), |
| 254 | | - array( |
| 255 | | - 'not_id' |
| 256 | | - ), |
| 257 | | - array( |
| 258 | | - "not_start <= $encTimestamp", |
| 259 | | - "not_end >= $encTimestamp", |
| 260 | | - 'not_enabled = 1', // enabled |
| 261 | | - 'not_geo = 0', // not geotargeted |
| 262 | | - 'np_notice_id = cn_notices.not_id', |
| 263 | | - 'np_project' => $project, |
| 264 | | - 'nl_notice_id = cn_notices.not_id', |
| 265 | | - 'nl_language' => $language |
| 266 | | - ), |
| 267 | | - __METHOD__ |
| 268 | | - ); |
| 269 | | - foreach ( $campaignResults1 as $row ) { |
| 270 | | - $campaigns[] = $row->not_id; |
| 271 | | - } |
| 272 | | - if ( $location ) { |
| 273 | | - |
| 274 | | - // Normalize location parameter (should be an uppercase 2-letter country code) |
| 275 | | - preg_match( '/[a-zA-Z][a-zA-Z]/', $location, $matches ); |
| 276 | | - if ( $matches ) { |
| 277 | | - $location = strtoupper( $matches[0] ); |
| 278 | | - |
| 279 | | - // Pull geotargeted campaigns |
| 280 | | - $campaignResults2 = $dbr->select( |
| 281 | | - array( |
| 282 | | - 'cn_notices', |
| 283 | | - 'cn_notice_projects', |
| 284 | | - 'cn_notice_languages', |
| 285 | | - 'cn_notice_countries' |
| 286 | | - ), |
| 287 | | - array( |
| 288 | | - 'not_id' |
| 289 | | - ), |
| 290 | | - array( |
| 291 | | - "not_start <= $encTimestamp", |
| 292 | | - "not_end >= $encTimestamp", |
| 293 | | - 'not_enabled = 1', // enabled |
| 294 | | - 'not_geo = 1', // geotargeted |
| 295 | | - 'nc_notice_id = cn_notices.not_id', |
| 296 | | - 'nc_country' => $location, |
| 297 | | - 'np_notice_id = cn_notices.not_id', |
| 298 | | - 'np_project' => $project, |
| 299 | | - 'nl_notice_id = cn_notices.not_id', |
| 300 | | - 'nl_language' => $language |
| 301 | | - ), |
| 302 | | - __METHOD__ |
| 303 | | - ); |
| 304 | | - foreach ( $campaignResults2 as $row ) { |
| 305 | | - $campaigns[] = $row->not_id; |
| 306 | | - } |
| 307 | | - } |
| 308 | | - } |
| 309 | | - |
| 310 | | - $templates = array(); |
| 311 | | - if ( $campaigns ) { |
| 312 | | - // Pull all banners assigned to the campaigns |
| 313 | | - $templates = CentralNoticeDB::getCampaignBanners( $campaigns ); |
| 314 | | - } |
| 315 | | - return $templates; |
| 316 | | - } |
| 317 | | - |
| 318 | 174 | /* |
| 319 | 175 | * See if a given banner exists in the database |
| 320 | 176 | */ |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/centralnotice.js |
| — | — | @@ -1,17 +1,3 @@ |
| 2 | | -function toggleDisplay( logId ) { |
| 3 | | - var thisCollapsed = document.getElementById( 'cn-collapsed-'+logId ); |
| 4 | | - var thisUncollapsed = document.getElementById( 'cn-uncollapsed-'+logId ); |
| 5 | | - var thisDetails = document.getElementById( 'cn-log-details-'+logId ); |
| 6 | | - if ( thisCollapsed.style.display == "none" ) { |
| 7 | | - thisUncollapsed.style.display = "none"; |
| 8 | | - thisCollapsed.style.display = "block"; |
| 9 | | - thisDetails.style.display = "none"; |
| 10 | | - } else { |
| 11 | | - thisCollapsed.style.display = "none"; |
| 12 | | - thisUncollapsed.style.display = "block"; |
| 13 | | - thisDetails.style.display = "table-row"; |
| 14 | | - } |
| 15 | | -} |
| 16 | 2 | function selectProjects( selectAll ) { |
| 17 | 3 | var selectBox = document.getElementById('projects[]'); |
| 18 | 4 | var firstSelect = selectBox.options.length - 1; |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 19 | 5 | Reverse-merged /trunk/extensions/CentralNotice:r91118-92408 |