r76356 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r76355‎ | r76356 | r76357 >
Date:23:57, 8 November 2010
Author:kaldari
Status:resolved (Comments)
Tags:
Comment:
more work towards multi-project selection - bug 20229
Modified paths:
  • /trunk/extensions/CentralNotice/CentralNotice.i18n.php (modified) (history)
  • /trunk/extensions/CentralNotice/SpecialCentralNotice.php (modified) (history)

Diff [purge]

Index: trunk/extensions/CentralNotice/SpecialCentralNotice.php
——@@ -140,14 +140,14 @@
141141 if ( $method == 'addNotice' ) {
142142 $noticeName = $wgRequest->getVal( 'noticeName' );
143143 $start = $wgRequest->getArray( 'start' );
144 - $project_name = $wgRequest->getVal( 'project_name' );
 144+ $projects = $wgRequest->getArray( 'projects' );
145145 $project_languages = $wgRequest->getArray( 'project_languages' );
146146 $geotargeted = $wgRequest->getCheck( 'geotargeted' );
147147 $geo_countries = $wgRequest->getArray( 'geo_countries' );
148148 if ( $noticeName == '' ) {
149149 $this->showError( 'centralnotice-null-string' );
150150 } else {
151 - $this->addNotice( $noticeName, '0', $start, $project_name,
 151+ $this->addNotice( $noticeName, '0', $start, $projects,
152152 $project_languages, $geotargeted, $geo_countries );
153153 }
154154 }
——@@ -304,7 +304,6 @@
305305 'not_end',
306306 'not_enabled',
307307 'not_preferred',
308 - 'not_project',
309308 'not_locked'
310309 ),
311310 null,
——@@ -359,15 +358,23 @@
360359 htmlspecialchars( $row->not_name ),
361360 'method=listNoticeDetail&notice=' . urlencode( $row->not_name ) );
362361
363 - // Project
364 - $fields[] = htmlspecialchars( $this->getProjectName( $row->not_project ) );
 362+ // Projects
 363+ $projects = $this->getNoticeProjects( $row->not_name );
 364+ $project_count = count( $projects );
 365+ $projectList = '';
 366+ if ( $language_count > 2 ) {
 367+ $projectList = wfMsg ( 'centralnotice-multiple', $project_count );
 368+ } elseif ( $project_count > 0 ) {
 369+ $projectList = $wgLang->commaList( $projects );
 370+ }
 371+ $fields[] = $projectList;
365372
366373 // Languages
367374 $project_langs = $this->getNoticeLanguages( $row->not_name );
368375 $language_count = count( $project_langs );
369376 $languageList = '';
370377 if ( $language_count > 3 ) {
371 - $languageList = wfMsg ( 'centralnotice-multiple_languages', $language_count );
 378+ $languageList = wfMsg ( 'centralnotice-multiple', $language_count );
372379 } elseif ( $language_count > 0 ) {
373380 $languageList = $wgLang->commaList( $project_langs );
374381 }
——@@ -654,10 +661,10 @@
655662 }
656663 }
657664
658 - // Handle new project name
659 - $projectName = $wgRequest->getVal( 'project_name' );
660 - if ( $projectName !== null ) {
661 - $this->updateProjectName ( $notice, $projectName );
 665+ // Handle new projects
 666+ $projects = $wgRequest->getArray( 'projects' );
 667+ if ( $projects ) {
 668+ $this->updateProjects( $notice, $projects );
662669 }
663670
664671 // Handle new project languages
——@@ -1122,12 +1129,15 @@
11231130 return $templates;
11241131 }
11251132
1126 - function addNotice( $noticeName, $enabled, $start, $project_name,
 1133+ function addNotice( $noticeName, $enabled, $start, $projects,
11271134 $project_languages, $geotargeted, $geo_countries )
11281135 {
11291136 if ( $this->noticeExists( $noticeName ) ) {
11301137 $this->showError( 'centralnotice-notice-exists' );
11311138 return;
 1139+ } elseif ( empty( $projects ) ) {
 1140+ $this->showError( 'centralnotice-no-project' );
 1141+ return;
11321142 } elseif ( empty( $project_languages ) ) {
11331143 $this->showError( 'centralnotice-no-language' );
11341144 return;
——@@ -1160,12 +1170,19 @@
11611171 'not_enabled' => $enabled,
11621172 'not_start' => $dbw->timestamp( $startTs ),
11631173 'not_end' => $dbw->timestamp( $endTs ),
1164 - 'not_project' => $project_name,
11651174 'not_geo' => $geotargeted
11661175 )
11671176 );
11681177 $not_id = $dbw->insertId();
11691178
 1179+ // Do multi-row insert for campaign projects
 1180+ $insertArray = array();
 1181+ foreach( $projects as $project ) {
 1182+ $insertArray[] = array( 'np_notice_id' => $not_id, 'np_project' => $project );
 1183+ }
 1184+ $res = $dbw->insert( 'cn_notice_projects', $insertArray,
 1185+ __METHOD__, array( 'IGNORE' ) );
 1186+
11701187 // Do multi-row insert for campaign languages
11711188 $insertArray = array();
11721189 foreach( $project_languages as $code ) {
——@@ -1568,6 +1585,35 @@
15691586 )
15701587 );
15711588 }
 1589+
 1590+ function updateProjects( $notice, $newProjects ) {
 1591+ $dbw = wfGetDB( DB_MASTER );
 1592+ $dbw->begin();
 1593+
 1594+ // Get the previously assigned projects
 1595+ $oldProjects = $this->getNoticeProjects( $notice );
 1596+
 1597+ // Get the notice id
 1598+ $row = $dbw->selectRow( 'cn_notices', 'not_id', array( 'not_name' => $notice ) );
 1599+
 1600+ // Add newly assigned projects
 1601+ $addProjects = array_diff( $newProjects, $oldProjects );
 1602+ $insertArray = array();
 1603+ foreach( $addProjects as $project ) {
 1604+ $insertArray[] = array( 'np_notice_id' => $row->not_id, 'np_project' => $project );
 1605+ }
 1606+ $res = $dbw->insert( 'cn_notice_projects', $insertArray, __METHOD__, array( 'IGNORE' ) );
 1607+
 1608+ // Remove disassociated projects
 1609+ $removeProjects = array_diff( $oldProjects, $newProjects );
 1610+ if ( $removeProjects ) {
 1611+ $res = $dbw->delete( 'cn_notice_projects',
 1612+ array( 'np_notice_id' => $row->not_id, 'np_project' => $removeProjects )
 1613+ );
 1614+ }
 1615+
 1616+ $dbw->commit();
 1617+ }
15721618
15731619 function updateProjectLanguages( $notice, $newLanguages ) {
15741620 $dbw = wfGetDB( DB_MASTER );
Index: trunk/extensions/CentralNotice/CentralNotice.i18n.php
——@@ -34,7 +34,7 @@
3535 'centralnotice-add-template' => 'Add a banner',
3636 'centralnotice-show-notices' => 'Show campaigns',
3737 'centralnotice-list-templates' => 'List banners',
38 - 'centralnotice-multiple_languages' => 'multiple ($1)',
 38+ 'centralnotice-multiple' => 'multiple ($1)',
3939 'centralnotice-language-listing' => '$1 - $2',
4040 'centralnotice-translations' => 'Translations',
4141 'centralnotice-translate-to' => 'Translate to',
——@@ -52,6 +52,7 @@
5353 'centralnotice-notice-exists' => 'Campaign already exists.
5454 Not adding.',
5555 'centralnotice-no-language' => 'No language was selected for the campaign. Not adding.',
 56+ 'centralnotice-no-project' => 'No project was selected for the campaign. Not adding.',
5657 'centralnotice-template-exists' => 'Banner already exists.
5758 Not adding.',
5859 'centralnotice-notice-doesnt-exist' => 'Campaign does not exist.',
——@@ -169,7 +170,7 @@
170171 'centralnotice-remove' => '{{Identical|Remove}}',
171172 'centralnotice-translate-heading' => 'Fieldset label. $1 is a name of a template.',
172173 'centralnotice-add' => '{{Identical|Add}}',
173 - 'centralnotice-multiple_languages' => '$1 is a number. More precisely, the number of languages a notice is available in. It is always greater than 3.',
 174+ 'centralnotice-multiple' => '$1 is a number. More precisely, the number of languages or projects a notice is available in. It is always greater than 2.',
174175 '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.',
175176 'centralnotice-translate' => '{{Identical|Translate}}',
176177 'centralnotice-notice-exists' => 'Error message displayed in Special:CentralNotice when trying to add a notice with the same name of another notice',
——@@ -228,7 +229,7 @@
229230 'centralnotice-add-template' => 'Voeg sjabloon by',
230231 'centralnotice-show-notices' => 'Wys kennisgewings',
231232 'centralnotice-list-templates' => 'Lys sjablone',
232 - 'centralnotice-multiple_languages' => 'verskeie ($1)',
 233+ 'centralnotice-multiple' => 'verskeie ($1)',
233234 'centralnotice-translations' => 'Vertalings',
234235 'centralnotice-translate-to' => 'Vertaal na',
235236 'centralnotice-translate' => 'Vertaal',
——@@ -634,7 +635,7 @@
635636 'centralnotice-add-template' => 'Ҡалып өҫтәргә',
636637 'centralnotice-show-notices' => 'Белдереүҙәрҙе күрһәтергә',
637638 'centralnotice-list-templates' => 'Ҡалыптар исемлеге',
638 - 'centralnotice-multiple_languages' => 'бер нисә ($1)',
 639+ 'centralnotice-multiple' => 'бер нисә ($1)',
639640 'centralnotice-translations' => 'Тәржемәләр',
640641 'centralnotice-translate-to' => 'Тәржемә:',
641642 'centralnotice-translate' => 'Тәржемә',
——@@ -808,7 +809,7 @@
809810 'centralnotice-add-template' => 'Дадаць паведамленьне',
810811 'centralnotice-show-notices' => 'Паказаць кампаніі',
811812 'centralnotice-list-templates' => 'Сьпіс паведамленьняў',
812 - 'centralnotice-multiple_languages' => 'некалькі ($1)',
 813+ 'centralnotice-multiple' => 'некалькі ($1)',
813814 'centralnotice-translations' => 'Пераклады',
814815 'centralnotice-translate-to' => 'Пераклад на',
815816 'centralnotice-translate' => 'Пераклад',
——@@ -1118,7 +1119,7 @@
11191120 'centralnotice-add-template' => 'Ouzhpennañ ur patrom',
11201121 'centralnotice-show-notices' => 'Diskouez ar menegoù',
11211122 'centralnotice-list-templates' => 'Rollañ ar patromoù',
1122 - 'centralnotice-multiple_languages' => 'lies ($1)',
 1123+ 'centralnotice-multiple' => 'lies ($1)',
11231124 'centralnotice-translations' => 'Troidigezhioù',
11241125 'centralnotice-translate-to' => 'Treiñ e',
11251126 'centralnotice-translate' => 'Treiñ',
——@@ -1251,7 +1252,7 @@
12521253 'centralnotice-add-template' => 'Dodaj šablon',
12531254 'centralnotice-show-notices' => 'Prikaži obavještenja',
12541255 'centralnotice-list-templates' => 'Spisak šablona',
1255 - 'centralnotice-multiple_languages' => 'više ($1)',
 1256+ 'centralnotice-multiple' => 'više ($1)',
12561257 'centralnotice-translations' => 'Prijevodi',
12571258 'centralnotice-translate-to' => 'Prevedi na',
12581259 'centralnotice-translate' => 'Prijevod',
——@@ -1494,7 +1495,7 @@
14951496 'centralnotice-add-template' => 'Přidat šablonu',
14961497 'centralnotice-show-notices' => 'Zobrazit oznámení',
14971498 'centralnotice-list-templates' => 'Seznam šablon',
1498 - 'centralnotice-multiple_languages' => 'více ($1)',
 1499+ 'centralnotice-multiple' => 'více ($1)',
14991500 'centralnotice-translations' => 'Překlady',
15001501 'centralnotice-translate-to' => 'Přeložit do jazyka',
15011502 'centralnotice-translate' => 'Přeložit',
——@@ -1719,7 +1720,7 @@
17201721 'centralnotice-add-template' => 'Hinzufügen einer Vorlage',
17211722 'centralnotice-show-notices' => 'Zeige Meldungen',
17221723 'centralnotice-list-templates' => 'Vorlagen auflisten',
1723 - 'centralnotice-multiple_languages' => 'mehrere ($1)',
 1724+ 'centralnotice-multiple' => 'mehrere ($1)',
17241725 'centralnotice-translations' => 'Übersetzungen',
17251726 'centralnotice-translate-to' => 'Übersetzen in',
17261727 'centralnotice-translate' => 'Übersetzen',
——@@ -1951,7 +1952,7 @@
19521953 'centralnotice-add-template' => 'Pśedłogu pśidaś',
19531954 'centralnotice-show-notices' => 'Powěźeńki pokazaś',
19541955 'centralnotice-list-templates' => 'Pśedłogi nalistowaś',
1955 - 'centralnotice-multiple_languages' => 'někotare ($1)',
 1956+ 'centralnotice-multiple' => 'někotare ($1)',
19561957 'centralnotice-translations' => 'Pśełožki',
19571958 'centralnotice-translate-to' => 'Pśełoźiś do',
19581959 'centralnotice-translate' => 'Pśełožiś',
——@@ -2174,7 +2175,7 @@
21752176 'centralnotice-add-template' => 'Aldoni ŝablonon',
21762177 'centralnotice-show-notices' => 'Montri noticojn',
21772178 'centralnotice-list-templates' => 'Rigardi ŝablonojn',
2178 - 'centralnotice-multiple_languages' => 'multlingve ($1)',
 2179+ 'centralnotice-multiple' => 'multlingve ($1)',
21792180 'centralnotice-translations' => 'Tradukoj',
21802181 'centralnotice-translate-to' => 'Traduki al',
21812182 'centralnotice-translate' => 'Traduki',
——@@ -2317,7 +2318,7 @@
23182319 'centralnotice-add-template' => 'Añadir una plantilla',
23192320 'centralnotice-show-notices' => 'Mostrar avisos',
23202321 'centralnotice-list-templates' => 'Listar plantillas',
2321 - 'centralnotice-multiple_languages' => 'múltiples ($1)',
 2322+ 'centralnotice-multiple' => 'múltiples ($1)',
23222323 'centralnotice-translations' => 'Traducciones',
23232324 'centralnotice-translate-to' => 'Traducir al',
23242325 'centralnotice-translate' => 'Traducir',
——@@ -2634,7 +2635,7 @@
26352636 'centralnotice-add-template' => 'اضافه کردن الگو',
26362637 'centralnotice-show-notices' => 'نمایش اعلان‌ها',
26372638 'centralnotice-list-templates' => 'فهرست الگوها',
2638 - 'centralnotice-multiple_languages' => 'چندگانه ($1)',
 2639+ 'centralnotice-multiple' => 'چندگانه ($1)',
26392640 'centralnotice-translations' => 'ترجمه‌ها',
26402641 'centralnotice-translate-to' => 'ترجمه به',
26412642 'centralnotice-translate' => 'ترجمه کردن',
——@@ -2771,7 +2772,7 @@
27722773 'centralnotice-add-template' => 'Lisää malline',
27732774 'centralnotice-show-notices' => 'Näytä tiedotteet',
27742775 'centralnotice-list-templates' => 'Luettele mallineet',
2775 - 'centralnotice-multiple_languages' => 'useita ($1)',
 2776+ 'centralnotice-multiple' => 'useita ($1)',
27762777 'centralnotice-translations' => 'Käännökset',
27772778 'centralnotice-translate-to' => 'Käännös:',
27782779 'centralnotice-translate' => 'Käännä',
——@@ -2914,7 +2915,7 @@
29152916 'centralnotice-add-template' => 'Ajouter un modèle',
29162917 'centralnotice-show-notices' => 'Afficher les avis',
29172918 'centralnotice-list-templates' => 'Lister les modèles',
2918 - 'centralnotice-multiple_languages' => 'multiple ($1)',
 2919+ 'centralnotice-multiple' => 'multiple ($1)',
29192920 'centralnotice-translations' => 'Traductions',
29202921 'centralnotice-translate-to' => 'Traduire en',
29212922 'centralnotice-translate' => 'Traduire',
——@@ -3047,7 +3048,7 @@
30483049 'centralnotice-add-template' => 'Apondre una baniére',
30493050 'centralnotice-show-notices' => 'Fâre vêre les propagandes',
30503051 'centralnotice-list-templates' => 'Listar les baniéres',
3051 - 'centralnotice-multiple_languages' => 'un mouél ($1)',
 3052+ 'centralnotice-multiple' => 'un mouél ($1)',
30523053 'centralnotice-translations' => 'Traduccions',
30533054 'centralnotice-translate-to' => 'Traduire en',
30543055 'centralnotice-translate' => 'Traduire',
——@@ -3185,7 +3186,7 @@
31863187 'centralnotice-add-template' => 'Engadir un modelo',
31873188 'centralnotice-show-notices' => 'Amosar os avisos',
31883189 'centralnotice-list-templates' => 'Listar os modelos',
3189 - 'centralnotice-multiple_languages' => 'múltiple ($1)',
 3190+ 'centralnotice-multiple' => 'múltiple ($1)',
31903191 'centralnotice-translations' => 'Traducións',
31913192 'centralnotice-translate-to' => 'Traducir ao',
31923193 'centralnotice-translate' => 'Traducir',
——@@ -3343,7 +3344,7 @@
33443345 'centralnotice-add-template' => 'Zuefiege vun ere Vorlag',
33453346 'centralnotice-show-notices' => 'Zeig Mäldige',
33463347 'centralnotice-list-templates' => 'Vorlage uflischte',
3347 - 'centralnotice-multiple_languages' => 'mehreri ($1)',
 3348+ 'centralnotice-multiple' => 'mehreri ($1)',
33483349 'centralnotice-translations' => 'Ibersetzige',
33493350 'centralnotice-translate-to' => 'Ibersetze in',
33503351 'centralnotice-translate' => 'Ibersetze',
——@@ -3477,7 +3478,7 @@
34783479 'centralnotice-add-template' => 'הוספת תבנית',
34793480 'centralnotice-show-notices' => 'הצגת הודעות',
34803481 'centralnotice-list-templates' => 'רשימת תבניות',
3481 - 'centralnotice-multiple_languages' => 'מרובים ($1)',
 3482+ 'centralnotice-multiple' => 'מרובים ($1)',
34823483 'centralnotice-translations' => 'תרגומים',
34833484 'centralnotice-translate-to' => 'תרגום ל',
34843485 'centralnotice-translate' => 'תרגום',
——@@ -3620,7 +3621,7 @@
36213622 'centralnotice-add-template' => 'Dodaj predložak',
36223623 'centralnotice-show-notices' => 'Pokaži obavijesti',
36233624 'centralnotice-list-templates' => 'Popis predložaka',
3624 - 'centralnotice-multiple_languages' => 'više ($1)',
 3625+ 'centralnotice-multiple' => 'više ($1)',
36253626 'centralnotice-translations' => 'Prijevodi',
36263627 'centralnotice-translate-to' => 'Prevedi na',
36273628 'centralnotice-translate' => 'Prevedi',
——@@ -3753,7 +3754,7 @@
37543755 'centralnotice-add-template' => 'Předłohu přidać',
37553756 'centralnotice-show-notices' => 'Zdźělenki pokazać',
37563757 'centralnotice-list-templates' => 'Předłohi nalistować',
3757 - 'centralnotice-multiple_languages' => 'wjacore ($1)',
 3758+ 'centralnotice-multiple' => 'wjacore ($1)',
37583759 'centralnotice-translations' => 'Přełožki',
37593760 'centralnotice-translate-to' => 'Přełožić do',
37603761 'centralnotice-translate' => 'Přełožić',
——@@ -3888,7 +3889,7 @@
38893890 'centralnotice-add-template' => 'Sablon hozzáadása',
38903891 'centralnotice-show-notices' => 'Üzenetek megjelenítése',
38913892 'centralnotice-list-templates' => 'Sablonok listázása',
3892 - 'centralnotice-multiple_languages' => 'több ($1)',
 3893+ 'centralnotice-multiple' => 'több ($1)',
38933894 'centralnotice-translations' => 'Fordítások',
38943895 'centralnotice-translate-to' => 'Lefordítás',
38953896 'centralnotice-translate' => 'Lefordítás',
——@@ -4021,7 +4022,7 @@
40224023 'centralnotice-add-template' => 'Adder un bandiera',
40234024 'centralnotice-show-notices' => 'Monstrar campanias',
40244025 'centralnotice-list-templates' => 'Listar bandieras',
4025 - 'centralnotice-multiple_languages' => 'multiple ($1)',
 4026+ 'centralnotice-multiple' => 'multiple ($1)',
40264027 'centralnotice-translations' => 'Traductiones',
40274028 'centralnotice-translate-to' => 'Traducer in',
40284029 'centralnotice-translate' => 'Traducer',
——@@ -4158,7 +4159,7 @@
41594160 'centralnotice-add-template' => 'Tambah templat',
41604161 'centralnotice-show-notices' => 'Tampilkan pengumuman',
41614162 'centralnotice-list-templates' => 'Daftar templat',
4162 - 'centralnotice-multiple_languages' => 'ganda ($1)',
 4163+ 'centralnotice-multiple' => 'ganda ($1)',
41634164 'centralnotice-translations' => 'Terjemahan',
41644165 'centralnotice-translate-to' => 'Terjemahkan ke',
41654166 'centralnotice-translate' => 'Terjemahkan',
——@@ -4461,7 +4462,7 @@
44624463 'centralnotice-add-template' => 'テンプレートを追加',
44634464 'centralnotice-show-notices' => '告知を表示',
44644465 'centralnotice-list-templates' => 'テンプレートを一覧表示',
4465 - 'centralnotice-multiple_languages' => '複数（$1）',
 4466+ 'centralnotice-multiple' => '複数（$1）',
44664467 'centralnotice-translations' => '翻訳',
44674468 'centralnotice-translate-to' => '翻訳先',
44684469 'centralnotice-translate' => '翻訳',
——@@ -4800,7 +4801,7 @@
48014802 'centralnotice-add-template' => '틀을 추가하기',
48024803 'centralnotice-show-notices' => '공지 표시하기',
48034804 'centralnotice-list-templates' => '템플릿 목록 표시하기',
4804 - 'centralnotice-multiple_languages' => '다수 ($1)',
 4805+ 'centralnotice-multiple' => '다수 ($1)',
48054806 'centralnotice-translations' => '번역',
48064807 'centralnotice-translate-to' => '번역할 언어',
48074808 'centralnotice-translate' => '번역하기',
——@@ -4889,7 +4890,7 @@
48904891 'centralnotice-add-template' => 'En Schabloon dobei donn',
48914892 'centralnotice-show-notices' => 'Zentrale Nohreschte zeije',
48924893 'centralnotice-list-templates' => 'Schablone opleßte',
4893 - 'centralnotice-multiple_languages' => 'etlijje ($1)',
 4894+ 'centralnotice-multiple' => 'etlijje ($1)',
48944895 'centralnotice-translations' => 'Övversäzonge',
48954896 'centralnotice-translate-to' => 'Övversäze noh',
48964897 'centralnotice-translate' => 'Övversäze',
——@@ -5001,7 +5002,7 @@
50025003 'centralnotice-add-template' => 'E Banner derbäisetzen',
50035004 'centralnotice-show-notices' => 'Matdeelunge weisen',
50045005 'centralnotice-list-templates' => 'Lëscht vun de Banneren',
5005 - 'centralnotice-multiple_languages' => 'méi ($1)',
 5006+ 'centralnotice-multiple' => 'méi ($1)',
50065007 'centralnotice-translations' => 'Iwwersetzungen',
50075008 'centralnotice-translate-to' => 'Iwwersetzen op',
50085009 'centralnotice-translate' => 'Iwwersetzen',
——@@ -5145,7 +5146,7 @@
51465147 'centralnotice-add-template' => 'Sjabloon biedoon',
51475148 'centralnotice-show-notices' => 'Sitemitdeilinge waergaeve',
51485149 'centralnotice-list-templates' => 'Sjablone waergaeve',
5149 - 'centralnotice-multiple_languages' => 'meerdere ($1)',
 5150+ 'centralnotice-multiple' => 'meerdere ($1)',
51505151 'centralnotice-translations' => 'Euverzèttinge',
51515152 'centralnotice-translate-to' => 'Euverzètte nao',
51525153 'centralnotice-translate' => 'Euverzètte',
——@@ -5428,7 +5429,7 @@
54295430 'centralnotice-add-template' => 'Додај шаблон',
54305431 'centralnotice-show-notices' => 'Прикажи известувања',
54315432 'centralnotice-list-templates' => 'Наведи шаблони',
5432 - 'centralnotice-multiple_languages' => 'повеќе ($1)',
 5433+ 'centralnotice-multiple' => 'повеќе ($1)',
54335434 'centralnotice-translations' => 'Преводи',
54345435 'centralnotice-translate-to' => 'Преведи на',
54355436 'centralnotice-translate' => 'Преведи',
——@@ -5561,7 +5562,7 @@
55625563 'centralnotice-add-template' => 'ഫലകം കൂട്ടിച്ചേർക്കുക',
55635564 'centralnotice-show-notices' => 'അറിയിപ്പുകൾ പ്രദർശിപ്പിക്കുക',
55645565 'centralnotice-list-templates' => 'ഫലകങ്ങൾ പട്ടികവത്കരിക്കുക',
5565 - 'centralnotice-multiple_languages' => 'നിരവധി ($1)',
 5566+ 'centralnotice-multiple' => 'നിരവധി ($1)',
55665567 'centralnotice-translations' => 'തർജ്ജമകൾ',
55675568 'centralnotice-translate-to' => 'ഇതിലേയ്ക്ക് തർജ്ജമ ചെയ്യുക',
55685569 'centralnotice-translate' => 'തർജ്ജമ ചെയ്യുക',
——@@ -5957,7 +5958,7 @@
59585959 'centralnotice-add-template' => 'Sjabloon toevoegen',
59595960 'centralnotice-show-notices' => 'Sitenotices weergeven',
59605961 'centralnotice-list-templates' => 'Sjablonen weergeven',
5961 - 'centralnotice-multiple_languages' => 'meerdere ($1)',
 5962+ 'centralnotice-multiple' => 'meerdere ($1)',
59625963 'centralnotice-translations' => 'Vertalingen',
59635964 'centralnotice-translate-to' => 'Vertalen naar',
59645965 'centralnotice-translate' => 'Vertalen',
——@@ -6178,7 +6179,7 @@
61796180 'centralnotice-add-template' => 'Legg til en mal',
61806181 'centralnotice-show-notices' => 'Vis meldinger',
61816182 'centralnotice-list-templates' => 'Vis maler',
6182 - 'centralnotice-multiple_languages' => 'flere ($1)',
 6183+ 'centralnotice-multiple' => 'flere ($1)',
61836184 'centralnotice-translations' => 'Oversettelser',
61846185 'centralnotice-translate-to' => 'Oversett til',
61856186 'centralnotice-translate' => 'Oversett',
——@@ -6432,7 +6433,7 @@
64336434 'centralnotice-add-template' => 'Dodaj szablon',
64346435 'centralnotice-show-notices' => 'Pokaż komunikaty',
64356436 'centralnotice-list-templates' => 'Lista szablonów',
6436 - 'centralnotice-multiple_languages' => 'wiele ($1)',
 6437+ 'centralnotice-multiple' => 'wiele ($1)',
64376438 'centralnotice-translations' => 'Tłumaczenia',
64386439 'centralnotice-translate-to' => 'Przetłumacz na',
64396440 'centralnotice-translate' => 'Przetłumacz',
——@@ -6559,7 +6560,7 @@
65606561 'centralnotice-add-template' => 'Gionta në stamp',
65616562 'centralnotice-show-notices' => 'Mostra neuva',
65626563 'centralnotice-list-templates' => 'Lista stamp',
6563 - 'centralnotice-multiple_languages' => 'mùltipl ($1)',
 6564+ 'centralnotice-multiple' => 'mùltipl ($1)',
65646565 'centralnotice-translations' => 'Tradussion',
65656566 'centralnotice-translate-to' => 'Volté an',
65666567 'centralnotice-translate' => 'Volté',
——@@ -6742,7 +6743,7 @@
67436744 'centralnotice-add-template' => 'Adicionar um modelo',
67446745 'centralnotice-show-notices' => 'Mostrar avisos',
67456746 'centralnotice-list-templates' => 'Listar modelos',
6746 - 'centralnotice-multiple_languages' => 'múltiplas ($1)',
 6747+ 'centralnotice-multiple' => 'múltiplas ($1)',
67476748 'centralnotice-translations' => 'Traduções',
67486749 'centralnotice-translate-to' => 'Traduzir para',
67496750 'centralnotice-translate' => 'Traduzir',
——@@ -6877,7 +6878,7 @@
68786879 'centralnotice-add-template' => 'Adicionar um modelo',
68796880 'centralnotice-show-notices' => 'Mostrar avisos',
68806881 'centralnotice-list-templates' => 'Listar modelos',
6881 - 'centralnotice-multiple_languages' => 'múltiplas ($1)',
 6882+ 'centralnotice-multiple' => 'múltiplas ($1)',
68826883 'centralnotice-translations' => 'Traduções',
68836884 'centralnotice-translate-to' => 'Traduzir para',
68846885 'centralnotice-translate' => 'Traduzir',
——@@ -7010,7 +7011,7 @@
70117012 'centralnotice-add-template' => 'Plantillata yapay',
70127013 'centralnotice-show-notices' => 'Willaykunata rikuchiy',
70137014 'centralnotice-list-templates' => 'Plantillakunata sutisuyupi rikuchiy',
7014 - 'centralnotice-multiple_languages' => 'imaymana ($1)',
 7015+ 'centralnotice-multiple' => 'imaymana ($1)',
70157016 'centralnotice-translations' => "T'ikrasqakuna",
70167017 'centralnotice-translate-to' => "Kayman t'ikray:",
70177018 'centralnotice-translate' => "T'ikray",
——@@ -7138,7 +7139,7 @@
71397140 'centralnotice-add-template' => 'Adaugă un format',
71407141 'centralnotice-show-notices' => 'Arată anunțurile',
71417142 'centralnotice-list-templates' => 'Lista de formate',
7142 - 'centralnotice-multiple_languages' => 'multiple ($1)',
 7143+ 'centralnotice-multiple' => 'multiple ($1)',
71437144 'centralnotice-translations' => 'Traduceri',
71447145 'centralnotice-translate-to' => 'Tradu în',
71457146 'centralnotice-translate' => 'Tradu',
——@@ -7265,7 +7266,7 @@
72667267 'centralnotice-add-template' => "Aggiunge 'nu banner",
72677268 'centralnotice-show-notices' => 'Visualizze le cambagne',
72687269 'centralnotice-list-templates' => 'Liste de le banner',
7269 - 'centralnotice-multiple_languages' => 'multiple ($1)',
 7270+ 'centralnotice-multiple' => 'multiple ($1)',
72707271 'centralnotice-translations' => 'Traduziune',
72717272 'centralnotice-translate-to' => 'Traduce a',
72727273 'centralnotice-translate' => 'Traduce',
——@@ -7400,7 +7401,7 @@
74017402 'centralnotice-add-template' => 'Добавить шаблон',
74027403 'centralnotice-show-notices' => 'Показать уведомления',
74037404 'centralnotice-list-templates' => 'Вывести список шаблонов',
7404 - 'centralnotice-multiple_languages' => 'несколько ($1)',
 7405+ 'centralnotice-multiple' => 'несколько ($1)',
74057406 'centralnotice-translations' => 'Переводы',
74067407 'centralnotice-translate-to' => 'Перевод на',
74077408 'centralnotice-translate' => 'Перевод',
——@@ -7533,7 +7534,7 @@
75347535 'centralnotice-add-template' => 'Додати шаблону',
75357536 'centralnotice-show-notices' => 'Указати повідомлїня',
75367537 'centralnotice-list-templates' => 'Cписок шаблон',
7537 - 'centralnotice-multiple_languages' => 'веце ($1)',
 7538+ 'centralnotice-multiple' => 'веце ($1)',
75387539 'centralnotice-translations' => 'Переклады',
75397540 'centralnotice-translate-to' => 'Переклад до',
75407541 'centralnotice-translate' => 'Переложыти',
——@@ -7661,7 +7662,7 @@
76627663 'centralnotice-add-template' => 'Халыып эбэргэ',
76637664 'centralnotice-show-notices' => 'Биллэриилэри көрдөр',
76647665 'centralnotice-list-templates' => 'Халыыптар тиһиктэрэ',
7665 - 'centralnotice-multiple_languages' => 'хас да ($1)',
 7666+ 'centralnotice-multiple' => 'хас да ($1)',
76667667 'centralnotice-translations' => 'Тылбаастар',
76677668 'centralnotice-translate-to' => 'Манна тылбаас',
76687669 'centralnotice-translate' => 'Тылбаас',
——@@ -7887,7 +7888,7 @@
78887889 'centralnotice-add-template' => 'Pridať šablónu',
78897890 'centralnotice-show-notices' => 'Zobraziť oznamy',
78907891 'centralnotice-list-templates' => 'Zoznam šablón',
7891 - 'centralnotice-multiple_languages' => 'viaceré ($1)',
 7892+ 'centralnotice-multiple' => 'viaceré ($1)',
78927893 'centralnotice-translations' => 'Preklady',
78937894 'centralnotice-translate-to' => 'Preložiť do jazyka',
78947895 'centralnotice-translate' => 'Preložiť',
——@@ -8009,7 +8010,7 @@
80108011 'centralnotice-add-template' => 'Dodaj pasico',
80118012 'centralnotice-show-notices' => 'Prikaži akcije',
80128013 'centralnotice-list-templates' => 'Seznam pasic',
8013 - 'centralnotice-multiple_languages' => 'več ($1)',
 8014+ 'centralnotice-multiple' => 'več ($1)',
80148015 'centralnotice-translations' => 'Prevodi',
80158016 'centralnotice-translate-to' => 'Prevedi v',
80168017 'centralnotice-translate' => 'Prevedi',
——@@ -8385,7 +8386,7 @@
83868387 'centralnotice-add-template' => 'Lägg till en mall',
83878388 'centralnotice-show-notices' => 'Visa meddelanden',
83888389 'centralnotice-list-templates' => 'Lista mallar',
8389 - 'centralnotice-multiple_languages' => 'flera ($1)',
 8390+ 'centralnotice-multiple' => 'flera ($1)',
83908391 'centralnotice-translations' => 'Översättningar',
83918392 'centralnotice-translate-to' => 'Översätt till',
83928393 'centralnotice-translate' => 'Översätt',
——@@ -8517,7 +8518,7 @@
85188519 'centralnotice-preview' => 'முன்தோற்றம்',
85198520 'centralnotice-remove' => 'நீக்கு',
85208521 'centralnotice-add' => 'சேர்க்கவும்',
8521 - 'centralnotice-multiple_languages' => 'ஒன்றுக்கு மேற்பட்ட ($1)',
 8522+ 'centralnotice-multiple' => 'ஒன்றுக்கு மேற்பட்ட ($1)',
85228523 'centralnotice-translations' => 'மொழிபெயர்ப்புக்கள்',
85238524 'centralnotice-translate-to' => 'மொழிபெயர்ப்பு செய்யவும்',
85248525 'centralnotice-translate' => 'மொழிபெயர்ப்பு செய்யவும்',
——@@ -8574,7 +8575,7 @@
85758576 'centralnotice-add-template' => 'ఒక మూసని చేర్చు',
85768577 'centralnotice-show-notices' => 'ప్రచారోద్యమాలని చూపించు',
85778578 'centralnotice-list-templates' => 'మూసలను చూపించు',
8578 - 'centralnotice-multiple_languages' => 'బహుళం ($1)',
 8579+ 'centralnotice-multiple' => 'బహుళం ($1)',
85798580 'centralnotice-translations' => 'అనువాదాలు',
85808581 'centralnotice-translate' => 'అనువదించండి',
85818582 'centralnotice-english' => 'ఇంగ్లీష్',
——@@ -8960,7 +8961,7 @@
89618962 'centralnotice-add-template' => 'Şablon goş',
89628963 'centralnotice-show-notices' => 'Uwedomleniýeleri görkez',
89638964 'centralnotice-list-templates' => 'Şablonlaryň sanawyny görkez',
8964 - 'centralnotice-multiple_languages' => 'köpsanly ($1)',
 8965+ 'centralnotice-multiple' => 'köpsanly ($1)',
89658966 'centralnotice-translations' => 'Terjimeler',
89668967 'centralnotice-translate-to' => 'Şu dile terjime et:',
89678968 'centralnotice-translate' => 'Terjime et',
——@@ -9088,7 +9089,7 @@
90899090 'centralnotice-add-template' => 'Magdagdag ng isang suleras',
90909091 'centralnotice-show-notices' => 'Ipagkita ang mga pabatid',
90919092 'centralnotice-list-templates' => 'Itala ang mga suleras',
9092 - 'centralnotice-multiple_languages' => 'maramihan ($1)',
 9093+ 'centralnotice-multiple' => 'maramihan ($1)',
90939094 'centralnotice-translations' => 'Mga salinwika',
90949095 'centralnotice-translate-to' => 'Isalinwika patungong',
90959096 'centralnotice-translate' => 'Isalinwika',
——@@ -9422,7 +9423,7 @@
94239424 'centralnotice-add-template' => 'Додати шаблон',
94249425 'centralnotice-show-notices' => 'Показати повідомлення',
94259426 'centralnotice-list-templates' => 'Cписок шаблонів',
9426 - 'centralnotice-multiple_languages' => 'декілька ($1)',
 9427+ 'centralnotice-multiple' => 'декілька ($1)',
94279428 'centralnotice-translations' => 'Переклади',
94289429 'centralnotice-translate-to' => 'Переклад на',
94299430 'centralnotice-translate' => 'Переклад',
——@@ -9556,7 +9557,7 @@
95579558 'centralnotice-add-template' => 'Zonta un modèl',
95589559 'centralnotice-show-notices' => 'Mostra notifiche',
95599560 'centralnotice-list-templates' => 'Elenca i modèi',
9560 - 'centralnotice-multiple_languages' => 'multipli ($1)',
 9561+ 'centralnotice-multiple' => 'multipli ($1)',
95619562 'centralnotice-translations' => 'Tradussioni',
95629563 'centralnotice-translate-to' => 'Tradusi con',
95639564 'centralnotice-translate' => 'Tradusi',
——@@ -9688,7 +9689,7 @@
96899690 'centralnotice-add-template' => 'Thêm bảng',
96909691 'centralnotice-show-notices' => 'Xem các thông báo',
96919692 'centralnotice-list-templates' => 'Liệt kê các bảng',
9692 - 'centralnotice-multiple_languages' => 'đa ngữ ($1)',
 9693+ 'centralnotice-multiple' => 'đa ngữ ($1)',
96939694 'centralnotice-translations' => 'Bản dịch',
96949695 'centralnotice-translate-to' => 'Dịch ra',
96959696 'centralnotice-translate' => 'Biên dịch',
——@@ -9936,7 +9937,7 @@
99379938 'centralnotice-add-template' => '添加一个模板',
99389939 'centralnotice-show-notices' => '显示通告',
99399940 'centralnotice-list-templates' => '列出模板',
9940 - 'centralnotice-multiple_languages' => '较多($1)',
 9941+ 'centralnotice-multiple' => '较多($1)',
99419942 'centralnotice-translations' => '翻译',
99429943 'centralnotice-translate-to' => '翻译到',
99439944 'centralnotice-translate' => '翻译',

Follow-up revisions

RevisionCommit summaryAuthorDate
r76358more work towards multi-project selection - bug 20229kaldari00:08, 9 November 2010
r76361finishing work towards multi-project selection - bug 20229kaldari00:39, 9 November 2010
r76462updates to r76356 and r76358kaldari19:27, 10 November 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r68666updating mySQL set-up script for multi-language support (bug 20229), deleting...kaldari17:01, 28 June 2010
r76347work towards bug 20229kaldari23:02, 8 November 2010
r76351more work towards multi-project selection - bug 20229kaldari23:29, 8 November 2010

Comments

#Comment by Catrope (talk | contribs)   14:11, 10 November 2010 
-				$fields[] = htmlspecialchars( $this->getProjectName( $row->not_project ) );
[...]
+					$projectList = wfMsg ( 'centralnotice-multiple', $project_count );
[...]
+					$projectList = $wgLang->commaList( $projects );

So the projects are no longer escaped with htmlspecialchars()

#Comment by Kaldari (talk | contribs)   19:27, 10 November 2010

fixed in r76462.

Status & tagging log