r114399 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r114398‎ | r114399 | r114400 >
Date:19:56, 21 March 2012
Author:catrope
Status:ok
Tags:
Comment:
Revert r113740 and its followups r113785, r113985, r113986, r113988, r113991, r114012, r114022, r114142, r114259. Unreviewed revs in Collection.

All of these revisions are tagged with 'gerritmigration' and will be resubmitted into Gerrit after the Gerrit switchover. See also http://lists.wikimedia.org/pipermail/wikitech-l/2012-March/059124.html
Modified paths:
  • /trunk/extensions/Collection/Collection.body.php (modified) (history)
  • /trunk/extensions/Collection/Collection.hooks.php (modified) (history)
  • /trunk/extensions/Collection/Collection.i18n.php (modified) (history)
  • /trunk/extensions/Collection/Collection.php (modified) (history)
  • /trunk/extensions/Collection/Collection.session.php (modified) (history)
  • /trunk/extensions/Collection/Collection.suggest.php (modified) (history)
  • /trunk/extensions/Collection/Collection.templates.php (modified) (history)
  • /trunk/extensions/Collection/README.txt (modified) (history)
  • /trunk/extensions/Collection/images/silk-add.png (modified) (history)
  • /trunk/extensions/Collection/js/bookcreator.css (modified) (history)
  • /trunk/extensions/Collection/js/collection.js (modified) (history)

Diff [purge]

Index: trunk/extensions/Collection/Collection.i18n.php
——@@ -75,7 +75,7 @@
7676 'coll-post_failed_title' => 'POST request failed',
7777 'coll-post_failed_msg' => 'The POST request to $1 failed ($2).',
7878 'coll-mwserve_failed_title' => 'Render server error',
79 - 'coll-mwserve_failed_msg' => 'An error occurred on the render server: <nowiki>$1</nowiki>',
 79+ 'coll-mwserve_failed_msg' => 'An error occured on the render server: <nowiki>$1</nowiki>',
8080 'coll-error_reponse' => 'Error response from server',
8181 'coll-empty_collection' => 'Empty book',
8282 'coll-revision' => 'Revision: $1',
——@@ -143,6 +143,8 @@
144144 'coll-license' => 'License',
145145 'coll-license_url' => '-',
146146 'coll-return_to' => "Return to [[:$1]]",
 147+ 'coll-more_info' => 'Show more information',
 148+ 'coll-hide_info' => 'Hide information',
147149 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress order information',
148150 'coll-suggest_title' => 'Suggested pages for your book',
149151 'coll-suggest_intro_text' => 'Suggestions are based on the current set of wiki pages in your book.
——@@ -542,6 +544,8 @@
543545 Let asseblief kontak met jou MediaWiki administrateur.',
544546 'coll-license' => 'Lisensie',
545547 'coll-return_to' => 'Terug na [[:$1]]',
 548+ 'coll-more_info' => 'Wys meer inligting',
 549+ 'coll-hide_info' => 'Versteek inligting',
546550 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Bestelinligting PediaPress',
547551 'coll-suggest_title' => 'Voorgestelde bladsye vir jou boek',
548552 'coll-suggest_intro_text' => 'Voorstelle is gebaseer op die huidige reeks van wiki-bladsye in jou boek.
——@@ -746,6 +750,8 @@
747751 Por favor, contacte con o suyo administrador MediaWiki.",
748752 'coll-license' => 'Licencia',
749753 'coll-return_to' => 'Torne ta [[:$1]].',
 754+ 'coll-more_info' => 'Amostrar mas información',
 755+ 'coll-hide_info' => 'Amagar información',
750756 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress ordenar información',
751757 'coll-suggest_title' => 'Pachinas sucheridas ta lo tuyo libro',
752758 'coll-suggest_intro_text' => "As sucherencias se basan en o conchunto actual de pachinas wiki d'o tuyo libro.
——@@ -892,6 +898,8 @@
893899 من فضلك اتصل بإداري ميدياويكي الخاص بك.',
894900 'coll-license' => 'ترخيص',
895901 'coll-return_to' => 'رجوع إلى [[:$1]]',
 902+ 'coll-more_info' => 'عرض المزيد من المعلومات',
 903+ 'coll-hide_info' => 'إخفاء المعلومات',
896904 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/معلومات الطلب من بيديابرس',
897905 'coll-suggest_title' => 'صفحات كتابك المقترحة',
898906 'coll-suggest_intro_text' => 'المقترحات مبنية على صفحات كتابك الحالية.
——@@ -945,6 +953,7 @@
946954 'coll-rendering_page' => '(ܕܦܐ: $1)',
947955 'coll-notfound_title' => 'ܟܬܒܐ ܠܝܬ ܠܗ ܐܝܬܘܬܐ',
948956 'coll-download_notfound_title' => 'ܠܦܦܐ ܠܐ ܐܫܟܚܬ',
 957+ 'coll-more_info' => 'ܚܘܝ ܝܕ̈ܥܬܐ ܝܬܝܪ',
949958 'coll-suggest_your_book' => 'ܟܬܒܐ ܕܝܠܟ',
950959 'coll-suggest_show' => 'ܚܘܝ',
951960 'coll-suggest_undo' => 'ܠܐ ܬܥܒܕ',
——@@ -1066,6 +1075,8 @@
10671076 من فضلك اتصل بإدارى ميدياويكى الخاص بك.',
10681077 'coll-license' => 'ترخيص',
10691078 'coll-return_to' => 'رجوع إلى [[:$1]]',
 1079+ 'coll-more_info' => 'عرض المزيد من المعلومات',
 1080+ 'coll-hide_info' => 'إخفاء المعلومات',
10701081 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/معلومات الطلب من بيديابرس',
10711082 'coll-suggest_title' => 'صفحات كتابك المقترحة',
10721083 'coll-suggest_intro_text' => 'المقترحات مبنيه على صفحات كتابك الحاليه.
——@@ -1275,6 +1286,8 @@
12761287 Зинһар, MediaWiki хакимына мөрәжәғәт итегеҙ.',
12771288 'coll-license' => 'Рөхсәтнамә',
12781289 'coll-return_to' => '[[:$1]] битенә кире ҡайтырға',
 1290+ 'coll-more_info' => 'Күберәк мәғлүмәт күрһәтергә',
 1291+ 'coll-hide_info' => 'Мәғлүмәтте йәшерергә',
12791292 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress заказы тураһында мәғлүмәт',
12801293 'coll-suggest_title' => 'Һеҙҙең китабығыҙ өсөн тәҡдим ителгән биттәр',
12811294 'coll-suggest_intro_text' => 'Тәҡдимдәр һеҙҙең китабығыҙҙағы ағымдағы вики биттәр йыйынтығына нигеҙләнгән.
——@@ -1423,6 +1436,8 @@
14241437 Калі ласка, звяжыцеся з Вашым адміністратарам MediaWiki.',
14251438 'coll-license' => 'Ліцэнзія',
14261439 'coll-return_to' => 'Вярнуцца да [[:$1]]',
 1440+ 'coll-more_info' => 'Паказаць болей інфармацыі',
 1441+ 'coll-hide_info' => 'Схаваць інфармацыю',
14271442 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Інфармацыя пра заказ у PediaPress',
14281443 'coll-suggest_title' => 'Прапанаваныя старонкі для Вашай кнігі',
14291444 'coll-suggest_intro_text' => 'Прапановы заснаваныя на цяперашніх настаўленнях вікі-старонак у Вашай кнізе.
——@@ -1567,6 +1582,8 @@
15681583 Калі ласка, зьвяжыцеся з Вашым адміністратарам MediaWiki.',
15691584 'coll-license' => 'Ліцэнзія',
15701585 'coll-return_to' => 'Вярнуцца да [[:$1]]',
 1586+ 'coll-more_info' => 'Паказаць болей інфармацыі',
 1587+ 'coll-hide_info' => 'Схаваць інфармацыю',
15711588 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Інфармацыя пра заказ у PediaPress',
15721589 'coll-suggest_title' => 'Прапанаваныя старонкі для Вашай кнігі',
15731590 'coll-suggest_intro_text' => 'Прапановы заснаваныя на цяперашніх наладах вікі-старонак у Вашай кнізе.
——@@ -1672,6 +1689,8 @@
16731690 'coll-about_pp' => 'За $1',
16741691 'coll-license' => 'Лиценз',
16751692 'coll-return_to' => 'Връщане към [[:$1]]',
 1693+ 'coll-more_info' => 'Показване на повече информация',
 1694+ 'coll-hide_info' => 'Скриване на информацията',
16761695 'coll-suggest_title' => 'Предложени страници към книгата ви',
16771696 'coll-suggested_articles' => 'Предположения',
16781697 'coll-suggest_reset_bans_tooltip' => 'Показване на предишно премахнати предложения',
——@@ -1818,6 +1837,8 @@
18191838 অনুগ্রহ করে আপনার মিডিয়াউইকি প্রশাসকের সাথে যোগাযোগ করুন।',
18201839 'coll-license' => 'লাইসেন্স',
18211840 'coll-return_to' => '[[:$1]] এ ফিরে যাও',
 1841+ 'coll-more_info' => 'আরও তথ্য দেখাও',
 1842+ 'coll-hide_info' => 'তথ্য আড়াল করো',
18221843 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress অর্ডারের তথ্য',
18231844 'coll-suggest_title' => 'আপনার বইয়ের জন্য যে পাতাগুলো পরামর্শ দেওয়া হচ্ছে',
18241845 'coll-suggest_intro_text' => 'পরামর্শগুলো আপনার বইতে থাকা বর্তমান উইকি পাতা গুলোর উপর ভিত্তি করে করা হয়েছে।
——@@ -1961,6 +1982,8 @@
19621983 Kit e darempred gant ur merour MediaWiki.",
19631984 'coll-license' => 'Aotre-implijout',
19641985 'coll-return_to' => 'Distreiñ da [[:$1]]',
 1986+ 'coll-more_info' => "Diskouez muioc'h a ditouroù",
 1987+ 'coll-hide_info' => 'Kuzhat an titouroù',
19651988 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress urzhiañ titouroù',
19661989 'coll-suggest_title' => 'Pajennoù kinniget evit ho levr',
19671990 'coll-suggest_intro_text' => "Diazezet eo ar c'hinnigoù war an torkad pajennoù wiki zo en ho levr evit poent.
——@@ -2101,6 +2124,8 @@
21022125 Molimo da kontaktirate Vašeg MediaWiki administratora.',
21032126 'coll-license' => 'Licenca',
21042127 'coll-return_to' => 'Vrati na [[:$1]]',
 2128+ 'coll-more_info' => 'Prikaži više informacija',
 2129+ 'coll-hide_info' => 'Sakrij informacije',
21052130 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress informacije o narudžbi',
21062131 'coll-suggest_title' => 'Predložene stranice za Vašu knjigu',
21072132 'coll-suggest_intro_text' => 'Prijedlozi su zasnovani na trenutnom setu wiki stranica u Vašoj knjizi.
——@@ -2247,6 +2272,8 @@
22482273 Si us plau, contacteu amb el vostre administrador de MediaWiki.",
22492274 'coll-license' => 'Llicència',
22502275 'coll-return_to' => 'Tornar a [[:$1]]',
 2276+ 'coll-more_info' => 'Mostra més informació',
 2277+ 'coll-hide_info' => 'Amaga informació',
22512278 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Ordena informacó de PediaPress',
22522279 'coll-suggest_title' => 'Pàgines suggerides per al vostre llibre',
22532280 'coll-suggest_intro_text' => "Els suggeriments estan basats en la llista actual de pàgines al llibre.
——@@ -2401,6 +2428,8 @@
24022429 Kontaktujte svého správce MediaWiki.',
24032430 'coll-license' => 'Licence',
24042431 'coll-return_to' => 'Návrat na stránku „[[:$1]]“.',
 2432+ 'coll-more_info' => 'Zobrazit další informace',
 2433+ 'coll-hide_info' => 'Skrýt informace',
24052434 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Objednávky od PediaPress',
24062435 'coll-suggest_title' => 'Doporučené stránky pro vaší knihu',
24072436 'coll-suggest_intro_text' => 'Návrhy byly vybrány podle stránek, které už v knize máte.
——@@ -2550,6 +2579,8 @@
25512580 Cysylltwch â'ch gweinyddwyr MediaWiki.",
25522581 'coll-license' => 'Trwydded',
25532582 'coll-return_to' => 'Yn ôl i [[:$1]]',
 2583+ 'coll-more_info' => 'Dangos rhagor o wybodaeth',
 2584+ 'coll-hide_info' => "Cuddio'r wybodaeth",
25542585 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Gwybodaeth am archebu oddi wrth PediaPress',
25552586 'coll-suggest_title' => 'Awgrymu tudalennau ar gyfer eich llyfr',
25562587 'coll-suggest_intro_text' => "Mae'r awgrymiadau hyn wedi eu seilio ar y detholiad presennol o dudalennau wici yn eich llyfr.
——@@ -2694,6 +2725,8 @@
26952726 Kontakt venligst din MediaWiki-administrator.',
26962727 'coll-license' => 'Licens',
26972728 'coll-return_to' => 'Tilbage til [[:$1]]',
 2729+ 'coll-more_info' => 'Vis mere information',
 2730+ 'coll-hide_info' => 'Skjul information',
26982731 'coll-order_info_article' => '((MediaWiki:Coll-Helppage))/PediaPress ordreoplysninger',
26992732 'coll-suggest_title' => 'Foreslåede sider til din bog',
27002733 'coll-suggest_intro_text' => 'Forslagene er baseret på de wikisider, der udgør din bog i øjeblikket.
——@@ -2842,6 +2875,8 @@
28432876 'coll-invalid_podpartner_msg' => 'Die Angaben zum Print-on-Demand-Partner sind fehlerhaft. Bitte kontaktiere den MediaWiki-Administrator.',
28442877 'coll-license' => 'Lizenz',
28452878 'coll-return_to' => 'Zurück zu [[:$1]]',
 2879+ 'coll-more_info' => 'Weitere Informationen zeigen',
 2880+ 'coll-hide_info' => 'Informationen verstecken',
28462881 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress Bestellinformation',
28472882 'coll-suggest_title' => 'Vorgeschlagene Seiten für dein Buch',
28482883 'coll-suggest_intro_text' => 'Die Vorschläge basieren auf die aktuell in deinem Buch vorhandenen Wikiseiten.
——@@ -3034,6 +3069,8 @@
30353070 Ma rica keno îdarekarê MedîyaWîkîyî ra yew mesaj bişirav.',
30363071 'coll-license' => 'Lisans',
30373072 'coll-return_to' => 'Reyna şi [[:$1]]',
 3073+ 'coll-more_info' => 'Enformasyon bimucne',
 3074+ 'coll-hide_info' => 'Enformasyon binumne',
30383075 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress enformasyon şîparîş bike',
30393076 'coll-suggest_title' => 'Kitabê tu rê pelanê tavsîyayî',
30403077 'coll-suggest_intro_text' => 'Tevsiyayan sero setanê pel ê wîkî newe ke kitabê tu de.
——@@ -3174,6 +3211,8 @@
31753212 Skontaktuj pšosym swójogo administratora MediaWiki',
31763213 'coll-license' => 'Licenca',
31773214 'coll-return_to' => 'Slědk k bokoju [[:$1]]',
 3215+ 'coll-more_info' => 'Dalšne informacije pokazaś',
 3216+ 'coll-hide_info' => 'Informacije schowaś',
31783217 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress skazańske informacije',
31793218 'coll-suggest_title' => 'Naraźone boki za twóje knigły',
31803219 'coll-suggest_intro_text' => 'Naraźenja bazěruju na aktualnu sajźbu wikibokow w twójich knigłach.
——@@ -3327,6 +3366,8 @@
33283367 Παρακαλούμε επικοινωνήστε με ένα διαχειριστή του MediaWiki.',
33293368 'coll-license' => 'Άδεια',
33303369 'coll-return_to' => 'Επιστροφή στο [[:$1]]',
 3370+ 'coll-more_info' => 'Εμφάνιση περισσότερων πληροφοριών',
 3371+ 'coll-hide_info' => 'Απόκρυψη πληροφοριών',
33313372 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress απαίτηση για πληροφόρηση',
33323373 'coll-suggest_title' => 'Προτεινόμενες σελίδες για το βιβλίο σας',
33333374 'coll-suggest_intro_text' => 'Οι υποδείξεις βασίζονται στην τρέχουσα ρύθμιση βικισελίδων στο βιβλίο σας.
——@@ -3472,6 +3513,8 @@
34733514 Bonvolu kontakti vian administranton de MediaWiki.',
34743515 'coll-license' => 'Permesilo',
34753516 'coll-return_to' => 'Reiri al [[:$1]]',
 3517+ 'coll-more_info' => 'Montri plian informon',
 3518+ 'coll-hide_info' => 'Kaŝi informon',
34763519 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress mendo-informo',
34773520 'coll-suggest_title' => 'Sugestitaj paĝoj por via libro',
34783521 'coll-suggest_intro_text' => 'Sugestoj estas bazita de la nuna aro de vikipaĝoj en via libro.
——@@ -3626,6 +3669,8 @@
36273670 Por favor, contacta con tu administrador MediaWiki.',
36283671 'coll-license' => 'Licencia',
36293672 'coll-return_to' => 'Volver a [[:$1]].',
 3673+ 'coll-more_info' => 'Mostrar más información',
 3674+ 'coll-hide_info' => 'Ocultar información',
36303675 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress ordenar información',
36313676 'coll-suggest_title' => 'Páginas sugeridas para tu libro',
36323677 'coll-suggest_intro_text' => 'Las sugerencias están basadas en el conjunto actual de páginas wiki de tu libro.
——@@ -3760,6 +3805,8 @@
37613806 'coll-about_pp' => 'Trükikoja $1 teave',
37623807 'coll-license' => 'Litsents',
37633808 'coll-return_to' => 'Naase [[:$1]]',
 3809+ 'coll-more_info' => 'Näita lisainfot',
 3810+ 'coll-hide_info' => 'Peida info',
37643811 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPressi tellimisteave',
37653812 'coll-suggest_title' => 'Raamatusse pakutavad leheküljed',
37663813 'coll-suggest_intro_text' => 'Lehekülgede soovitamisel on lähtutud hetkel raamatus olevatest lehekülgedest. Seda loetelu uuendatakse iga kord, kui klõpsad lisamis- või eemaldamisnupul.',
——@@ -3901,6 +3948,8 @@
39023949 Kontakta ezazu, mesedez MediaWiki administratzailea.',
39033950 'coll-license' => 'Lizentzia',
39043951 'coll-return_to' => '[[:$1]]era itzuli',
 3952+ 'coll-more_info' => 'Informazio gehiago erakutsi',
 3953+ 'coll-hide_info' => 'Informazioa ezkutatu',
39053954 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress eskaera informazioa',
39063955 'coll-suggest_title' => 'Zure liburuarentzako orrialde gomendioak',
39073956 'coll-suggest_intro_text' => 'Gomendioak orain dituzun orrialdeetan oinarriturik agertzen dira.
——@@ -4051,6 +4100,8 @@
40524101 لطفاً با مدیر مدیاویکی خود تماس بگیرید.',
40534102 'coll-license' => 'اجازه‌نامه',
40544103 'coll-return_to' => 'بازگشت به [[:$1]]',
 4104+ 'coll-more_info' => 'اطلاعات بیشتر را نشان بده',
 4105+ 'coll-hide_info' => 'اطلاعات را پنهان کن',
40554106 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/دسته‌بندی اطلاعات پدیاپرس',
40564107 'coll-suggest_title' => 'صفحه‌های پیشنهادی برای کتابتان',
40574108 'coll-suggest_intro_text' => 'پیشنهادها بر پایهٔ مجموعهٔ کنونی صفحه‌های ویکی در کتاب شما قرار دارند.
——@@ -4198,6 +4249,8 @@
41994250 Ota yhteys MediaWiki-ylläpitäjääsi.',
42004251 'coll-license' => 'Lisenssi',
42014252 'coll-return_to' => 'Palaa sivulle [[:$1]]',
 4253+ 'coll-more_info' => 'Näytä lisätietoja',
 4254+ 'coll-hide_info' => 'Piilota tiedot',
42024255 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPressin tilaustiedot',
42034256 'coll-suggest_title' => 'Ehdotetut sivut kirjaasi',
42044257 'coll-suggest_intro_text' => 'Ehdotukset perustuvat kirjasi nykyisiin wikisivuihin.
——@@ -4351,6 +4404,8 @@
43524405 Veuillez contacter votre administrateur MediaWiki.',
43534406 'coll-license' => 'Licence',
43544407 'coll-return_to' => 'Retourner vers [[:$1]]',
 4408+ 'coll-more_info' => 'Afficher d’autres informations',
 4409+ 'coll-hide_info' => 'Masquer les informations',
43554410 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress commander des informations',
43564411 'coll-suggest_title' => 'Pages suggérées pour votre livre',
43574412 'coll-suggest_intro_text' => "Les suggestions sont fondées sur l'ensemble des pages wiki actuellement dans votre livre.
——@@ -4493,6 +4548,8 @@
44944549 Vos volyéd veriér vers voutron administrator MediaWiki.',
44954550 'coll-license' => 'Licence',
44964551 'coll-return_to' => 'Tornar a [[:$1]]',
 4552+ 'coll-more_info' => 'Fâre vêre d’ôtres enformacions',
 4553+ 'coll-hide_info' => 'Cachiér les enformacions',
44974554 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress comandar des enformacions',
44984555 'coll-suggest_title' => 'Pâges conselyês por voutron lévro',
44994556 'coll-suggest_intro_text' => 'Los consèlys sont basâs sur l’ensemblo de les pâges vouiqui d’ora dens voutron lévro.
——@@ -4667,6 +4724,8 @@
46684725 Por favor, contacte co seu administrador MediaWiki.',
46694726 'coll-license' => 'Licenza',
46704727 'coll-return_to' => 'Volver a "[[:$1]]"',
 4728+ 'coll-more_info' => 'Obter máis información',
 4729+ 'coll-hide_info' => 'Agochar a información',
46714730 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Información de pedido a PediaPress',
46724731 'coll-suggest_title' => 'Páxinas recomendadas para o seu libro',
46734732 'coll-suggest_intro_text' => 'As suxestións están baseadas no conxunto actual de páxinas do wiki no seu libro.
——@@ -4833,6 +4892,8 @@
48344893 'coll-invalid_podpartner_msg' => 'In dr Aagabe zum Print-on-Demand-Partner het s Fähler. Bitte nimm Kontakt uf zu MediaWiki-Administrator.',
48354894 'coll-license' => 'Lizänz',
48364895 'coll-return_to' => 'Zruck zue [[:$1]]',
 4896+ 'coll-more_info' => 'Meh Informatione zeige',
 4897+ 'coll-hide_info' => 'Informatione verstecke',
48374898 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress Bstellinformation',
48384899 'coll-suggest_title' => 'Vorgschlageni Syte fir Dyy Buech',
48394900 'coll-suggest_intro_text' => 'Vorschleg basieren uf dr aktuälle Wikisytenyystellige in Dyym Buech.
——@@ -4976,6 +5037,8 @@
49775038 તમારા મીડિયાવિકિ પ્રબંધકનો સંપર્ક કરો.',
49785039 'coll-license' => 'પરવાનો',
49795040 'coll-return_to' => '[[:$1]] પર પાછા વળો',
 5041+ 'coll-more_info' => 'વધુ માહિતી બતાવો',
 5042+ 'coll-hide_info' => 'માહિતી છુપાવો',
49805043 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/પીડિયાપ્રેસ ફરમાયશ માહિતી',
49815044 'coll-suggest_title' => 'તમારા પુસ્તક માટે પાનાંના સુઝાવ',
49825045 'coll-suggest_intro_text' => 'સુઝાવો તમારા પુસ્તકમાં હાલમાં રહેલા વિકિ પૃષ્ઠોને આધારે કરવામાં આવ્યાં છે.
——@@ -5152,6 +5215,8 @@
51535216 אנא צרו קשר עם מנהל של מדיה־ויקי.',
51545217 'coll-license' => 'רישיון',
51555218 'coll-return_to' => 'חזרה ל[[:$1]]',
 5219+ 'coll-more_info' => 'הצגת מידע נוסף',
 5220+ 'coll-hide_info' => 'הסתרת מידע',
51565221 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/מידע על הזמנה ב־PediaPress',
51575222 'coll-suggest_title' => 'דפים מוצעים לספר',
51585223 'coll-suggest_intro_text' => 'ההצעות מבוססות על האוסף הנוכחי של דפי הוויקי בתוך הספר.
——@@ -5257,6 +5322,8 @@
52585323 'coll-invalid_podpartner_title' => 'अमान्य POD साथी',
52595324 'coll-license' => 'लाइसेंस',
52605325 'coll-return_to' => 'वापसी [[:$1]] को',
 5326+ 'coll-more_info' => 'और अधिक जानकारी दिखाएँ',
 5327+ 'coll-hide_info' => 'जानकारी छुपाएँ',
52615328 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/पीडियाप्रैस आदेश जानकारी',
52625329 'coll-suggest_title' => 'अपनी किताब के लिए सुझाए गए पृष्ठों',
52635330 'coll-suggested_articles' => 'सुझाव',
——@@ -5401,6 +5468,8 @@
54025469 Molimo kontaktirajte svog MediaWiki administratora.',
54035470 'coll-license' => 'Licencija',
54045471 'coll-return_to' => 'Vrati se na [[:$1]]',
 5472+ 'coll-more_info' => 'Prikaži više informacija',
 5473+ 'coll-hide_info' => 'Sakrij informacije',
54055474 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/informacije o narudžbi PediaPressa',
54065475 'coll-suggest_title' => 'Predložene stranice za vašu knjigu',
54075476 'coll-suggest_intro_text' => 'Prijedlozi se temelje na trenutnom skupu wiki stranica u vašoj knjizi.
——@@ -5540,6 +5609,8 @@
55415610 Skontaktuj prošu swojeho administratora MediaWiki.',
55425611 'coll-license' => 'Licenca',
55435612 'coll-return_to' => 'Wróćo k stronje [[:$1]]',
 5613+ 'coll-more_info' => 'Dalše informacije pokazać',
 5614+ 'coll-hide_info' => 'Informacije schować',
55445615 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress skazanske informacije',
55455616 'coll-suggest_title' => 'Namjetowane strony za twoju knihu',
55465617 'coll-suggest_intro_text' => 'Namjety bazuja na aktualnu sadźbu wikistronow w twojej knize.
——@@ -5690,6 +5761,8 @@
56915762 Kérlek lépj kapcsolatba a MediaWiki adminisztrátorával.',
56925763 'coll-license' => 'Licenc',
56935764 'coll-return_to' => 'Visszatérés a(z) [[:$1]] laphoz',
 5765+ 'coll-more_info' => 'További információk megjelenítése',
 5766+ 'coll-hide_info' => 'További információk elrejtése',
56945767 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress rendelési információk',
56955768 'coll-suggest_title' => 'Javasolt lapok a könyvedbe',
56965769 'coll-suggest_intro_text' => 'A javaslatok jelenleg a könyvedben szereplő wikilapokon alapulnak.
——@@ -5932,6 +6005,8 @@
59336006 Per favor contacta tu administrator de MediaWiki.',
59346007 'coll-license' => 'Licentia',
59356008 'coll-return_to' => 'Retornar a [[:$1]]',
 6009+ 'coll-more_info' => 'Monstrar plus informationes',
 6010+ 'coll-hide_info' => 'Celar informationes',
59366011 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Commanda a PediaPress',
59376012 'coll-suggest_title' => 'Paginas suggerite pro tu libro',
59386013 'coll-suggest_intro_text' => 'Le suggestiones es basate super le collection actual de paginas wiki in tu libro.
——@@ -6078,6 +6153,8 @@
60796154 Silakan hubungi pengelola MediaWiki Anda.',
60806155 'coll-license' => 'Lisensi',
60816156 'coll-return_to' => 'Kembali ke [[:$1]]',
 6157+ 'coll-more_info' => 'Tampilkan informasi lebih lanjut',
 6158+ 'coll-hide_info' => 'Sembunyikan informasi',
60826159 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Informasi pemesanan dari PediaPress',
60836160 'coll-suggest_title' => 'Halaman yang disarankan untuk buku Anda',
60846161 'coll-suggest_intro_text' => 'Saran berdasarkan pada pengaturan halaman wiki dalam buku Anda.
——@@ -6231,6 +6308,8 @@
62326309 Pangngaasia kontaken ti administrador ti MediaWiki.',
62336310 'coll-license' => 'Lisensia',
62346311 'coll-return_to' => 'Agsubli idiay [[:$1]]',
 6312+ 'coll-more_info' => 'Agipakita ti adu pay a pakaammo',
 6313+ 'coll-hide_info' => 'Ilemmeng ti pakaammo',
62356314 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Pakaammo ti panagbilin ti PediaPress',
62366315 'coll-suggest_title' => 'Naisingasing a pampanid para iti librom',
62376316 'coll-suggest_intro_text' => 'Ti naisingasing ket naibantay iti agdama a disso ti pampanid ti wiki nga addaan dita librom.
——@@ -6446,6 +6525,8 @@
64476526 'coll-invalid_podpartner_msg' => 'Il partner POD fornito non è valido. Contatta il tuo amministratore MediaWiki.',
64486527 'coll-license' => 'Licenza',
64496528 'coll-return_to' => 'Torna a [[:$1]]',
 6529+ 'coll-more_info' => 'Mostra ulteriori informazioni',
 6530+ 'coll-hide_info' => 'Nascondi informazioni',
64506531 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Informazioni ordine PediaPress',
64516532 'coll-suggest_title' => 'Pagine suggerite per il proprio libro',
64526533 'coll-suggest_intro_text' => 'I suggerimenti sono basati sulla raccolta attuale di pagine presenti nel proprio libro.
——@@ -6583,6 +6664,8 @@
65846665 'coll-invalid_podpartner_msg' => '提供されたオンデマンド印刷パートナーは無効です。MediaWiki の管理者に連絡してください。',
65856666 'coll-license' => 'ライセンス',
65866667 'coll-return_to' => '[[:$1]]に戻る',
 6668+ 'coll-more_info' => '詳細を表示',
 6669+ 'coll-hide_info' => '詳細を非表示',
65876670 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress注文情報',
65886671 'coll-suggest_title' => 'ブックに追加するページの候補',
65896672 'coll-suggest_intro_text' => '現在のあなたのブックに含まれるウィキページ群に基づき、候補を一覧表示しています。あなたが追加や除去のボタンを押すとすぐに一覧は更新されます。',
——@@ -6824,6 +6907,8 @@
68256908 დაუკავშირდით MediaWiki-ს თქვენს ადმინისტრატორს.',
68266909 'coll-license' => 'ლიცენზია',
68276910 'coll-return_to' => 'დაბრუნება [[:$1]]-ზე.',
 6911+ 'coll-more_info' => 'უფრო მეტი ინფორმაციის ჩვენება',
 6912+ 'coll-hide_info' => 'ინფორმაციის დამალვა',
68286913 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/ინფორმაცია PediaPress-ის შეკვვეთაზე',
68296914 'coll-suggest_title' => 'შემოთავაზებული გვერდები თქვენი წიგნისათვის',
68306915 'coll-suggest_intro_text' => 'მოსაზრებატა სია დაფუძნებულია თქვენს წიგნში უკვე არსებულ გვერდებზე.
——@@ -6941,6 +7026,8 @@
69427027 'coll-about_pp' => 'អំពី$1',
69437028 'coll-license' => 'អាជ្ញាប័ណ្ណ',
69447029 'coll-return_to' => 'ត្រឡប់ទៅកាន់ [[:$1]]',
 7030+ 'coll-more_info' => 'បង្ហាញ​ព័ត៌មានបន្ថែម​',
 7031+ 'coll-hide_info' => 'លាក់​ព័ត៌មាន​',
69457032 'coll-suggest_your_book' => 'សៀវភៅ​របស់អ្នក',
69467033 'coll-suggest_show' => 'បង្ហាញ',
69477034 'coll-suggest_ban_tooltip' => 'ដកទំព័រនេះចេញពីបញ្ជីបេក្ខភាព',
——@@ -7088,6 +7175,8 @@
70897176 'coll-invalid_podpartner_msg' => '제공받은 인쇄 협력자 정보가 잘못되었습니다. 관리자에게 해당 문제를 연락해주세요.',
70907177 'coll-license' => '라이선스',
70917178 'coll-return_to' => '[[:$1]](으)로 돌아갑니다.',
 7179+ 'coll-more_info' => '정보 더 보기',
 7180+ 'coll-hide_info' => '정보 숨기기',
70927181 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress 주문 정보',
70937182 'coll-suggest_title' => '당신의 책에 넣을 문서 제안',
70947183 'coll-suggest_intro_text' => '문서 제안은 지금 당신의 책에 있는 위키 문서의 집합을 바탕으로 이루어집니다.
——@@ -7246,6 +7335,8 @@
72477336 Don dat enem Wikki-Köbes obb et Bruut schmiere.',
72487337 'coll-license' => 'Lizänz',
72497338 'coll-return_to' => 'Jangk zerök noh [[:$1]]',
 7339+ 'coll-more_info' => 'Mieh Enfommazjuhne aanzeije',
 7340+ 'coll-hide_info' => 'Winnijer Enfommazjuhne aanzeije',
72507341 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Wie mer bei <i lang="en">PediaPress</i> beshtelle kann',
72517342 'coll-suggest_title' => 'Sigge-Vörshlähsch för Ding Booch',
72527343 'coll-suggest_intro_text' => 'Vöschlähsch jonn vun dä Sigge uß, di De ald en Dingem Booch dren häs.
——@@ -7405,6 +7496,8 @@
74067497 Kontaktéiert w.e.g. Äre MediaWiki Adminstrateur.',
74077498 'coll-license' => 'Lizenz',
74087499 'coll-return_to' => 'Zréck op [[:$1]]',
 7500+ 'coll-more_info' => 'Méi Informatioune weisen',
 7501+ 'coll-hide_info' => 'Informatioune verstoppen',
74097502 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress Bestellinformatiounen',
74107503 'coll-suggest_title' => 'Virgeschloe Säite fir Äert Buch',
74117504 'coll-suggest_intro_text' => "D'Virschléi baséieren op den aktuelle Säiten an Ärem Buch.
——@@ -7547,6 +7640,8 @@
75487641 Nöm kóntak op mèt eure MediaWikiadmin.",
75497642 'coll-license' => 'Lisens',
75507643 'coll-return_to' => 'Trök göch [[:$1]]',
 7644+ 'coll-more_info' => 'Toean mieër inlichtinger',
 7645+ 'coll-hide_info' => 'Verbèrg inlichtinger',
75517646 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Bestèlinlichtinger PediaPress',
75527647 'coll-suggest_title' => 'Paginasuggesties veur die book',
75537648 'coll-suggest_intro_text' => "Suggesties zeen gebaseerd op de hudige selectie van wikipagina's in die book.
——@@ -7657,6 +7752,8 @@
76587753 'coll-about_pp' => 'Apie $1',
76597754 'coll-license' => 'Licencija',
76607755 'coll-return_to' => 'Grįžti į [[:$1]]',
 7756+ 'coll-more_info' => 'Rodyti daugiau informacijos',
 7757+ 'coll-hide_info' => 'Slėpti informaciją',
76617758 'coll-suggested_articles' => 'Pasiūlymai',
76627759 'coll-suggest_reset_bans' => 'perkrauti',
76637760 'coll-suggest_reset_bans_tooltip' => 'Rodyti anksčiau pašalintus pasiūlymus',
——@@ -7731,6 +7828,8 @@
77327829 'coll-about_pp' => 'Par $1',
77337830 'coll-license' => 'Licence',
77347831 'coll-return_to' => 'Atgriezties uz [[:$1]]',
 7832+ 'coll-more_info' => 'Parādīt vairāk informācijas',
 7833+ 'coll-hide_info' => 'Paslēpt informāciju',
77357834 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress pasūtījuma informācija',
77367835 'coll-suggest_title' => 'Ieteiktās lapas jūsu grāmatai',
77377836 'coll-suggested_articles' => 'Ieteikumi',
——@@ -7867,6 +7966,8 @@
78687967 Контактирајте го вашиот MediaWiki администратор.',
78697968 'coll-license' => 'Лиценца',
78707969 'coll-return_to' => 'Врати се на [[:$1]]',
 7970+ 'coll-more_info' => 'Прикажи повеќе информации',
 7971+ 'coll-hide_info' => 'Скриј ги информациите',
78717972 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Информации за порачувањето од PediaPress',
78727973 'coll-suggest_title' => 'Предложени страници за вашата книга',
78737974 'coll-suggest_intro_text' => 'Предлозите се засновани на тековниот збир од вики-страници во вашата книга.
——@@ -8005,6 +8106,8 @@
80068107 ദയവായി താങ്കളുടെ മീഡിയവിക്കി കാര്യനിർവാഹകനെ ബന്ധപ്പെടുക.',
80078108 'coll-license' => 'അനുമതി',
80088109 'coll-return_to' => '[[:$1]] താളിലേയ്ക്ക് തിരിച്ചു പോവുക',
 8110+ 'coll-more_info' => 'കൂടുതൽ വിവരങ്ങൾ പ്രദർശിപ്പിക്കുക',
 8111+ 'coll-hide_info' => 'വിവരങ്ങൾ മറയ്ക്കുക',
80098112 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/പീഡിയപ്രസ്സ് ആവശ്യപ്പെടൽ വിവരങ്ങൾ',
80108113 'coll-suggest_title' => 'താങ്കളുടെ പുസ്തകത്തിലേയ്ക്ക് നിർദ്ദേശിക്കുന്ന താളുകൾ',
80118114 'coll-suggest_intro_text' => 'താങ്കളുടെ പുസ്തകത്തിൽ ഇപ്പോഴുള്ള വിക്കിതാളുകളുടെ ഗണത്തെ അധിഷ്ഠിതമാക്കിയുള്ള നിർദ്ദേശങ്ങളാണിത്.
——@@ -8163,6 +8266,8 @@
81648267 कृपया मीडियाविकि प्रबंधकाशी संपर्क करा.',
81658268 'coll-license' => 'परवाना',
81668269 'coll-return_to' => '[[:$1]] कड़े परत जा',
 8270+ 'coll-more_info' => 'अधिक माहिती दाखवा',
 8271+ 'coll-hide_info' => 'माहिती लपवा',
81678272 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/ पिडिया मुद्रणालयाकडे मागणी नोंदवण्याची माहिती',
81688273 'coll-suggest_title' => 'आपल्या ग्रंथासाठी सुचवलेली पाने',
81698274 'coll-suggest_intro_text' => 'सुचवणी आपल्या ग्रंथातील सध्याच्या विकि पानांच्या संग्रहावर आधारित आहे.
——@@ -8303,6 +8408,8 @@
83048409 'coll-invalid_podpartner_msg' => 'Rakan POD yang dibekalkan tidak sah. Sila hubungi pentadbir MediaWiki anda.',
83058410 'coll-license' => 'Lesen',
83068411 'coll-return_to' => 'Kembali ke [[:$1]]',
 8412+ 'coll-more_info' => 'Paparkan maklumat lanjut',
 8413+ 'coll-hide_info' => 'Sorokkan maklumat',
83078414 'coll-order_info_article' => 'Maklumat pesanan {{MediaWiki:Coll-helppage}}/PediaPress',
83088415 'coll-suggest_title' => 'Laman-laman cadangan untuk buku anda',
83098416 'coll-suggest_intro_text' => 'Cadangan-cadangan ini adalah berdasarkan laman-laman wiki semasa dalam buku anda. Senarai ini akan dikemaskinikan setiap kali anda mengklik butang tambah atau buang.',
——@@ -8537,6 +8644,8 @@
85388645 Kontakt din MediaWiki-administrator.',
85398646 'coll-license' => 'Lisens',
85408647 'coll-return_to' => 'Tilbake til [[:$1]]',
 8648+ 'coll-more_info' => 'Vis mer informasjon',
 8649+ 'coll-hide_info' => 'Skjul informasjon',
85418650 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Bestillingsinformasjon PediaPress',
85428651 'coll-suggest_title' => 'Foreslåtte sider for boken din',
85438652 'coll-suggest_intro_text' => 'Forslag er basert på nåværende wikisider i boken din.
——@@ -8657,6 +8766,8 @@
86588767 'coll-invalid_podpartner_msg' => 'De Angaven to’n Print-on-Demand-Partner sünd verkehrt. Neem Kuktakt op mit den MediaWiki-Administrater.',
86598768 'coll-license' => 'Lizenz',
86608769 'coll-return_to' => 'Trüch na [[:$1]]',
 8770+ 'coll-more_info' => 'Wies mehr Infos',
 8771+ 'coll-hide_info' => 'Informatschonen versteken',
86618772 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress Bestellinformatschoon',
86628773 );
86638774
——@@ -8816,6 +8927,8 @@
88178928 Neem contact op met uw MediaWiki-beheerder.',
88188929 'coll-license' => 'Licentie',
88198930 'coll-return_to' => 'Terug naar [[:$1]]',
 8931+ 'coll-more_info' => 'Meer informatie weergeven',
 8932+ 'coll-hide_info' => 'Gegevens verbergen',
88208933 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Bestelinformatie PediaPress',
88218934 'coll-suggest_title' => 'Paginasuggesties voor uw boek',
88228935 'coll-suggest_intro_text' => "Suggesties zijn gebaseerd op de huidige selectie van wikipagina's in uw boek.
——@@ -8953,6 +9066,8 @@
89549067 Kontakt MediaWiki-administratoren din.',
89559068 'coll-license' => 'Lisens',
89569069 'coll-return_to' => 'Attende til [[:$1]]',
 9070+ 'coll-more_info' => 'Syn meir informasjon',
 9071+ 'coll-hide_info' => 'Skjul informasjon',
89579072 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress tingingsinformasjon',
89589073 'coll-suggest_title' => 'Framlegg til sider for boka di',
89599074 'coll-suggest_intro_text' => 'Framlegg er baserte på dei noverande wikisidene i boka di.
——@@ -9092,6 +9207,8 @@
90939208 Contactatz vòstre administrator MediaWiki.',
90949209 'coll-license' => 'Licéncia',
90959210 'coll-return_to' => 'Tornar cap a [[:$1]]',
 9211+ 'coll-more_info' => 'Afichar d’autras informacions',
 9212+ 'coll-hide_info' => 'Amagar las informacions',
90969213 'coll-order_info_article' => "{{MediaWiki:Coll-helppage}}/PediaPress comandar d'informacions",
90979214 'coll-suggest_title' => 'Paginas suggeridas per vòstre libre',
90989215 'coll-suggest_intro_text' => "Las suggestions son fondadas sus l'ensemble de las paginas wiki actualament dins vòstre libre.
——@@ -9179,6 +9296,8 @@
91809297 'coll-invalid_podpartner_title' => 'ଅଚଳ POD ପାର୍ଟନର',
91819298 'coll-license' => 'ଲାଇସେନ୍ସ',
91829299 'coll-return_to' => '[[:$1]]କୁ ଫେରିଯିବେ',
 9300+ 'coll-more_info' => 'ଅଧିକ ବିବରଣୀ ଦେଖାଇବେ',
 9301+ 'coll-hide_info' => 'ତଥ୍ୟ ଲୁଚାନ୍ତୁ',
91839302 'coll-suggested_articles' => 'ପ୍ରସ୍ତାବ',
91849303 'coll-suggest_reset_bans' => 'ପୁନସ୍ଥାପନ',
91859304 'coll-suggest_reset_bans_tooltip' => 'ଆଗରୁ ଦିଆଯାଇଥିବା ମତଗୁଡିକୁ ଦେଖାଇବେ',
——@@ -9363,6 +9482,8 @@
93649483 Skontaktuj się z administratorem tego serwisu MediaWiki.',
93659484 'coll-license' => 'Licencja',
93669485 'coll-return_to' => 'Powrót do [[:$1]]',
 9486+ 'coll-more_info' => 'Pokaż więcej informacji',
 9487+ 'coll-hide_info' => 'Ukryj informacje',
93679488 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Zamawianie PediaPress',
93689489 'coll-suggest_title' => 'Strony proponowane aby je dodać do książki',
93699490 'coll-suggest_intro_text' => 'Propozycje generowane są na podstawie analizy aktualnego zestawu stron wiki wchodzących w skład książki.
——@@ -9506,6 +9627,8 @@
95079628 Për piasì, ch'a contata sò aministrator MediaWiki.",
95089629 'coll-license' => 'Licensa',
95099630 'coll-return_to' => 'Torné andaré a [[:$1]]',
 9631+ 'coll-more_info' => "Smon-e pi d'anformassion",
 9632+ 'coll-hide_info' => 'Stërma anformassion',
95109633 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Anformassion órdin PediaPress',
95119634 'coll-suggest_title' => 'Pàgine sugerìe për tò lìber',
95129635 'coll-suggest_intro_text' => "Ij sugeriment a son basà an sl'ansema corent dle pàgine wiki an sò lìber.
——@@ -9575,6 +9698,8 @@
95769699 'coll-download_notfound_title' => 'دوتنه و نه موندل شوه',
95779700 'coll-about_pp' => 'د $1 په اړه',
95789701 'coll-license' => 'منښتليک',
 9702+ 'coll-more_info' => 'نور مالومات ښکاره کول',
 9703+ 'coll-hide_info' => 'مالومات پټول',
95799704 'coll-suggest_title' => 'ستاسې د کتاب لپاره وړانديز شوي مخونه',
95809705 'coll-suggested_articles' => 'وړانديزونه',
95819706 'coll-suggest_reset_bans' => 'بياايښودل',
——@@ -9713,6 +9838,8 @@
97149839 Por favor, contacte o seu administrador MediaWiki.',
97159840 'coll-license' => 'Licença',
97169841 'coll-return_to' => 'Voltar para [[:$1]]',
 9842+ 'coll-more_info' => 'Mostrar mais informação',
 9843+ 'coll-hide_info' => 'Ocultar informação',
97179844 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Informação sobre encomendas PediaPress',
97189845 'coll-suggest_title' => 'Páginas sugeridas para o seu livro',
97199846 'coll-suggest_intro_text' => 'As sugestões são baseadas no conjunto actual de páginas wiki no seu livro.
——@@ -9861,6 +9988,8 @@
98629989 Por favor, contate o seu administrador MediaWiki.',
98639990 'coll-license' => 'Licença',
98649991 'coll-return_to' => 'Voltar para [[:$1]]',
 9992+ 'coll-more_info' => 'Exibir mais informações',
 9993+ 'coll-hide_info' => 'Esconder informações',
98659994 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Informações sobre pedidos feitos à PediaPress',
98669995 'coll-suggest_title' => 'Páginas sugeridas para seu livro',
98679996 'coll-suggest_intro_text' => 'Sugestões são baseadas no conjunto atual de páginas wiki no seu livro.
——@@ -9887,6 +10016,8 @@
988810017 * @author AlimanRuna
988910018 */
989010019 $messages['qu'] = array(
 10020+ 'coll-more_info' => 'Aswan willaykunata rikuchiy',
 10021+ 'coll-hide_info' => 'Willaykunata pakay',
989110022 );
989210023
989310024 /** Romansh (Rumantsch)
——@@ -10009,6 +10140,8 @@
1001010141 Contactescha tes administratur da MediaWiki.",
1001110142 'coll-license' => 'Licenza',
1001210143 'coll-return_to' => 'Turnar a [[:$1]]',
 10144+ 'coll-more_info' => 'Mussar ulteriuras infurmaziuns',
 10145+ 'coll-hide_info' => 'Zuppentar infurmaziuns',
1001310146 'coll-order_info_article' => "{{MediaWiki:Coll-helppage}}/Infurmaziuns per l'empustaziun tar PediaPress",
1001410147 'coll-suggest_title' => 'Paginas proponidas per tes cudesch',
1001510148 'coll-suggest_intro_text' => 'Las propostas sa basan sin ils artitgels actuals en tes cudesch.
——@@ -10157,6 +10290,8 @@
1015810291 Vă rugăm să contactați administratorul sitului MediaWiki.',
1015910292 'coll-license' => 'Licență',
1016010293 'coll-return_to' => 'Înapoi la [[:$1]]',
 10294+ 'coll-more_info' => 'Arată mai multe informații',
 10295+ 'coll-hide_info' => 'Ascunde informațiile',
1016110296 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Informații despre comanda către PediaPress',
1016210297 'coll-suggest_title' => 'Pagini sugerate pentru cartea dumneavoastră',
1016310298 'coll-suggest_intro_text' => 'Sugestiile se bazează pe actualul conținut al cărții dumneavoastră.
——@@ -10270,6 +10405,8 @@
1027110406 'coll-invalid_podpartner_title' => 'Partner POD invalide',
1027210407 'coll-license' => 'Licenze',
1027310408 'coll-return_to' => 'Tuèrne a [[:$1]]',
 10409+ 'coll-more_info' => "Fa vedè cchiù 'mbormaziune",
 10410+ 'coll-hide_info' => "Scunne le 'mbormaziune",
1027410411 'coll-order_info_article' => "{{MediaWiki:Coll-helppage}}/'Mbormaziune sus a l'ordine de PediaPress",
1027510412 'coll-suggest_title' => 'Pàggene suggerite pu libbre tune',
1027610413 'coll-suggested_articles' => 'Suggereminde',
——@@ -10418,6 +10555,8 @@
1041910556 Пожалуйста, свяжитесь с вашим администратором MediaWiki.',
1042010557 'coll-license' => 'Лицензия',
1042110558 'coll-return_to' => 'Возврат к [[:$1]]',
 10559+ 'coll-more_info' => 'Показать больше информации',
 10560+ 'coll-hide_info' => 'Скрыть информацию',
1042210561 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Информация о заказе PediaPress',
1042310562 'coll-suggest_title' => 'Предлагаемые для вашей книги страницы',
1042410563 'coll-suggest_intro_text' => 'Предложения основываются на текущем наборе вики-страниц вашей книги.
——@@ -10558,6 +10697,8 @@
1055910698 Контактуйте свого адміністратора MediaWiki.',
1056010699 'coll-license' => 'Ліценція',
1056110700 'coll-return_to' => 'Навернутя до [[:$1]]',
 10701+ 'coll-more_info' => 'Указати далшы інформації',
 10702+ 'coll-hide_info' => 'Сховати інформацію',
1056210703 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Обїднавкы од PediaPress',
1056310704 'coll-suggest_title' => 'Пропонованы сторінкы про вашу книгу',
1056410705 'coll-suggest_intro_text' => 'Пропозіції были выбраны подля сторінок, котры уж в книзї маєте.
——@@ -10705,6 +10846,8 @@
1070610847 Бука диэн MediaWiki дьаһабылын кытта кэпсэт.',
1070710848 'coll-license' => 'Лицензия',
1070810849 'coll-return_to' => 'Манна төннүү: [[:$1]]',
 10850+ 'coll-more_info' => 'Өссө эбии көрдөр',
 10851+ 'coll-hide_info' => 'Кистээ',
1070910852 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress сакаастааһын туһунан',
1071010853 'coll-suggest_title' => 'Эн кинигэҕэр анаан бэриллэр сирэйдэр',
1071110854 'coll-suggest_intro_text' => 'Саҥа этиилэр билиҥҥи биики-сирэйдэриҥ бөлөхтөрүгэр олоҕуран бэриллэллэр.
——@@ -10870,6 +11013,8 @@
1087111014 'coll-invalid_podpartner_title' => 'වලංගු නොවන POD සහකරු',
1087211015 'coll-license' => 'බලපත්‍රය',
1087311016 'coll-return_to' => '[[:$1]] වෙත නැවත යන්න',
 11017+ 'coll-more_info' => 'තවත් තොරතුරු පෙන්වන්න',
 11018+ 'coll-hide_info' => 'තොරතුරු සඟවන්න',
1087411019 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/පිඩියමුද්‍රණාල ඇනවුම් තොරතුරු',
1087511020 'coll-suggest_title' => 'ඔබේ පොත සඳහා යෝජනා කල පිටුව',
1087611021 'coll-suggested_articles' => 'යෝජනා',
——@@ -11007,6 +11152,8 @@
1100811153 Prosím, kontaktujte svojho správcu MediaWiki.',
1100911154 'coll-license' => 'Licencia',
1101011155 'coll-return_to' => 'Návrat na [[:$1]]',
 11156+ 'coll-more_info' => 'Zobraziť viac informácií',
 11157+ 'coll-hide_info' => 'Skryť informácie',
1101111158 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Informácie o objednávkach PediaPress',
1101211159 'coll-suggest_title' => 'Navrhované stránky pre vašu knihu',
1101311160 'coll-suggest_intro_text' => 'Návrhy sa robia na základe stránok, ktoré sa momentálne nachádzajú vo vašej knihe.
——@@ -11149,6 +11296,8 @@
1115011297 Kontaktirajte vašega MediaWiki skrbnika.',
1115111298 'coll-license' => 'Dovoljenje',
1115211299 'coll-return_to' => 'Nazaj na [[:$1]]',
 11300+ 'coll-more_info' => 'Prikaži več informacij',
 11301+ 'coll-hide_info' => 'Skrij informacije',
1115311302 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress podatki naročila',
1115411303 'coll-suggest_title' => 'Predlagane strani za vašo knjigo',
1115511304 'coll-suggest_intro_text' => 'Predlogi temeljijo na trenutnem izboru strani wiki v vaši knjigi.
——@@ -11297,6 +11446,8 @@
1129811447 Контактирајте администратора Медијавикија.',
1129911448 'coll-license' => 'Лиценца',
1130011449 'coll-return_to' => 'Назад на [[:$1]]',
 11450+ 'coll-more_info' => 'Прикажи више података',
 11451+ 'coll-hide_info' => 'Сакриј податке',
1130111452 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/подаци о наручивању на Педијапресу',
1130211453 'coll-suggest_title' => 'Предложене странице за вашу књигу',
1130311454 'coll-suggest_intro_text' => 'Предлози су засновани на текућем скупу страница у вашој књизи.
——@@ -11441,6 +11592,8 @@
1144211593 Molim kontaktirajte svog MedijaViki administratora.',
1144311594 'coll-license' => 'Licenca',
1144411595 'coll-return_to' => 'Vrati na [[:$1]]',
 11596+ 'coll-more_info' => 'Pokaži više informacija',
 11597+ 'coll-hide_info' => 'Skloni informacije',
1144511598 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/podaci o naručivanju na Pedijapresu',
1144611599 'coll-suggest_title' => 'Strane predložene za vašu knjigu',
1144711600 'coll-suggest_intro_text' => 'Predlozi su zasnovani na tekućem skupu stranica u vašoj knjizi.
——@@ -11552,6 +11705,8 @@
1155311706 Kontaktier dän MediaWiki-Administrator.',
1155411707 'coll-license' => 'Lizenz',
1155511708 'coll-return_to' => 'Tourääch tou [[:$1]]',
 11709+ 'coll-more_info' => 'Wiedere Informatione wiese',
 11710+ 'coll-hide_info' => 'Informatione fersteete',
1155611711 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress Bestaalinformation',
1155711712 'coll-suggest_title' => 'Foarsloaine Sieden foar dien Bouk',
1155811713 'coll-suggested_articles' => 'Foarsleeke',
——@@ -11708,6 +11863,8 @@
1170911864 Var god kontakta din MediaWiki-administratör.',
1171011865 'coll-license' => 'Licens',
1171111866 'coll-return_to' => 'Tillbaka till [[:$1]]',
 11867+ 'coll-more_info' => 'Visa mer information',
 11868+ 'coll-hide_info' => 'Göm information',
1171211869 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Beställningsinformation PediaPress',
1171311870 'coll-suggest_title' => 'Föreslagna sidor för din bok',
1171411871 'coll-suggest_intro_text' => 'Förslag baseras på nuvarande wikisidor i din bok.
——@@ -11755,6 +11912,8 @@
1175611913 'coll-rendering_page' => '(ukurasa: $1)',
1175711914 'coll-download_notfound_title' => 'Faili halikupatikana',
1175811915 'coll-about_pp' => 'Kuhusu $1',
 11916+ 'coll-more_info' => 'Onyesha taarifa zaidi',
 11917+ 'coll-hide_info' => 'Ficha taarifa',
1175911918 'coll-suggested_articles' => 'Mapendekezo',
1176011919 'coll-suggest_your_book' => 'Kitabu chako',
1176111920 'coll-suggest_show' => 'fichua',
——@@ -11853,6 +12012,8 @@
1185412013 'coll-download_failed_text' => 'கோப்பை தகவலிறக்கம் செய்யும் போது பிழை ஏற்பட்டுள்ளது:$1',
1185512014 'coll-about_pp' => '$1 பற்றி',
1185612015 'coll-license' => 'அனுமதி',
 12016+ 'coll-more_info' => 'மேலும் தகவல்களை காண்பி',
 12017+ 'coll-hide_info' => 'தகவலை மறை',
1185712018 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}} / PediaPress உத்தரவு தகவல்',
1185812019 'coll-suggest_title' => 'உங்கள் புத்தகத்திற்காக பரிந்துரைக்கப்பட்ட பக்கங்கள்',
1185912020 'coll-suggested_articles' => 'பரிந்துரைகள்',
——@@ -11983,6 +12144,8 @@
1198412145 'coll-invalid_podpartner_title' => 'సరైన POD భాగస్వామి కాదు',
1198512146 'coll-license' => 'లైసెన్సు',
1198612147 'coll-return_to' => 'తిరిగి [[:$1]]కి',
 12148+ 'coll-more_info' => 'మరింత సమాచారాన్ని చూపించు',
 12149+ 'coll-hide_info' => 'సమాచారాన్ని దాచు',
1198712150 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/పీడియాప్రెస్ ఆర్డరు సమాచారం',
1198812151 'coll-suggest_title' => 'మీ పుస్తకానికై సూచించబడిన పేజీలు',
1198912152 'coll-suggested_articles' => 'సలహాలు',
——@@ -12272,6 +12435,8 @@
1227312436 กรุณาติดต่อผู้ดูแลมีเดียวิกิของคุณ',
1227412437 'coll-license' => 'สัญญาอนุญาต (license)',
1227512438 'coll-return_to' => 'กลับไปที่ [[:$1]]',
 12439+ 'coll-more_info' => 'แสดงข้อมูลเพิ่มเติม',
 12440+ 'coll-hide_info' => 'ซ่อนข้อมูลเพิ่มเติม',
1227612441 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/ข้อมูลการสั่งซื้อ PediaPress',
1227712442 'coll-suggest_title' => 'หน้าแนะนำสำหรับหนังสือของคุณ',
1227812443 'coll-suggest_intro_text' => 'คำแนะนำทั้งหมดนั้นอ้างอิงจากชุดของหน้าวิกิในหนังสือของคุณ
——@@ -12407,6 +12572,8 @@
1240812573 MediaWiki administratoryňyz bilen habarlaşyň.',
1240912574 'coll-license' => 'Lisenziýa',
1241012575 'coll-return_to' => '[[:$1]] sahypasyna gaýdyp bar',
 12576+ 'coll-more_info' => 'Has köp maglumat görkez',
 12577+ 'coll-hide_info' => 'Maglumaty gizle',
1241112578 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress buýurma maglumaty',
1241212579 'coll-suggest_title' => 'Kitabyňyz üçin teklip edilýän sahypalar',
1241312580 'coll-suggest_intro_text' => 'Teklipler häzirki wagtda kitabyňyzda bar bolan wiki sahypalaryna esaslanýar.
——@@ -12547,6 +12714,8 @@
1254812715 Makipagugnayan sa iyong tagapangasiwa ng MediaWiki.',
1254912716 'coll-license' => 'Pahintulot (lisensya)',
1255012717 'coll-return_to' => 'Bumalik sa [[:$1]]',
 12718+ 'coll-more_info' => 'Magpakita ng mas marami pang kabatiran',
 12719+ 'coll-hide_info' => 'Ikubli ang kabatiran',
1255112720 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PalimbagangPedya kabatiran ng hinihiling',
1255212721 'coll-suggest_title' => 'Minumungkahing mga pahina para sa aklat mo',
1255312722 'coll-suggest_intro_text' => 'Nakabatay ang mga mungkahi sa pangkasalukuyang pangkat ng mga pahinang pangwiki na nasa loob ng aklat mo.
——@@ -12692,6 +12861,8 @@
1269312862 Lütfen MedyaViki yöneticinizle irtibat kurun.',
1269412863 'coll-license' => 'Lisans',
1269512864 'coll-return_to' => '[[:$1]] sayfasına geri dön',
 12865+ 'coll-more_info' => 'Daha fazla bilgi göster',
 12866+ 'coll-hide_info' => 'Bilgiyi gizle',
1269612867 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress sipariş bilgisi',
1269712868 'coll-suggest_title' => 'Kitabınız için önerilen sayfalar',
1269812869 'coll-suggest_intro_text' => 'Öneriler şu anda kitabınızda bulunan viki sayfalarına dayalıdır.
——@@ -12894,6 +13065,8 @@
1289513066 Будь-ласка, зв'яжіться з вашим адміністратором MediaWiki.",
1289613067 'coll-license' => 'Ліцензія',
1289713068 'coll-return_to' => 'Повернення до [[:$1]]',
 13069+ 'coll-more_info' => 'Показати більше інформації',
 13070+ 'coll-hide_info' => 'Приховати інформацію',
1289813071 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Інформація про замовлення PediaPress',
1289913072 'coll-suggest_title' => 'Пропоновані сторінки для вашої книги',
1290013073 'coll-suggest_intro_text' => 'Пропозиції формуються з поточного набору вікі-сторінок у вашій книзі.
——@@ -13038,6 +13211,8 @@
1303913212 'coll-invalid_podpartner_msg' => "El socio POD fornìo no'l xe mia valido. Contata el to aministrador MediaWiki.",
1304013213 'coll-license' => 'Licensa',
1304113214 'coll-return_to' => 'Torna indrìo a [[:$1]]',
 13215+ 'coll-more_info' => 'Mostra piasè informasion',
 13216+ 'coll-hide_info' => 'Scondi informasion',
1304213217 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/Informassion par ordinar con PediaPress',
1304313218 'coll-suggest_title' => 'Pagine sugerìe par el to libro',
1304413219 'coll-suggest_intro_text' => 'I sugerimenti i se basa su l\'insieme de pagine wiki che xe xà nel to libro.
——@@ -13217,6 +13392,8 @@
1321813393 Xin hãy liên hệ với quản trị viên MediaWiki của bạn.',
1321913394 'coll-license' => 'Giấy phép',
1322013395 'coll-return_to' => 'Quay lại [[:$1]]',
 13396+ 'coll-more_info' => 'Xem thêm thông tin',
 13397+ 'coll-hide_info' => 'Ẩn thông tin',
1322113398 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress',
1322213399 'coll-suggest_title' => 'Các trang đề nghị cho cuốn sách của bạn',
1322313400 'coll-suggest_intro_text' => 'Những đề nghị dựa trên tập trang wiki hiện tại trong cuốn sách.
——@@ -13603,6 +13780,8 @@
1360413781 请联系你的MediaWiki管理员。',
1360513782 'coll-license' => '授权协议',
1360613783 'coll-return_to' => '返回到[[:$1]]',
 13784+ 'coll-more_info' => '显示更多信息',
 13785+ 'coll-hide_info' => '隐藏信息',
1360713786 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress订购信息',
1360813787 'coll-suggest_title' => '你的图书的建议页面',
1360913788 'coll-suggest_intro_text' => '建议列表基于你的图书中现有的wiki页面。
——@@ -13749,6 +13928,8 @@
1375013929 'coll-invalid_podpartner_msg' => '提供的合作伙伴不正確，請聯絡您的MediaWiki管理員。',
1375113930 'coll-license' => '許可協議',
1375213931 'coll-return_to' => '回到[[:$1]]',
 13932+ 'coll-more_info' => '顯示更多資訊',
 13933+ 'coll-hide_info' => '隱藏訊息',
1375313934 'coll-order_info_article' => '{{MediaWiki:Coll-helppage}}/PediaPress 的訂購資訊',
1375413935 'coll-suggest_title' => '您圖書的建議頁面',
1375513936 'coll-suggest_intro_text' => '建議基於最近您圖書頁面的設置。',
Index: trunk/extensions/Collection/Collection.php
——@@ -33,7 +33,7 @@
3434 $dir = dirname( __FILE__ ) . '/';
3535
3636 # Extension version
37 -$wgCollectionVersion = "1.6";
 37+$wgCollectionVersion = "1.5";
3838
3939 # ==============================================================================
4040
——@@ -102,8 +102,8 @@
103103 /** For formats which rendering depends on an external server
104104 */
105105 $wgCollectionFormatToServeURL = array(
106 - 'zeno' => 'http://www.okawix.com/collections/render.php',
107 - 'okawix_zeno' => 'http://www.okawix.com/collections/render.php',
 106+ 'zeno'=>'http://www.okawix.com/collections/render.php',
 107+ 'okawix_zeno'=>'http://www.okawix.com/collections/render.php',
108108 );
109109
110110 $wgCollectionContentTypeToFilename = array(
——@@ -121,21 +121,13 @@
122122
123123 $wgCollectionSuggestThreshhold = 100;
124124
125 -$wgCollectionPODPartners = array(
126 - 'pediapress' => array(
127 - 'name' => 'PediaPress',
128 - 'url' => 'http://pediapress.com/',
129 - 'posturl' => 'http://pediapress.com/api/collections/',
130 - 'infopagetitle' => 'coll-order_info_article',
131 - ),
132 -);
133125 # ==============================================================================
134126
135127 $wgExtensionCredits['specialpage'][] = array(
136128 'path' => __FILE__,
137129 'name' => 'Collection',
138130 'version' => $wgCollectionVersion,
139 - 'author' => array( 'PediaPress GmbH', 'Siebrand Mazeland', 'Marcin Cieślak'),
 131+ 'author' => array( 'PediaPress GmbH', 'Siebrand Mazeland' ),
140132 'url' => 'https://www.mediawiki.org/wiki/Extension:Collection',
141133 'descriptionmsg' => 'coll-desc',
142134 );
——@@ -370,8 +362,10 @@
371363 $wgAjaxExportList[] = 'wfAjaxCollectionClear';
372364
373365 function wfAjaxCollectionGetPopupData( $title ) {
 366+ global $wgScriptPath;
 367+
374368 $result = array();
375 - $imagePath = SpecialCollection::getMediaPath();
 369+ $imagePath = "$wgScriptPath/extensions/Collection/images";
376370 $t = Title::newFromText( $title );
377371 if ( $t && $t->isRedirect() ) {
378372 $a = new Article( $t, 0 );
Index: trunk/extensions/Collection/Collection.suggest.php
——@@ -83,7 +83,7 @@
8484 * @param $param (type string) name of the article to be added, banned or removed
8585 * or a number of articles to add or a value (1 - 1.5) all articles with a
8686 * higher value will be added to the collection
87 - * @return string html-code for the proposallist and the memberlist
 87+ * @return (type string) html-code for the proposallist and the memberlist
8888 */
8989 public static function refresh( $mode, $param ) {
9090 global $wgLang;
——@@ -96,11 +96,6 @@
9797 );
9898 }
9999
100 - /**
101 - * @param $lastAction
102 - * @param $article
103 - * @return array
104 - */
105100 public static function undo( $lastAction, $article ) {
106101 switch ( $lastAction ) {
107102 case 'add':
——@@ -135,14 +130,8 @@
136131 * ===============================================================================
137132 */
138133
139 - /**
140 - * @param $article
141 - * @return mixed
142 - */
143134 private static function unban( $article ) {
144 - if ( !isset( $_SESSION['wsCollectionSuggestBan'] ) ) {
145 - return;
146 - }
 135+ if (!isset($_SESSION['wsCollectionSuggestBan'])) return;
147136 $bans = $_SESSION['wsCollectionSuggestBan'];
148137 $newbans = array();
149138 foreach ( $bans as $ban ) {
——@@ -166,7 +155,7 @@
167156 * @param $param (type string) name of the article to be added, banned or removed
168157 * or a number of articles to add or a value (1 - 1.5) all articles with a
169158 * higher value will be added to the collection
170 - * @return CollectionSuggestTemplate the template for the wikipage
 159+ * @return the template for the wikipage
171160 */
172161 private static function getCollectionSuggestTemplate( $mode, $param ) {
173162 global $wgCollectionMaxSuggestions;
——@@ -215,8 +204,8 @@
216205 /**
217206 * Add some articles and update the book of the Proposal-Object
218207 *
219 - * @param $articleList array with the names of the articles to be added
220 - * @param $prop Proposals the proposal-Object
 208+ * @param $articleList an array with the names of the articles to be added
 209+ * @param $prop the proposal-Object
221210 */
222211 private static function addArticlesFromName( $articleList, $prop ) {
223212 foreach ( $articleList as $article ) {
——@@ -264,33 +253,28 @@
265254 * constructor
266255 * ==================================================
267256 *
268 - * @param $coll array the collection
269 - * @param $ban array the list of the banned articles
270 - * @param $props array the lilst of the proposals
 257+ * @param $coll the collection
 258+ * @param $ban the list of the banned articles
 259+ * @param $props the lilst of the proposals
271260 */
272 - public function __construct( $coll, $ban, $props ) {
 261+ public function Proposals( $coll, $ban, $props ) {
273262 $this->mPropList = array();
274263 $this->mColl = $coll;
275264 $this->mBanList = $ban;
276265 $this->mLinkList = $props;
277266 }
278267
 268+
279269 /**
280270 * ==================================================
281271 * public methods
282272 * ==================================================
283273 */
284274
285 - /**
286 - * @return array
287 - */
288275 public function getLinkList() {
289276 return $this->mLinkList;
290277 }
291278
292 - /**
293 - * @param $collection
294 - */
295279 public function setCollection( $collection ) {
296280 $this->mColl = $collection;
297281 }
——@@ -305,7 +289,7 @@
306290 * @param $doUpdate (type boolean) when true, $linkList will
307291 * updated before calculating the proposals
308292 * default is true
309 - * @return array a 2-dimensional array that contains the proposals
 293+ * @return a 2-dimensional array that contains the proposals
310294 * the first dimesion is numeric, the second contains
311295 * 3 entries:
312296 * - 'name': the name of a proposed article
——@@ -328,9 +312,6 @@
329313 }
330314 }
331315
332 - /**
333 - * @return bool
334 - */
335316 public function hasBans() {
336317 return count( $this->mBanList ) > 0;
337318 }
——@@ -387,10 +368,6 @@
388369 $this->mLinkList = $newList;
389370 }
390371
391 - /**
392 - * @param $title Title
393 - * @return Title
394 - */
395372 private function resolveRedirects( $title ) {
396373 if ( !$title->isRedirect() ) {
397374 return $title;
——@@ -407,9 +384,8 @@
408385 /**
409386 * Extract & count links from wikitext
410387 *
411 - * @param $num_articles int
412 - * @param $wikitext string article text
413 - * @return array with links and their weights
 388+ * @param wikitext: article text
 389+ * @return an array with links and their weights
414390 */
415391 private function getWeightedLinks( $num_articles, $wikitext ) {
416392 global $wgCollectionSuggestCheapWeightThreshhold;
——@@ -517,9 +493,7 @@
518494 }
519495 }
520496
521 - /**
522 - * Calculate the $mPropList from $mLinkList and $mBanList
523 - */
 497+ // Calculate the $mPropList from $mLinkList and $mBanList
524498 private function getPropList() {
525499 $prop = array();
526500 foreach ( $this->mLinkList as $article ) {
——@@ -557,9 +531,9 @@
558532 * if the array doesn't contain the article
559533 *
560534 * @param $entry (type string) an articlename
561 - * @param $array array to be searched, it has to 2-dimensional
 535+ * @param $array the array to be searched, it has to 2-dimensional
562536 * the 2nd dimension needs the key 'name'
563 - * @return bool|int the key as integer or false
 537+ * @return the key as integer or false
564538 */
565539 private function searchEntry( $entry, $array ) {
566540 for ( $i = 0; $i < count( $array ); $i++ ) {
——@@ -573,8 +547,8 @@
574548 /**
575549 * Check if an article is banned or belongs to the book/collection
576550 *
577 - * @param $link string an articlename
578 - * @return boolean true: if the article can be added to the proposals
 551+ * @param $link (type string) an articlename
 552+ * @return (type boolean) true: if the article can be added to the proposals
579553 * false: if the article can't be added to the proposals
580554 */
581555 private function checkLink( $link ) {
——@@ -591,9 +565,6 @@
592566 return true;
593567 }
594568
595 - /**
596 - * @return int
597 - */
598569 private function getPropCount() {
599570 return count( $this->mPropList );
600571 }
Index: trunk/extensions/Collection/Collection.hooks.php
——@@ -74,7 +74,7 @@
7575 $title = $sk->getTitle();
7676
7777 if ( is_null( $title ) || !$title->exists() ) {
78 - return false;
 78+ return;
7979 }
8080
8181 $namespace = $title->getNamespace();
——@@ -155,9 +155,9 @@
156156 global $wgOut;
157157 if ( !$wgOut->isPrintable() ) {
158158 $attribs = array(
159 - 'href' => $title->getLocalUrl( $wgRequest->appendQueryValue( 'printable', 'yes', true ) ),
160 - 'title' => Linker::titleAttrib( 't-print', 'withaccess' ),
161 - 'accesskey' => Linker::accesskey( 't-print' ),
 159+ 'href' => $sk->getTitle()->getLocalUrl( $wgRequest->appendQueryValue( 'printable', 'yes', true ) ),
 160+ 'title' => $sk->titleAttrib( 't-print', 'withaccess' ),
 161+ 'accesskey' => $sk->accesskey( 't-print' ),
162162 );
163163 if ( $attribs['title'] === false ) {
164164 unset( $attribs['title'] );
——@@ -178,9 +178,6 @@
179179
180180 /**
181181 * Callback for hook SiteNoticeAfter
182 - * @param $siteNotice
183 - * @param $skin Skin
184 - * @return bool
185182 */
186183 static function siteNoticeAfter( &$siteNotice, $skin = null ) {
187184 global $wgCollectionArticleNamespaces;
——@@ -230,15 +227,17 @@
231228
232229 /**
233230 * @param $title Title
 231+ * @param $skin Skin
234232 * @param $mode string
235233 * @return string
236234 */
237235 static function renderBookCreatorBox( $title, $mode = '' ) {
238236 global $wgCollectionStyleVersion;
239237 global $wgOut;
 238+ global $wgScriptPath;
240239 global $wgRequest;
241240
242 - $imagePath = SpecialCollection::getMediaPath();
 241+ $imagePath = "$wgScriptPath/extensions/Collection/images";
243242 $ptext = $title->getPrefixedText();
244243 $oldid = $wgRequest->getVal( 'oldid', 0 );
245244 if ( $oldid == $title->getLatestRevID() ) {
——@@ -318,21 +317,18 @@
319318 return $html;
320319 }
321320
322 - /**
323 - * @param $title
324 - * @param $ajaxHint null
325 - * @param $oldid null|int
326 - * @return string
327 - */
328321 static function getBookCreatorBoxContent( $title, $ajaxHint = null, $oldid = null ) {
329 - $imagePath = SpecialCollection::getMediaPath();
 322+ global $wgScriptPath;
330323
 324+ $imagePath = "$wgScriptPath/extensions/Collection/images";
 325+
331326 return self::getBookCreatorBoxAddRemoveLink( $imagePath, $ajaxHint, $title, $oldid )
332327 . self::getBookCreatorBoxShowBookLink( $imagePath, $ajaxHint )
333328 . self::getBookCreatorBoxSuggestLink( $imagePath, $ajaxHint );
334329 }
335330
336331 /**
 332+ * @param $sk Skin
337333 * @param $imagePath
338334 * @param $ajaxHint
339335 * @param $title Title
——@@ -410,11 +406,6 @@
411407
412408 }
413409
414 - /**
415 - * @param $imagePath
416 - * @param $ajaxHint
417 - * @return string
418 - */
419410 static function getBookCreatorBoxShowBookLink( $imagePath, $ajaxHint ) {
420411 $numArticles = CollectionSession::countArticles();
421412
——@@ -458,11 +449,6 @@
459450 }
460451 }
461452
462 - /**
463 - * @param $imagePath
464 - * @param $ajaxHint
465 - * @return string
466 - */
467453 static function getBookCreatorBoxSuggestLink( $imagePath, $ajaxHint ) {
468454 if ( wfMsg( 'coll-suggest_enabled' ) != '1' ) {
469455 return '';
——@@ -509,10 +495,8 @@
510496 }
511497
512498 /**
513 - * OutputPageCheckLastModified hook
514 - * @param $modifiedTimes array
515 - * @return bool
516 - */
 499+ * OutputPageCheckLastModified hook
 500+ */
517501 static function checkLastModified( $modifiedTimes ) {
518502 if ( CollectionSession::hasSession() ) {
519503 $modifiedTimes['collection'] = $_SESSION['wsCollection']['timestamp'];
——@@ -522,8 +506,6 @@
523507
524508 /**
525509 * ResourceLoaderGetConfigVars hook
526 - * @param $vars array
527 - * @return bool
528510 */
529511 static function resourceLoaderGetConfigVars( &$vars ) {
530512 $vars['wgCollectionVersion'] = $GLOBALS['wgCollectionVersion'];
Index: trunk/extensions/Collection/Collection.session.php
——@@ -22,14 +22,8 @@
2323 */
2424
2525 class CollectionSession {
26 -
27 - /**
28 - * @return bool
29 - */
3026 static function hasSession() {
31 - if ( !session_id() ) {
32 - return false;
33 - }
 27+ if ( !session_id() ) return false;
3428 return isset( $_SESSION['wsCollection'] );
3529 }
3630
——@@ -75,16 +69,10 @@
7670 self::touchSession();
7771 }
7872
79 - /**
80 - * @return bool
81 - */
8273 static function isEnabled() {
8374 return ( self::hasSession() && $_SESSION['wsCollection']['enabled'] );
8475 }
8576
86 - /**
87 - * @return int
88 - */
8977 static function countArticles() {
9078 if ( !self::hasSession() ) {
9179 return 0;
——@@ -98,11 +86,6 @@
9987 return $count;
10088 }
10189
102 - /**
103 - * @param $title
104 - * @param $oldid int
105 - * @return int
106 - */
10790 static function findArticle( $title, $oldid = 0 ) {
10891 if ( !self::hasSession() ) {
10992 return - 1;
——@@ -124,9 +107,6 @@
125108 return - 1;
126109 }
127110
128 - /**
129 - * @return bool
130 - */
131111 static function purge() {
132112 if ( !self::hasSession() ) {
133113 return false;
——@@ -159,16 +139,10 @@
160140 return true;
161141 }
162142
163 - /**
164 - * @return array
165 - */
166143 static function getCollection() {
167144 return self::purge() ? $_SESSION['wsCollection'] : array();
168145 }
169146
170 - /**
171 - * @param $collection
172 - */
173147 static function setCollection( $collection ) {
174148 $_SESSION['wsCollection'] = $collection;
175149 self::touchSession();
Index: trunk/extensions/Collection/images/silk-add.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Index: trunk/extensions/Collection/README.txt
——@@ -209,32 +209,6 @@
210210 that each article contains the name of the license and set $wgCollectionLicenseURL
211211 to an article that contains all needed licenses.
212212
213 - *$wgCollectionPODPartners (array)*
214 - Array of parameters needed to define print on demand providers:
215 -
216 - $wgCollectionPODPartners = array(
217 - 'pediapress' => array(
218 - 'name' => 'PediaPress',
219 - 'url' => 'http://pediapress.com/',
220 - 'posturl' => 'http://pediapress.com/api/collections/',
221 - 'infopagetitle' => 'coll-order_info_article',
222 - ),
223 - );
224 -
225 - (This is the default.)
226 -
227 - 'name', 'url' and 'posturl' are mandatory parameters to display
228 - information on the list of available providers.
229 -
230 - If 'infopagetitle' is present, it will be interpreted as the MediaWiki
231 - message that contains the name of the short information on particular
232 - provider. For example, it can be 'coll-order_info_mypress' and
233 - if the message contains "Help:Books/MyPress order information", a contents
234 - of this page will be used. The message itself can be localized for different languages.
235 -
236 - Setting $wgCollectionPODPartners to false disables ordering interface
237 - altogether.
238 -
239213 * If you want to let users save their collections as wiki pages, make sure
240214 $wgEnableWriteAPI is set to true, i.e. put this line in your LocalSettings.php::
241215
——@@ -328,9 +302,7 @@
329303 The default is: '1', i.e. the suggestion tool is enabled.
330304
331305 * Coll-order_info_article: The name of a wiki page which is included on the
332 - Special:Book page to show order information for printed books for the
333 - default service provider, PediaPress. Other providers can have the name
334 - of the information page configured via the $wgCollectionPODPartners array.
 306+ Special:Book page to show order information for printed books.
335307 The default value is: {{MediaWiki:Coll-helppage}}/PediaPress order information
336308 i.e. a subpage of the configured help page named "PediaPress order information".
337309
Index: trunk/extensions/Collection/js/bookcreator.css
——@@ -148,15 +148,9 @@
149149 }
150150
151151 #collection-suggest-add,
 152+#collection-order-button,
152153 #collection-download-button,
153154 #collection-save-button,
154155 #collection-save-input {
155156 float: right;
156157 }
157 -.collection-order-button {
158 - clear: right;
159 -}
160 -
161 -#coll-orderbox ul {
162 - list-style: none;
163 -}
Index: trunk/extensions/Collection/js/collection.js
——@@ -23,7 +23,7 @@
2424
2525 /******************************************************************************/
2626
27 -var requiredVersion = '1.6';
 27+var requiredVersion = '1.5';
2828
2929 /******************************************************************************/
3030
——@@ -54,11 +54,6 @@
5555 var script_url = wgServer +
5656 ((wgScript == null) ? (wgScriptPath + "/index.php") : wgScript);
5757
58 -var media_path = wgScriptPath + '/extensions/Collection/images/';
59 -
60 -var collapseicon = media_path + '/collapse.png';
61 -var expandicon = media_path + '/expand.png';
62 -
6358 var chapter_max_len = 200;
6459
6560 /******************************************************************************/
——@@ -198,6 +193,18 @@
199194 update_buttons();
200195 }
201196
 197+function toggle_order_info(flag) {
 198+ if (flag) {
 199+ $('#coll-more_info').css('display', 'none');
 200+ $('#coll-order_info').css('display', 'block');
 201+ $('#coll-hide_info').css('display', 'block');
 202+ } else {
 203+ $('#coll-more_info').css('display', 'block');
 204+ $('#coll-order_info').css('display', 'none');
 205+ $('#coll-hide_info').css('display', 'none');
 206+ }
 207+}
 208+
202209 $(function() {
203210 if (requiredVersion != wgCollectionVersion) {
204211 alert('ERROR: Version mismatch between Javascript and PHP code. Contact admin to fix the installation of Collection extension for MediaWiki.');
——@@ -209,25 +216,10 @@
210217 window.coll_remove_item = remove_item;
211218 window.coll_rename_chapter = rename_chapter;
212219 window.coll_clear_collection = clear_collection;
 220+ window.coll_toggle_order_info = toggle_order_info;
 221+ toggle_order_info(false);
213222 update_buttons();
214223 make_sortable();
215 - $('#coll-orderbox li.collection-partner.coll-more_info.collapsed').css(
216 - 'list-style' , 'url("' + collapseicon + '")');
217 - $('#coll-orderbox').on('click',
218 - 'li.collection-partner.coll-more_info a.coll-partnerlink', function (e) {
219 - event.preventDefault();
220 - event.stopPropagation();
221 - var p = $(this).parents('li.collection-partner');
222 - if (p.hasClass("collapsed")) {
223 - p.css('list-style', 'url("' + expandicon + '")');
224 - p.find('.coll-order_info').css('display', 'block');
225 - p.removeClass("collapsed");
226 - } else {
227 - p.css('list-style' , 'url("' + collapseicon + '")');
228 - p.find('.coll-order_info').css('display', 'none');
229 - p.addClass("collapsed");
230 - }
231 - });
232224 $('#personalCollTitle').val($('#titleInput').val());
233225 $('#personalCollTitle').keyup(update_buttons);
234226 $('#personalCollTitle').change(update_buttons);
Index: trunk/extensions/Collection/Collection.body.php
——@@ -21,19 +21,17 @@
2222 */
2323
2424 class SpecialCollection extends SpecialPage {
 25+ var $mPODPartners = array(
 26+ 'pediapress' => array(
 27+ 'name' => 'PediaPress',
 28+ 'url' => 'http://pediapress.com/',
 29+ 'posturl' => 'http://pediapress.com/api/collections/',
 30+ ),
 31+ );
2532 var $tempfile;
2633
27 - /**
28 - * @param $PODPartners bool|array
29 - */
30 - public function __construct( $PODPartners = false ) {
 34+ public function __construct() {
3135 parent::__construct( "Book" );
32 - global $wgCollectionPODPartners;
33 - if ( $PODPartners ) {
34 - $this->mPODPartners = $PODPartners;
35 - } else {
36 - $this->mPODPartners = $wgCollectionPODPartners;
37 - }
3836 }
3937
4038 function getDescription() {
——@@ -41,7 +39,7 @@
4240 }
4341
4442 function execute( $par ) {
45 - global $wgOut, $wgRequest, $wgUser, $wgCollectionMaxArticles;
 43+ global $wgOut, $wgRequest, $wgUser, $wgContLang, $wgCollectionMaxArticles;
4644
4745 // support previous URLs (e.g. used in templates) which used the "$par" part
4846 // (i.e. subpages of the Special page)
——@@ -193,8 +191,7 @@
194192 }
195193 $collection = $this->loadCollection( $title );
196194 $partner = $wgRequest->getVal( 'partner', key( $this->mPODPartners ) );
197 - $this->postZIP( $collection, $partner );
198 - return;
 195+ return $this->postZIP( $collection, $partner );
199196 case 'save_collection':
200197 if ( $wgRequest->getVal( 'abort' ) ) {
201198 $wgOut->redirect( SkinTemplate::makeSpecialUrl( 'Book' ) );
——@@ -233,12 +230,11 @@
234231 }
235232 return;
236233 case 'render':
237 - $this->renderCollection(
 234+ return $this->renderCollection(
238235 CollectionSession::getCollection(),
239236 SpecialPage::getTitleFor( 'Book' ),
240237 $wgRequest->getVal( 'writer', '' )
241238 );
242 - return;
243239 case 'forcerender':
244240 $this->forceRenderCollection();
245241 return;
——@@ -301,13 +297,9 @@
302298 default:
303299 $wgOut->showErrorPage( 'coll-unknown_subpage_title', 'coll-unknown_subpage_text' );
304300 }
 301+ return;
305302 }
306303
307 - /**
308 - * @param $referer
309 - * @param $par
310 - * @return mixed
311 - */
312304 function renderBookCreatorPage( $referer, $par ) {
313305 global $wgOut, $wgJsMimeType;
314306
——@@ -389,9 +381,6 @@
390382 $wgOut->addWikiMsg( 'coll-book_creator_help' );
391383 }
392384
393 - /**
394 - * @param $referer
395 - */
396385 function renderStopBookCreatorPage( $referer ) {
397386 global $wgOut;
398387
——@@ -433,9 +422,6 @@
434423 );
435424 }
436425
437 - /**
438 - * @return array
439 - */
440426 static function getBookPagePrefixes() {
441427 global $wgUser, $wgCommunityCollectionNamespace;
442428
——@@ -491,11 +477,6 @@
492478 CollectionSession::setCollection( $collection );
493479 }
494480
495 - /**
496 - * @param $a array
497 - * @param $b array
498 - * @return int
499 - */
500481 static function title_cmp( $a, $b ) {
501482 return strcasecmp( $a['title'], $b['title'] );
502483 }
——@@ -518,9 +499,6 @@
519500 CollectionSession::setCollection( $collection );
520501 }
521502
522 - /**
523 - * @param $name string
524 - */
525503 static function addChapter( $name ) {
526504 $collection = CollectionSession::getCollection();
527505 array_push( $collection['items'], array(
——@@ -530,10 +508,6 @@
531509 CollectionSession::setCollection( $collection );
532510 }
533511
534 - /**
535 - * @param $index int
536 - * @param $name string
537 - */
538512 static function renameChapter( $index, $name ) {
539513 if ( !is_int( $index ) ) {
540514 return;
——@@ -546,12 +520,6 @@
547521 CollectionSession::setCollection( $collection );
548522 }
549523
550 - /**
551 - * @param $namespace int
552 - * @param $name string
553 - * @param int $oldid
554 - * @return bool
555 - */
556524 static function addArticleFromName( $namespace, $name, $oldid = 0 ) {
557525 $title = Title::makeTitleSafe( $namespace, $name );
558526 if ( !$title ) {
——@@ -615,12 +583,6 @@
616584 return true;
617585 }
618586
619 - /**
620 - * @param $namespace string
621 - * @param $name string
622 - * @param $oldid int
623 - * @return bool
624 - */
625587 static function removeArticleFromName( $namespace, $name, $oldid = 0 ) {
626588 $title = Title::makeTitleSafe( $namespace, $name );
627589 return self::removeArticle( $title, $oldid );
——@@ -644,26 +606,18 @@
645607 return true;
646608 }
647609
648 - /**
649 - * @param $name string
650 - * @return bool
651 - */
652610 static function addCategoryFromName( $name ) {
653611 $title = Title::makeTitleSafe( NS_CATEGORY, $name );
654612 return self::addCategory( $title );
655613 }
656614
657 - /**
658 - * @param $title Title
659 - * @return bool
660 - */
661615 static function addCategory( $title ) {
662616 global $wgCollectionMaxArticles, $wgCollectionArticleNamespaces;
663617
664618 $limit = $wgCollectionMaxArticles - CollectionSession::countArticles();
665619 if ( $limit <= 0 ) {
666620 self::limitExceeded();
667 - return false;
 621+ return;
668622 }
669623 $db = wfGetDB( DB_SLAVE );
670624 $tables = array( 'page', 'categorylinks' );
——@@ -716,11 +670,6 @@
717671 return true;
718672 }
719673
720 - /**
721 - * @param $index
722 - * @param $delta
723 - * @return bool
724 - */
725674 static function moveItem( $index, $delta ) {
726675 if ( !CollectionSession::hasSession() ) {
727676 return false;
——@@ -733,9 +682,6 @@
734683 return true;
735684 }
736685
737 - /**
738 - * @param $items array
739 - */
740686 static function setSorting( $items ) {
741687 if ( !CollectionSession::hasSession() ) {
742688 return;
——@@ -750,12 +696,6 @@
751697 CollectionSession::setCollection( $collection );
752698 }
753699
754 - /**
755 - * @param $collection
756 - * @param $line
757 - * @param $append
758 - * @return array|null
759 - */
760700 function parseCollectionLine( &$collection, $line, $append ) {
761701 $line = trim( $line );
762702 if ( !$append && preg_match( '/^===\s*(.*?)\s*===$/', $line, $match ) ) {
——@@ -837,7 +777,7 @@
838778
839779 if ( is_null( $title ) ) {
840780 $wgOut->showErrorPage( 'coll-notitle_title', 'coll-notitle_msg' );
841 - return null;
 781+ return;
842782 }
843783
844784 if ( !$title->exists() ) {
——@@ -895,14 +835,14 @@
896836 } elseif ( $item['type'] == 'article' ) {
897837 if ( $item['currentVersion'] == 1 ) {
898838 $articleText .= ":[[" . $item['title'];
899 - if ( isset( $item['displaytitle'] ) && $item['displaytitle'] ) {
 839+ if ( $item['displaytitle'] ) {
900840 $articleText .= "|" . $item['displaytitle'];
901841 }
902842 $articleText .= "]]\n";
903843 } else {
904844 $articleText .= ":[{{fullurl:" . $item['title'];
905845 $articleText .= "|oldid=" . $item['revision'] . "}} ";
906 - if ( isset( $item['displaytitle'] ) && $item['displaytitle'] ) {
 846+ if ( $item['displaytitle'] ) {
907847 $articleText .= $item['displaytitle'];
908848 } else {
909849 $articleText .= $item['title'];
——@@ -934,9 +874,6 @@
935875 return true;
936876 }
937877
938 - /**
939 - * @return array
940 - */
941878 function getLicenseInfos() {
942879 global $wgCollectionLicenseName, $wgCollectionLicenseURL, $wgRightsIcon;
943880 global $wgRightsPage, $wgRightsText, $wgRightsUrl;
——@@ -969,10 +906,6 @@
970907 return array( $licenseInfo );
971908 }
972909
973 - /**
974 - * @param $collection array
975 - * @return string
976 - */
977910 function buildJSONCollection( $collection ) {
978911 $result = array(
979912 'type' => 'collection',
——@@ -1012,11 +945,6 @@
1013946 return $json->encode( $result );
1014947 }
1015948
1016 - /**
1017 - * @param $collection
1018 - * @param $referrer Title
1019 - * @param $writer
1020 - */
1021949 function renderCollection( $collection, $referrer, $writer ) {
1022950 global $wgOut, $wgContLang, $wgScriptPath, $wgScriptExtension;
1023951
——@@ -1105,6 +1033,7 @@
11061034
11071035 switch ( $response['state'] ) {
11081036 case 'progress':
 1037+ $url = htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book', 'bookcmd=rendering&' . $query ) );
11091038 $wgOut->addHeadItem( 'refresh-nojs', '<noscript><meta http-equiv="refresh" content="2" /></noscript>' );
11101039 $wgOut->addInlineScript( 'var collection_id = "' . urlencode( $response['collection_id'] ) . '";' );
11111040 $wgOut->addInlineScript( 'var writer = "' . urlencode( $response['writer'] ) . '";' );
——@@ -1196,11 +1125,6 @@
11971126 $wgOut->disable();
11981127 }
11991128
1200 - /**
1201 - * @param $res
1202 - * @param $content
1203 - * @return int
1204 - */
12051129 function writeToTempFile( $res, $content ) {
12061130 return fwrite( $this->tempfile, $content );
12071131 }
——@@ -1235,10 +1159,6 @@
12361160 $this->renderCollection( array( 'items' => array( $article ) ), $title, $writer );
12371161 }
12381162
1239 - /**
1240 - * @param $collection
1241 - * @param $partner
1242 - */
12431163 function postZIP( $collection, $partner ) {
12441164 global $wgScriptPath, $wgScriptExtension, $wgOut;
12451165
——@@ -1263,12 +1183,6 @@
12641184 $wgOut->redirect( $response['redirect_url'] );
12651185 }
12661186
1267 - /**
1268 - * @param $colltype
1269 - * @param $title
1270 - * @param $pcollname
1271 - * @param $ccollname
1272 - */
12731187 private function renderSaveOverwritePage( $colltype, $title, $pcollname, $ccollname ) {
12741188 global $wgOut;
12751189
——@@ -1283,9 +1197,6 @@
12841198 $wgOut->addTemplate( $template );
12851199 }
12861200
1287 - /**
1288 - * @param $title
1289 - */
12901201 private function renderLoadOverwritePage( $title ) {
12911202 global $wgOut;
12921203
——@@ -1297,20 +1208,12 @@
12981209 $wgOut->addTemplate( $template );
12991210 }
13001211
1301 - /**
1302 - * @param $command
1303 - * @param $args
1304 - * @return bool|array
1305 - */
13061212 static function mwServeCommand( $command, $args ) {
13071213 global $wgOut, $wgCollectionMWServeURL, $wgCollectionMWServeCredentials, $wgCollectionFormatToServeURL;
13081214
13091215 $serveURL = $wgCollectionMWServeURL;
1310 - if ( isset ( $args['writer'] ) ) {
1311 - if ( array_key_exists( $args['writer'], $wgCollectionFormatToServeURL ) ) {
1312 - $serveURL = $wgCollectionFormatToServeURL[ $args['writer'] ];
1313 - }
1314 - }
 1216+ if ( array_key_exists( $args['writer'], $wgCollectionFormatToServeURL ) )
 1217+ $serveURL = $wgCollectionFormatToServeURL[ $args['writer'] ];
13151218
13161219 $args['command'] = $command;
13171220 if ( $wgCollectionMWServeCredentials ) {
——@@ -1351,16 +1254,4 @@
13521255 return $json_response;
13531256 }
13541257
1355 - /**
1356 - * @return string URL prefix to images
1357 - */
1358 - static function getMediaPath() {
1359 - if ( isset ( $GLOBALS['wgExtensionAssetsPath'] ) ) {
1360 - return $GLOBALS['wgExtensionAssetsPath'] . '/Collection/images/';
1361 - } else {
1362 - return $GLOBALS['wgScriptPath'] . '/extensions/Collection/images/';
1363 - }
1364 -
1365 - }
1366 -
13671258 }
Index: trunk/extensions/Collection/Collection.templates.php
——@@ -12,7 +12,7 @@
1313 */
1414 class CollectionPageTemplate extends QuickTemplate {
1515 function execute() {
16 - $mediapath = SpecialCollection::getMediaPath();
 16+ $mediapath = $GLOBALS['wgExtensionAssetsPath'] . '/Collection/images/';
1717 ?>
1818
1919 <div class="collection-column collection-column-left">
——@@ -52,52 +52,43 @@
5353 </div>
5454
5555 <div class="collection-column collection-column-right">
56 -<?php if ( $this->data['podpartners'] ) { ?>
 56+
5757 <div class="collection-column-right-box" id="coll-orderbox">
5858 <h2><span class="mw-headline"><?php $this->msg( 'coll-book_title' ) ?></span></h2>
5959 <?php
 60+$partnerData = $this->data['podpartners']['pediapress'];
6061 $this->msgWiki( 'coll-book_text' );
6162 ?>
62 - <ul>
63 -<?php
64 -foreach ( $this->data['podpartners'] as $partnerKey => $partnerData ) {
65 - $infopage = false;
66 - $partnerClasses = "";
67 - $about_partner = wfMsgHtml( 'coll-about_pp', htmlspecialchars( $partnerData['name'] ) );
68 - if ( isset( $partnerData['infopagetitle'] ) ) {
69 - $infopage = Title::newFromText( wfMsgForContent( $partnerData['infopagetitle'] ) );
70 - if ( $infopage && $infopage->exists() ) {
71 - $partnerClasses = " coll-more_info collapsed";
72 - }
73 - }
74 -?>
75 - <li class="collection-partner<?php echo $partnerClasses ?>">
7663 <div>
77 - <div><a class="coll-partnerlink" href="<?php echo htmlspecialchars( $partnerData['url'] ) ?>"><?php echo $about_partner; ?></a></div>
78 -<?php
79 - if ( $infopage && $infopage->exists() ) { ?>
80 - <div class="coll-order_info" style="display:none;">
81 -<?php
82 - echo $GLOBALS['wgOut']->parse( '{{:' . $infopage . '}}' );
83 -?>
84 - </div>
85 -<?php } ?>
86 - <div class="collection-order-button">
 64+ <div id="collection-order-button">
8765 <form action="<?php echo htmlspecialchars( SkinTemplate::makeSpecialUrl( 'Book' ) ) ?>" method="post">
8866 <input type="hidden" name="bookcmd" value="post_zip" />
89 - <input type="hidden" name="partner" value="<?php echo htmlspecialchars( $partnerKey ) ?>" />
 67+ <input type="hidden" name="partner" value="pediapress" />
9068 <input type="submit" value="<?php echo wfMsgHtml( 'coll-order_from_pp', htmlspecialchars( $partnerData['name'] ) ) ?>" class="order" <?php if ( count( $this->data['collection']['items'] ) == 0 ) { ?> disabled="disabled"<?php } ?> />
9169 </form>
9270 </div>
 71+ <?php
 72+$t = Title::newFromText( wfMsgForContent( 'coll-order_info_article' ) );
 73+if ( $t && $t->exists() ) { ?>
 74+ <div id="coll-more_info" style="display:none">
 75+ <a href="javascript:void(0)" onclick="coll_toggle_order_info(true);"><img src="<?php echo htmlspecialchars( $mediapath . "collapse.png" ) ?>" width="10" height="10" alt="" />&#160;<?php $this->msg( 'coll-more_info' ) ?></a>
 76+ </div>
 77+ <div id="coll-hide_info" style="display:none">
 78+ <a href="javascript:void(0)" onclick="coll_toggle_order_info(false);"><img src="<?php echo htmlspecialchars( $mediapath . "expand.png" ) ?>" width="10" height="10" alt="" />&#160;<?php $this->msg( 'coll-hide_info' ) ?></a>
 79+ </div>
 80+<?php } else { ?>
 81+ <a href="<?php echo htmlspecialchars( $partnerData['url'] ) ?>" target="_blank"><?php echo wfMsgHtml( 'coll-about_pp', htmlspecialchars( $partnerData['name'] ) ) ?></a>
 82+<?php } ?>
9383 </div>
94 - </li>
9584 <?php
96 -} /* foreach */
 85+if ( $t && $t->exists() ) { ?>
 86+ <div id="coll-order_info" style="display:none; margin-top: 2em;">
 87+<?php
 88+echo $GLOBALS['wgOut']->parse( '{{:' . $t . '}}' );
9789 ?>
98 - </ul></div>
99 -<?php
100 -} /* if */
101 -?>
 90+ </div>
 91+<?php } ?>
 92+ </div>
10293
10394 <div class="collection-column-right-box" id="coll-downloadbox">
10495 <h2><span class="mw-headline"><?php $this->msg( 'coll-download_title' ) ?></span></h2>
——@@ -202,7 +193,7 @@
203194 */
204195 class CollectionListTemplate extends QuickTemplate {
205196 function execute() {
206 - $mediapath = SpecialCollection::getMediaPath();
 197+ $mediapath = $GLOBALS['wgScriptPath'] . '/extensions/Collection/images/';
207198 ?>
208199
209200 <div class="collection-create-chapter-links">
——@@ -453,9 +444,9 @@
454445
455446 // needed for Ajax functions
456447 function getProposalList () {
457 - global $wgScript;
 448+ global $wgScript, $wgScriptPath;
458449
459 - $mediapath = SpecialCollection::getMediaPath();
 450+ $mediapath = $wgScriptPath . '/extensions/Collection/images/';
460451 $baseUrl = $wgScript . "/";
461452
462453 $prop = $this->data['proposals'];
——@@ -492,7 +483,7 @@
493484
494485 // needed for Ajax functions
495486 function getMemberList() {
496 - $mediapath = SpecialCollection::getMediaPath();
 487+ $mediapath = $GLOBALS['wgScriptPath'] . '/extensions/Collection/images/';
497488 $coll = $this->data['collection'];
498489 $out = '';
499490

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r113740(bug 33536) Make a list of print on demand publishers configurable for Extens...saper18:15, 13 March 2012
r113785Followup-To: r113740 $wgScriptPath/extensions/ => $wgExtensionAssetsPath...saper23:20, 13 March 2012
r113985Followup r113740...reedy01:07, 16 March 2012
r113986Documentation stuffsreedy01:26, 16 March 2012
r113988Reports of undefined index notices related to display title...reedy01:27, 16 March 2012
r113991So apparently Collection still had a PHP4 constructor...reedy01:42, 16 March 2012
r114012Partial revert r113986...reedy14:39, 16 March 2012
r114022Collection doc comment updates: remove "@return mixed" from two functions tha...brion16:22, 16 March 2012
r114142Fix many more occured typosreedy14:54, 19 March 2012
r114259[Collection extension] whitespacekrinkle13:14, 20 March 2012

Status & tagging log