http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76356
Revision: 76356
Author: kaldari
Date: 2010-11-08 23:57:57 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
more work towards multi-project selection - bug 20229
Modified Paths:
--------------
trunk/extensions/CentralNotice/CentralNotice.i18n.php
trunk/extensions/CentralNotice/SpecialCentralNotice.php
Modified: trunk/extensions/CentralNotice/CentralNotice.i18n.php
===================================================================
--- trunk/extensions/CentralNotice/CentralNotice.i18n.php 2010-11-08
23:52:50 UTC (rev 76355)
+++ trunk/extensions/CentralNotice/CentralNotice.i18n.php 2010-11-08
23:57:57 UTC (rev 76356)
@@ -34,7 +34,7 @@
'centralnotice-add-template' => 'Add a banner',
'centralnotice-show-notices' => 'Show campaigns',
'centralnotice-list-templates' => 'List banners',
- 'centralnotice-multiple_languages' => 'multiple ($1)',
+ 'centralnotice-multiple' => 'multiple ($1)',
'centralnotice-language-listing' => '$1 - $2',
'centralnotice-translations' => 'Translations',
'centralnotice-translate-to' => 'Translate to',
@@ -52,6 +52,7 @@
'centralnotice-notice-exists' => 'Campaign already exists.
Not adding.',
'centralnotice-no-language' => 'No language was selected for the
campaign. Not adding.',
+ 'centralnotice-no-project' => 'No project was selected for the
campaign. Not adding.',
'centralnotice-template-exists' => 'Banner already exists.
Not adding.',
'centralnotice-notice-doesnt-exist' => 'Campaign does not exist.',
@@ -169,7 +170,7 @@
'centralnotice-remove' => '{{Identical|Remove}}',
'centralnotice-translate-heading' => 'Fieldset label. $1 is a name of a
template.',
'centralnotice-add' => '{{Identical|Add}}',
- 'centralnotice-multiple_languages' => '$1 is a number. More precisely,
the number of languages a notice is available in. It is always greater than 3.',
+ '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.',
'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.',
'centralnotice-translate' => '{{Identical|Translate}}',
'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 @@
'centralnotice-add-template' => 'Voeg sjabloon by',
'centralnotice-show-notices' => 'Wys kennisgewings',
'centralnotice-list-templates' => 'Lys sjablone',
- 'centralnotice-multiple_languages' => 'verskeie ($1)',
+ 'centralnotice-multiple' => 'verskeie ($1)',
'centralnotice-translations' => 'Vertalings',
'centralnotice-translate-to' => 'Vertaal na',
'centralnotice-translate' => 'Vertaal',
@@ -634,7 +635,7 @@
'centralnotice-add-template' => 'Ҡалып өҫтәргә',
'centralnotice-show-notices' => 'Белдереүҙәрҙе күрһәтергә',
'centralnotice-list-templates' => 'Ҡалыптар исемлеге',
- 'centralnotice-multiple_languages' => 'бер нисә ($1)',
+ 'centralnotice-multiple' => 'бер нисә ($1)',
'centralnotice-translations' => 'Тәржемәләр',
'centralnotice-translate-to' => 'Тәржемә:',
'centralnotice-translate' => 'Тәржемә',
@@ -808,7 +809,7 @@
'centralnotice-add-template' => 'Дадаць паведамленьне',
'centralnotice-show-notices' => 'Паказаць кампаніі',
'centralnotice-list-templates' => 'Сьпіс паведамленьняў',
- 'centralnotice-multiple_languages' => 'некалькі ($1)',
+ 'centralnotice-multiple' => 'некалькі ($1)',
'centralnotice-translations' => 'Пераклады',
'centralnotice-translate-to' => 'Пераклад на',
'centralnotice-translate' => 'Пераклад',
@@ -1118,7 +1119,7 @@
'centralnotice-add-template' => 'Ouzhpennañ ur patrom',
'centralnotice-show-notices' => 'Diskouez ar menegoù',
'centralnotice-list-templates' => 'Rollañ ar patromoù',
- 'centralnotice-multiple_languages' => 'lies ($1)',
+ 'centralnotice-multiple' => 'lies ($1)',
'centralnotice-translations' => 'Troidigezhioù',
'centralnotice-translate-to' => 'Treiñ e',
'centralnotice-translate' => 'Treiñ',
@@ -1251,7 +1252,7 @@
'centralnotice-add-template' => 'Dodaj šablon',
'centralnotice-show-notices' => 'Prikaži obavještenja',
'centralnotice-list-templates' => 'Spisak šablona',
- 'centralnotice-multiple_languages' => 'više ($1)',
+ 'centralnotice-multiple' => 'više ($1)',
'centralnotice-translations' => 'Prijevodi',
'centralnotice-translate-to' => 'Prevedi na',
'centralnotice-translate' => 'Prijevod',
@@ -1494,7 +1495,7 @@
'centralnotice-add-template' => 'Přidat šablonu',
'centralnotice-show-notices' => 'Zobrazit oznámení',
'centralnotice-list-templates' => 'Seznam šablon',
- 'centralnotice-multiple_languages' => 'více ($1)',
+ 'centralnotice-multiple' => 'více ($1)',
'centralnotice-translations' => 'Překlady',
'centralnotice-translate-to' => 'Přeložit do jazyka',
'centralnotice-translate' => 'Přeložit',
@@ -1719,7 +1720,7 @@
'centralnotice-add-template' => 'Hinzufügen einer Vorlage',
'centralnotice-show-notices' => 'Zeige Meldungen',
'centralnotice-list-templates' => 'Vorlagen auflisten',
- 'centralnotice-multiple_languages' => 'mehrere ($1)',
+ 'centralnotice-multiple' => 'mehrere ($1)',
'centralnotice-translations' => 'Übersetzungen',
'centralnotice-translate-to' => 'Übersetzen in',
'centralnotice-translate' => 'Übersetzen',
@@ -1951,7 +1952,7 @@
'centralnotice-add-template' => 'Pśedłogu pśidaś',
'centralnotice-show-notices' => 'Powěźeńki pokazaś',
'centralnotice-list-templates' => 'Pśedłogi nalistowaś',
- 'centralnotice-multiple_languages' => 'někotare ($1)',
+ 'centralnotice-multiple' => 'někotare ($1)',
'centralnotice-translations' => 'Pśełožki',
'centralnotice-translate-to' => 'Pśełoźiś do',
'centralnotice-translate' => 'Pśełožiś',
@@ -2174,7 +2175,7 @@
'centralnotice-add-template' => 'Aldoni ŝablonon',
'centralnotice-show-notices' => 'Montri noticojn',
'centralnotice-list-templates' => 'Rigardi ŝablonojn',
- 'centralnotice-multiple_languages' => 'multlingve ($1)',
+ 'centralnotice-multiple' => 'multlingve ($1)',
'centralnotice-translations' => 'Tradukoj',
'centralnotice-translate-to' => 'Traduki al',
'centralnotice-translate' => 'Traduki',
@@ -2317,7 +2318,7 @@
'centralnotice-add-template' => 'Añadir una plantilla',
'centralnotice-show-notices' => 'Mostrar avisos',
'centralnotice-list-templates' => 'Listar plantillas',
- 'centralnotice-multiple_languages' => 'múltiples ($1)',
+ 'centralnotice-multiple' => 'múltiples ($1)',
'centralnotice-translations' => 'Traducciones',
'centralnotice-translate-to' => 'Traducir al',
'centralnotice-translate' => 'Traducir',
@@ -2634,7 +2635,7 @@
'centralnotice-add-template' => 'اضافه کردن الگو',
'centralnotice-show-notices' => 'نمایش اعلانها',
'centralnotice-list-templates' => 'فهرست الگوها',
- 'centralnotice-multiple_languages' => 'چندگانه ($1)',
+ 'centralnotice-multiple' => 'چندگانه ($1)',
'centralnotice-translations' => 'ترجمهها',
'centralnotice-translate-to' => 'ترجمه به',
'centralnotice-translate' => 'ترجمه کردن',
@@ -2771,7 +2772,7 @@
'centralnotice-add-template' => 'Lisää malline',
'centralnotice-show-notices' => 'Näytä tiedotteet',
'centralnotice-list-templates' => 'Luettele mallineet',
- 'centralnotice-multiple_languages' => 'useita ($1)',
+ 'centralnotice-multiple' => 'useita ($1)',
'centralnotice-translations' => 'Käännökset',
'centralnotice-translate-to' => 'Käännös:',
'centralnotice-translate' => 'Käännä',
@@ -2914,7 +2915,7 @@
'centralnotice-add-template' => 'Ajouter un modèle',
'centralnotice-show-notices' => 'Afficher les avis',
'centralnotice-list-templates' => 'Lister les modèles',
- 'centralnotice-multiple_languages' => 'multiple ($1)',
+ 'centralnotice-multiple' => 'multiple ($1)',
'centralnotice-translations' => 'Traductions',
'centralnotice-translate-to' => 'Traduire en',
'centralnotice-translate' => 'Traduire',
@@ -3047,7 +3048,7 @@
'centralnotice-add-template' => 'Apondre una baniére',
'centralnotice-show-notices' => 'Fâre vêre les propagandes',
'centralnotice-list-templates' => 'Listar les baniéres',
- 'centralnotice-multiple_languages' => 'un mouél ($1)',
+ 'centralnotice-multiple' => 'un mouél ($1)',
'centralnotice-translations' => 'Traduccions',
'centralnotice-translate-to' => 'Traduire en',
'centralnotice-translate' => 'Traduire',
@@ -3185,7 +3186,7 @@
'centralnotice-add-template' => 'Engadir un modelo',
'centralnotice-show-notices' => 'Amosar os avisos',
'centralnotice-list-templates' => 'Listar os modelos',
- 'centralnotice-multiple_languages' => 'múltiple ($1)',
+ 'centralnotice-multiple' => 'múltiple ($1)',
'centralnotice-translations' => 'Traducións',
'centralnotice-translate-to' => 'Traducir ao',
'centralnotice-translate' => 'Traducir',
@@ -3343,7 +3344,7 @@
'centralnotice-add-template' => 'Zuefiege vun ere Vorlag',
'centralnotice-show-notices' => 'Zeig Mäldige',
'centralnotice-list-templates' => 'Vorlage uflischte',
- 'centralnotice-multiple_languages' => 'mehreri ($1)',
+ 'centralnotice-multiple' => 'mehreri ($1)',
'centralnotice-translations' => 'Ibersetzige',
'centralnotice-translate-to' => 'Ibersetze in',
'centralnotice-translate' => 'Ibersetze',
@@ -3477,7 +3478,7 @@
'centralnotice-add-template' => 'הוספת תבנית',
'centralnotice-show-notices' => 'הצגת הודעות',
'centralnotice-list-templates' => 'רשימת תבניות',
- 'centralnotice-multiple_languages' => 'מרובים ($1)',
+ 'centralnotice-multiple' => 'מרובים ($1)',
'centralnotice-translations' => 'תרגומים',
'centralnotice-translate-to' => 'תרגום ל',
'centralnotice-translate' => 'תרגום',
@@ -3620,7 +3621,7 @@
'centralnotice-add-template' => 'Dodaj predložak',
'centralnotice-show-notices' => 'Pokaži obavijesti',
'centralnotice-list-templates' => 'Popis predložaka',
- 'centralnotice-multiple_languages' => 'više ($1)',
+ 'centralnotice-multiple' => 'više ($1)',
'centralnotice-translations' => 'Prijevodi',
'centralnotice-translate-to' => 'Prevedi na',
'centralnotice-translate' => 'Prevedi',
@@ -3753,7 +3754,7 @@
'centralnotice-add-template' => 'Předłohu přidać',
'centralnotice-show-notices' => 'Zdźělenki pokazać',
'centralnotice-list-templates' => 'Předłohi nalistować',
- 'centralnotice-multiple_languages' => 'wjacore ($1)',
+ 'centralnotice-multiple' => 'wjacore ($1)',
'centralnotice-translations' => 'Přełožki',
'centralnotice-translate-to' => 'Přełožić do',
'centralnotice-translate' => 'Přełožić',
@@ -3888,7 +3889,7 @@
'centralnotice-add-template' => 'Sablon hozzáadása',
'centralnotice-show-notices' => 'Üzenetek megjelenítése',
'centralnotice-list-templates' => 'Sablonok listázása',
- 'centralnotice-multiple_languages' => 'több ($1)',
+ 'centralnotice-multiple' => 'több ($1)',
'centralnotice-translations' => 'Fordítások',
'centralnotice-translate-to' => 'Lefordítás',
'centralnotice-translate' => 'Lefordítás',
@@ -4021,7 +4022,7 @@
'centralnotice-add-template' => 'Adder un bandiera',
'centralnotice-show-notices' => 'Monstrar campanias',
'centralnotice-list-templates' => 'Listar bandieras',
- 'centralnotice-multiple_languages' => 'multiple ($1)',
+ 'centralnotice-multiple' => 'multiple ($1)',
'centralnotice-translations' => 'Traductiones',
'centralnotice-translate-to' => 'Traducer in',
'centralnotice-translate' => 'Traducer',
@@ -4158,7 +4159,7 @@
'centralnotice-add-template' => 'Tambah templat',
'centralnotice-show-notices' => 'Tampilkan pengumuman',
'centralnotice-list-templates' => 'Daftar templat',
- 'centralnotice-multiple_languages' => 'ganda ($1)',
+ 'centralnotice-multiple' => 'ganda ($1)',
'centralnotice-translations' => 'Terjemahan',
'centralnotice-translate-to' => 'Terjemahkan ke',
'centralnotice-translate' => 'Terjemahkan',
@@ -4461,7 +4462,7 @@
'centralnotice-add-template' => 'テンプレートを追加',
'centralnotice-show-notices' => '告知を表示',
'centralnotice-list-templates' => 'テンプレートを一覧表示',
- 'centralnotice-multiple_languages' => '複数（$1）',
+ 'centralnotice-multiple' => '複数（$1）',
'centralnotice-translations' => '翻訳',
'centralnotice-translate-to' => '翻訳先',
'centralnotice-translate' => '翻訳',
@@ -4800,7 +4801,7 @@
'centralnotice-add-template' => '틀을 추가하기',
'centralnotice-show-notices' => '공지 표시하기',
'centralnotice-list-templates' => '템플릿 목록 표시하기',
- 'centralnotice-multiple_languages' => '다수 ($1)',
+ 'centralnotice-multiple' => '다수 ($1)',
'centralnotice-translations' => '번역',
'centralnotice-translate-to' => '번역할 언어',
'centralnotice-translate' => '번역하기',
@@ -4889,7 +4890,7 @@
'centralnotice-add-template' => 'En Schabloon dobei donn',
'centralnotice-show-notices' => 'Zentrale Nohreschte zeije',
'centralnotice-list-templates' => 'Schablone opleßte',
- 'centralnotice-multiple_languages' => 'etlijje ($1)',
+ 'centralnotice-multiple' => 'etlijje ($1)',
'centralnotice-translations' => 'Övversäzonge',
'centralnotice-translate-to' => 'Övversäze noh',
'centralnotice-translate' => 'Övversäze',
@@ -5001,7 +5002,7 @@
'centralnotice-add-template' => 'E Banner derbäisetzen',
'centralnotice-show-notices' => 'Matdeelunge weisen',
'centralnotice-list-templates' => 'Lëscht vun de Banneren',
- 'centralnotice-multiple_languages' => 'méi ($1)',
+ 'centralnotice-multiple' => 'méi ($1)',
'centralnotice-translations' => 'Iwwersetzungen',
'centralnotice-translate-to' => 'Iwwersetzen op',
'centralnotice-translate' => 'Iwwersetzen',
@@ -5145,7 +5146,7 @@
'centralnotice-add-template' => 'Sjabloon biedoon',
'centralnotice-show-notices' => 'Sitemitdeilinge waergaeve',
'centralnotice-list-templates' => 'Sjablone waergaeve',
- 'centralnotice-multiple_languages' => 'meerdere ($1)',
+ 'centralnotice-multiple' => 'meerdere ($1)',
'centralnotice-translations' => 'Euverzèttinge',
'centralnotice-translate-to' => 'Euverzètte nao',
'centralnotice-translate' => 'Euverzètte',
@@ -5428,7 +5429,7 @@
'centralnotice-add-template' => 'Додај шаблон',
'centralnotice-show-notices' => 'Прикажи известувања',
'centralnotice-list-templates' => 'Наведи шаблони',
- 'centralnotice-multiple_languages' => 'повеќе ($1)',
+ 'centralnotice-multiple' => 'повеќе ($1)',
'centralnotice-translations' => 'Преводи',
'centralnotice-translate-to' => 'Преведи на',
'centralnotice-translate' => 'Преведи',
@@ -5561,7 +5562,7 @@
'centralnotice-add-template' => 'ഫലകം കൂട്ടിച്ചേർക്കുക',
'centralnotice-show-notices' => 'അറിയിപ്പുകൾ പ്രദർശിപ്പിക്കുക',
'centralnotice-list-templates' => 'ഫലകങ്ങൾ പട്ടികവത്കരിക്കുക',
- 'centralnotice-multiple_languages' => 'നിരവധി ($1)',
+ 'centralnotice-multiple' => 'നിരവധി ($1)',
'centralnotice-translations' => 'തർജ്ജമകൾ',
'centralnotice-translate-to' => 'ഇതിലേയ്ക്ക് തർജ്ജമ ചെയ്യുക',
'centralnotice-translate' => 'തർജ്ജമ ചെയ്യുക',
@@ -5957,7 +5958,7 @@
'centralnotice-add-template' => 'Sjabloon toevoegen',
'centralnotice-show-notices' => 'Sitenotices weergeven',
'centralnotice-list-templates' => 'Sjablonen weergeven',
- 'centralnotice-multiple_languages' => 'meerdere ($1)',
+ 'centralnotice-multiple' => 'meerdere ($1)',
'centralnotice-translations' => 'Vertalingen',
'centralnotice-translate-to' => 'Vertalen naar',
'centralnotice-translate' => 'Vertalen',
@@ -6178,7 +6179,7 @@
'centralnotice-add-template' => 'Legg til en mal',
'centralnotice-show-notices' => 'Vis meldinger',
'centralnotice-list-templates' => 'Vis maler',
- 'centralnotice-multiple_languages' => 'flere ($1)',
+ 'centralnotice-multiple' => 'flere ($1)',
'centralnotice-translations' => 'Oversettelser',
'centralnotice-translate-to' => 'Oversett til',
'centralnotice-translate' => 'Oversett',
@@ -6432,7 +6433,7 @@
'centralnotice-add-template' => 'Dodaj szablon',
'centralnotice-show-notices' => 'Pokaż komunikaty',
'centralnotice-list-templates' => 'Lista szablonów',
- 'centralnotice-multiple_languages' => 'wiele ($1)',
+ 'centralnotice-multiple' => 'wiele ($1)',
'centralnotice-translations' => 'Tłumaczenia',
'centralnotice-translate-to' => 'Przetłumacz na',
'centralnotice-translate' => 'Przetłumacz',
@@ -6559,7 +6560,7 @@
'centralnotice-add-template' => 'Gionta në stamp',
'centralnotice-show-notices' => 'Mostra neuva',
'centralnotice-list-templates' => 'Lista stamp',
- 'centralnotice-multiple_languages' => 'mùltipl ($1)',
+ 'centralnotice-multiple' => 'mùltipl ($1)',
'centralnotice-translations' => 'Tradussion',
'centralnotice-translate-to' => 'Volté an',
'centralnotice-translate' => 'Volté',
@@ -6742,7 +6743,7 @@
'centralnotice-add-template' => 'Adicionar um modelo',
'centralnotice-show-notices' => 'Mostrar avisos',
'centralnotice-list-templates' => 'Listar modelos',
- 'centralnotice-multiple_languages' => 'múltiplas ($1)',
+ 'centralnotice-multiple' => 'múltiplas ($1)',
'centralnotice-translations' => 'Traduções',
'centralnotice-translate-to' => 'Traduzir para',
'centralnotice-translate' => 'Traduzir',
@@ -6877,7 +6878,7 @@
'centralnotice-add-template' => 'Adicionar um modelo',
'centralnotice-show-notices' => 'Mostrar avisos',
'centralnotice-list-templates' => 'Listar modelos',
- 'centralnotice-multiple_languages' => 'múltiplas ($1)',
+ 'centralnotice-multiple' => 'múltiplas ($1)',
'centralnotice-translations' => 'Traduções',
'centralnotice-translate-to' => 'Traduzir para',
'centralnotice-translate' => 'Traduzir',
@@ -7010,7 +7011,7 @@
'centralnotice-add-template' => 'Plantillata yapay',
'centralnotice-show-notices' => 'Willaykunata rikuchiy',
'centralnotice-list-templates' => 'Plantillakunata sutisuyupi rikuchiy',
- 'centralnotice-multiple_languages' => 'imaymana ($1)',
+ 'centralnotice-multiple' => 'imaymana ($1)',
'centralnotice-translations' => "T'ikrasqakuna",
'centralnotice-translate-to' => "Kayman t'ikray:",
'centralnotice-translate' => "T'ikray",
@@ -7138,7 +7139,7 @@
'centralnotice-add-template' => 'Adaugă un format',
'centralnotice-show-notices' => 'Arată anunțurile',
'centralnotice-list-templates' => 'Lista de formate',
- 'centralnotice-multiple_languages' => 'multiple ($1)',
+ 'centralnotice-multiple' => 'multiple ($1)',
'centralnotice-translations' => 'Traduceri',
'centralnotice-translate-to' => 'Tradu în',
'centralnotice-translate' => 'Tradu',
@@ -7265,7 +7266,7 @@
'centralnotice-add-template' => "Aggiunge 'nu banner",
'centralnotice-show-notices' => 'Visualizze le cambagne',
'centralnotice-list-templates' => 'Liste de le banner',
- 'centralnotice-multiple_languages' => 'multiple ($1)',
+ 'centralnotice-multiple' => 'multiple ($1)',
'centralnotice-translations' => 'Traduziune',
'centralnotice-translate-to' => 'Traduce a',
'centralnotice-translate' => 'Traduce',
@@ -7400,7 +7401,7 @@
'centralnotice-add-template' => 'Добавить шаблон',
'centralnotice-show-notices' => 'Показать уведомления',
'centralnotice-list-templates' => 'Вывести список шаблонов',
- 'centralnotice-multiple_languages' => 'несколько ($1)',
+ 'centralnotice-multiple' => 'несколько ($1)',
'centralnotice-translations' => 'Переводы',
'centralnotice-translate-to' => 'Перевод на',
'centralnotice-translate' => 'Перевод',
@@ -7533,7 +7534,7 @@
'centralnotice-add-template' => 'Додати шаблону',
'centralnotice-show-notices' => 'Указати повідомлїня',
'centralnotice-list-templates' => 'Cписок шаблон',
- 'centralnotice-multiple_languages' => 'веце ($1)',
+ 'centralnotice-multiple' => 'веце ($1)',
'centralnotice-translations' => 'Переклады',
'centralnotice-translate-to' => 'Переклад до',
'centralnotice-translate' => 'Переложыти',
@@ -7661,7 +7662,7 @@
'centralnotice-add-template' => 'Халыып эбэргэ',
'centralnotice-show-notices' => 'Биллэриилэри көрдөр',
'centralnotice-list-templates' => 'Халыыптар тиһиктэрэ',
- 'centralnotice-multiple_languages' => 'хас да ($1)',
+ 'centralnotice-multiple' => 'хас да ($1)',
'centralnotice-translations' => 'Тылбаастар',
'centralnotice-translate-to' => 'Манна тылбаас',
'centralnotice-translate' => 'Тылбаас',
@@ -7887,7 +7888,7 @@
'centralnotice-add-template' => 'Pridať šablónu',
'centralnotice-show-notices' => 'Zobraziť oznamy',
'centralnotice-list-templates' => 'Zoznam šablón',
- 'centralnotice-multiple_languages' => 'viaceré ($1)',
+ 'centralnotice-multiple' => 'viaceré ($1)',
'centralnotice-translations' => 'Preklady',
'centralnotice-translate-to' => 'Preložiť do jazyka',
'centralnotice-translate' => 'Preložiť',
@@ -8009,7 +8010,7 @@
'centralnotice-add-template' => 'Dodaj pasico',
'centralnotice-show-notices' => 'Prikaži akcije',
'centralnotice-list-templates' => 'Seznam pasic',
- 'centralnotice-multiple_languages' => 'več ($1)',
+ 'centralnotice-multiple' => 'več ($1)',
'centralnotice-translations' => 'Prevodi',
'centralnotice-translate-to' => 'Prevedi v',
'centralnotice-translate' => 'Prevedi',
@@ -8385,7 +8386,7 @@
'centralnotice-add-template' => 'Lägg till en mall',
'centralnotice-show-notices' => 'Visa meddelanden',
'centralnotice-list-templates' => 'Lista mallar',
- 'centralnotice-multiple_languages' => 'flera ($1)',
+ 'centralnotice-multiple' => 'flera ($1)',
'centralnotice-translations' => 'Översättningar',
'centralnotice-translate-to' => 'Översätt till',
'centralnotice-translate' => 'Översätt',
@@ -8517,7 +8518,7 @@
'centralnotice-preview' => 'முன்தோற்றம்',
'centralnotice-remove' => 'நீக்கு',
'centralnotice-add' => 'சேர்க்கவும்',
- 'centralnotice-multiple_languages' => 'ஒன்றுக்கு மேற்பட்ட ($1)',
+ 'centralnotice-multiple' => 'ஒன்றுக்கு மேற்பட்ட ($1)',
'centralnotice-translations' => 'மொழிபெயர்ப்புக்கள்',
'centralnotice-translate-to' => 'மொழிபெயர்ப்பு செய்யவும்',
'centralnotice-translate' => 'மொழிபெயர்ப்பு செய்யவும்',
@@ -8574,7 +8575,7 @@
'centralnotice-add-template' => 'ఒక మూసని చేర్చు',
'centralnotice-show-notices' => 'ప్రచారోద్యమాలని చూపించు',
'centralnotice-list-templates' => 'మూసలను చూపించు',
- 'centralnotice-multiple_languages' => 'బహుళం ($1)',
+ 'centralnotice-multiple' => 'బహుళం ($1)',
'centralnotice-translations' => 'అనువాదాలు',
'centralnotice-translate' => 'అనువదించండి',
'centralnotice-english' => 'ఇంగ్లీష్',
@@ -8960,7 +8961,7 @@
'centralnotice-add-template' => 'Şablon goş',
'centralnotice-show-notices' => 'Uwedomleniýeleri görkez',
'centralnotice-list-templates' => 'Şablonlaryň sanawyny görkez',
- 'centralnotice-multiple_languages' => 'köpsanly ($1)',
+ 'centralnotice-multiple' => 'köpsanly ($1)',
'centralnotice-translations' => 'Terjimeler',
'centralnotice-translate-to' => 'Şu dile terjime et:',
'centralnotice-translate' => 'Terjime et',
@@ -9088,7 +9089,7 @@
'centralnotice-add-template' => 'Magdagdag ng isang suleras',
'centralnotice-show-notices' => 'Ipagkita ang mga pabatid',
'centralnotice-list-templates' => 'Itala ang mga suleras',
- 'centralnotice-multiple_languages' => 'maramihan ($1)',
+ 'centralnotice-multiple' => 'maramihan ($1)',
'centralnotice-translations' => 'Mga salinwika',
'centralnotice-translate-to' => 'Isalinwika patungong',
'centralnotice-translate' => 'Isalinwika',
@@ -9422,7 +9423,7 @@
'centralnotice-add-template' => 'Додати шаблон',
'centralnotice-show-notices' => 'Показати повідомлення',
'centralnotice-list-templates' => 'Cписок шаблонів',
- 'centralnotice-multiple_languages' => 'декілька ($1)',
+ 'centralnotice-multiple' => 'декілька ($1)',
'centralnotice-translations' => 'Переклади',
'centralnotice-translate-to' => 'Переклад на',
'centralnotice-translate' => 'Переклад',
@@ -9556,7 +9557,7 @@
'centralnotice-add-template' => 'Zonta un modèl',
'centralnotice-show-notices' => 'Mostra notifiche',
'centralnotice-list-templates' => 'Elenca i modèi',
- 'centralnotice-multiple_languages' => 'multipli ($1)',
+ 'centralnotice-multiple' => 'multipli ($1)',
'centralnotice-translations' => 'Tradussioni',
'centralnotice-translate-to' => 'Tradusi con',
'centralnotice-translate' => 'Tradusi',
@@ -9688,7 +9689,7 @@
'centralnotice-add-template' => 'Thêm bảng',
'centralnotice-show-notices' => 'Xem các thông báo',
'centralnotice-list-templates' => 'Liệt kê các bảng',
- 'centralnotice-multiple_languages' => 'đa ngữ ($1)',
+ 'centralnotice-multiple' => 'đa ngữ ($1)',
'centralnotice-translations' => 'Bản dịch',
'centralnotice-translate-to' => 'Dịch ra',
'centralnotice-translate' => 'Biên dịch',
@@ -9936,7 +9937,7 @@
'centralnotice-add-template' => '添加一个模板',
'centralnotice-show-notices' => '显示通告',
'centralnotice-list-templates' => '列出模板',
- 'centralnotice-multiple_languages' => '较多($1)',
+ 'centralnotice-multiple' => '较多($1)',
'centralnotice-translations' => '翻译',
'centralnotice-translate-to' => '翻译到',
'centralnotice-translate' => '翻译',
Modified: trunk/extensions/CentralNotice/SpecialCentralNotice.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-11-08
23:52:50 UTC (rev 76355)
+++ trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-11-08
23:57:57 UTC (rev 76356)
@@ -140,14 +140,14 @@
if ( $method == 'addNotice' ) {
$noticeName =
$wgRequest->getVal( 'noticeName' );
$start =
$wgRequest->getArray( 'start' );
- $project_name =
$wgRequest->getVal( 'project_name' );
+ $projects =
$wgRequest->getArray( 'projects' );
$project_languages =
$wgRequest->getArray( 'project_languages' );
$geotargeted =
$wgRequest->getCheck( 'geotargeted' );
$geo_countries =
$wgRequest->getArray( 'geo_countries' );
if ( $noticeName == '' ) {
$this->showError(
'centralnotice-null-string' );
} else {
- $this->addNotice( $noticeName,
'0', $start, $project_name,
+ $this->addNotice( $noticeName,
'0', $start, $projects,
$project_languages,
$geotargeted, $geo_countries );
}
}
@@ -304,7 +304,6 @@
'not_end',
'not_enabled',
'not_preferred',
- 'not_project',
'not_locked'
),
null,
@@ -359,15 +358,23 @@
htmlspecialchars(
$row->not_name ),
'method=listNoticeDetail¬ice=' . urlencode( $row->not_name ) );
- // Project
- $fields[] = htmlspecialchars(
$this->getProjectName( $row->not_project ) );
+ // Projects
+ $projects = $this->getNoticeProjects(
$row->not_name );
+ $project_count = count( $projects );
+ $projectList = '';
+ if ( $language_count > 2 ) {
+ $projectList = wfMsg (
'centralnotice-multiple', $project_count );
+ } elseif ( $project_count > 0 ) {
+ $projectList = $wgLang->commaList(
$projects );
+ }
+ $fields[] = $projectList;
// Languages
$project_langs = $this->getNoticeLanguages(
$row->not_name );
$language_count = count( $project_langs );
$languageList = '';
if ( $language_count > 3 ) {
- $languageList = wfMsg (
'centralnotice-multiple_languages', $language_count );
+ $languageList = wfMsg (
'centralnotice-multiple', $language_count );
} elseif ( $language_count > 0 ) {
$languageList = $wgLang->commaList(
$project_langs );
}
@@ -654,10 +661,10 @@
}
}
- // Handle new project name
- $projectName = $wgRequest->getVal(
'project_name' );
- if ( $projectName !== null ) {
- $this->updateProjectName (
$notice, $projectName );
+ // Handle new projects
+ $projects = $wgRequest->getArray(
'projects' );
+ if ( $projects ) {
+ $this->updateProjects( $notice,
$projects );
}
// Handle new project languages
@@ -1122,12 +1129,15 @@
return $templates;
}
- function addNotice( $noticeName, $enabled, $start, $project_name,
+ function addNotice( $noticeName, $enabled, $start, $projects,
$project_languages, $geotargeted, $geo_countries )
{
if ( $this->noticeExists( $noticeName ) ) {
$this->showError( 'centralnotice-notice-exists' );
return;
+ } elseif ( empty( $projects ) ) {
+ $this->showError( 'centralnotice-no-project' );
+ return;
} elseif ( empty( $project_languages ) ) {
$this->showError( 'centralnotice-no-language' );
return;
@@ -1160,12 +1170,19 @@
'not_enabled' => $enabled,
'not_start' => $dbw->timestamp(
$startTs ),
'not_end' => $dbw->timestamp( $endTs ),
- 'not_project' => $project_name,
'not_geo' => $geotargeted
)
);
$not_id = $dbw->insertId();
+ // Do multi-row insert for campaign projects
+ $insertArray = array();
+ foreach( $projects as $project ) {
+ $insertArray[] = array( 'np_notice_id' =>
$not_id, 'np_project' => $project );
+ }
+ $res = $dbw->insert( 'cn_notice_projects',
$insertArray,
+ __METHOD__, array( 'IGNORE' ) );
+
// Do multi-row insert for campaign languages
$insertArray = array();
foreach( $project_languages as $code ) {
@@ -1568,6 +1585,35 @@
)
);
}
+
+ function updateProjects( $notice, $newProjects ) {
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->begin();
+
+ // Get the previously assigned projects
+ $oldProjects = $this->getNoticeProjects( $notice );
+
+ // Get the notice id
+ $row = $dbw->selectRow( 'cn_notices', 'not_id', array(
'not_name' => $notice ) );
+
+ // Add newly assigned projects
+ $addProjects = array_diff( $newProjects, $oldProjects );
+ $insertArray = array();
+ foreach( $addProjects as $project ) {
+ $insertArray[] = array( 'np_notice_id' => $row->not_id,
'np_project' => $project );
+ }
+ $res = $dbw->insert( 'cn_notice_projects', $insertArray,
__METHOD__, array( 'IGNORE' ) );
+
+ // Remove disassociated projects
+ $removeProjects = array_diff( $oldProjects, $newProjects );
+ if ( $removeProjects ) {
+ $res = $dbw->delete( 'cn_notice_projects',
+ array( 'np_notice_id' => $row->not_id,
'np_project' => $removeProjects )
+ );
+ }
+
+ $dbw->commit();
+ }
function updateProjectLanguages( $notice, $newLanguages ) {
$dbw = wfGetDB( DB_MASTER );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
