Index: trunk/extensions/News/News.i18n.php |
— | — | @@ -6,21 +6,7 @@ |
7 | 7 | $messages = array(); |
8 | 8 | |
9 | 9 | $messages['en'] = array( |
10 | | - 'newsextension-desc' => 'Shows customized recent changes on a wiki pages or as RSS or Atom feed', |
11 | | - 'newsextension-unknownformat' => '$1: unknown feed format: $2<br />', |
12 | | - 'newsextension-feednotfound' => '$1: feed page not found: $2<br />', |
13 | | - 'newsextension-feedrequest' => '$1: handling feed request for $2<br />', |
14 | | - 'newsextension-checkok' => '$1: HTTP cache ok, 304 header sent<br />', |
15 | | - 'newsextension-checkok1' => '$1: checking cache-ok: IMS $2 vs. changed $3<br />', |
16 | | - 'newsextension-gotcached' => '$1: ($2? "got cached": "no cached")<br />', |
17 | | - 'newsextension-purge' => '$1: purge, ignoring cache<br />', |
18 | | - 'newsextension-loggin' => '$1: logged in, ignoring cache<br />', |
19 | | - 'newsextension-outputting' => '$1: outputting cached copy ($2): $3 < {$4}<br />', |
20 | | - 'newsextension-stale' => '$1: found stale cache copy ($2): $3 >= {$4}<br />', |
21 | | - 'newsextension-nofoundonpage' => '$1: no feed found on page: $2<br / >', |
22 | | - 'newsextension-renderedfeed' => '$1: rendered feed<br />', |
23 | | - 'newsextension-cachingfeed' => '$1: caching feed ($2)<br / >', |
24 | | - 'newsextension-freshfeed' => '$1: outputting fresh feed<br />', |
| 10 | + 'newsextension-desc' => 'Shows customized recent changes on a wiki pages or as RSS or Atom feed', |
25 | 11 | ); |
26 | 12 | |
27 | 13 | /** Message documentation (Message documentation) |
— | — | @@ -35,20 +21,6 @@ |
36 | 22 | */ |
37 | 23 | $messages['ar'] = array( |
38 | 24 | 'newsextension-desc' => 'يعرض أحدث تغييرات معدلة في صفحات الويكي أو كتلقيم آر إس إس أو أتوم.', |
39 | | - 'newsextension-unknownformat' => '$1: صيغة تلقيم غير معروفة : $2<br />', |
40 | | - 'newsextension-feednotfound' => '$1: صفحة التلقيم غير موجودة : $2<br />', |
41 | | - 'newsextension-feedrequest' => '$1: معالجة طلب التلقيم ل $2<br />', |
42 | | - 'newsextension-checkok' => '$1: كاش HTTP على ما يرام، رأس 304 تم إرسالها<br />', |
43 | | - 'newsextension-checkok1' => '$1: جاري التحقق الكاش على ما يرام: IMS $2 vs. $3 التي تم تغييرها<br />', |
44 | | - 'newsextension-gotcached' => '$1: ($2? "حصلت على كاش" : "لا كاش")<br />', |
45 | | - 'newsextension-purge' => '$1: إفراغ الكاش، تجاهل الكاش<br />', |
46 | | - 'newsextension-loggin' => '$1: تم تسجيل الدخول، يتم تجاهل الكاش<br />', |
47 | | - 'newsextension-outputting' => '$1: ينتج نسخة كاش ($2): $3 < {$4}<br />', |
48 | | - 'newsextension-stale' => '$1: تم العثور على نسخة كاش قديمة ($2): $3 >= {$4}<br />', |
49 | | - 'newsextension-nofoundonpage' => '$1: لا تلقيم تم العثور عليه في الصفحة: $2<br / >', |
50 | | - 'newsextension-renderedfeed' => '$1: أنتج التلقيم<br />', |
51 | | - 'newsextension-cachingfeed' => '$1: تخبئة التلقيم ($2)<br / >', |
52 | | - 'newsextension-freshfeed' => '$1: ينتج تلقيما جديدا<br />', |
53 | 25 | ); |
54 | 26 | |
55 | 27 | /** Egyptian Spoken Arabic (مصرى) |
— | — | @@ -56,20 +28,6 @@ |
57 | 29 | */ |
58 | 30 | $messages['arz'] = array( |
59 | 31 | 'newsextension-desc' => 'يعرض أحدث تغييرات معدلة فى صفحات الويكى أو كتلقيم آر إس إس أو أتوم.', |
60 | | - 'newsextension-unknownformat' => '$1: صيغة تلقيم غير معروفة : $2<br />', |
61 | | - 'newsextension-feednotfound' => '$1: صفحة التلقيم غير موجودة : $2<br />', |
62 | | - 'newsextension-feedrequest' => '$1: معالجة طلب التلقيم ل $2<br />', |
63 | | - 'newsextension-checkok' => '$1: كاش HTTP على ما يرام، رأس 304 تم إرسالها<br />', |
64 | | - 'newsextension-checkok1' => '$1: جارى التحقق الكاش على ما يرام: IMS $2 vs. $3 التى تم تغييرها<br />', |
65 | | - 'newsextension-gotcached' => '$1: ($2? "حصلت على كاش" : "لا كاش")<br />', |
66 | | - 'newsextension-purge' => '$1: إفراغ الكاش، تجاهل الكاش<br />', |
67 | | - 'newsextension-loggin' => '$1: تم تسجيل الدخول، يتم تجاهل الكاش<br />', |
68 | | - 'newsextension-outputting' => '$1: ينتج نسخة كاش ($2): $3 < {$4}<br />', |
69 | | - 'newsextension-stale' => '$1: تم العثور على نسخة كاش قديمة ($2): $3 >= {$4}<br />', |
70 | | - 'newsextension-nofoundonpage' => '$1: لا تلقيم تم العثور عليه فى الصفحة: $2<br / >', |
71 | | - 'newsextension-renderedfeed' => '$1: أنتج التلقيم<br />', |
72 | | - 'newsextension-cachingfeed' => '$1: تخبئة التلقيم ($2)<br / >', |
73 | | - 'newsextension-freshfeed' => '$1: ينتج تلقيما جديدا<br />', |
74 | 32 | ); |
75 | 33 | |
76 | 34 | /** Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца)) */ |
— | — | @@ -96,20 +54,6 @@ |
97 | 55 | */ |
98 | 56 | $messages['fr'] = array( |
99 | 57 | 'newsextension-desc' => 'Visionne les modifications récentes spécifiques sur une page wiki ou comme un flux RSS ou Atom.', |
100 | | - 'newsextension-unknownformat' => '$1 : format de flux inconnu : $2<br />', |
101 | | - 'newsextension-feednotfound' => '$1 : page de flux introuvable : $2<br />', |
102 | | - 'newsextension-feedrequest' => '$1 : prise en charge de la requête pour $2<br />', |
103 | | - 'newsextension-checkok' => '$1 : cache HTTP correct, en-tête 304 envoyé<br />', |
104 | | - 'newsextension-checkok1' => '$1 : vérification du cache correcte : IMS $2 c/ $3 modifié<br />', |
105 | | - 'newsextension-gotcached' => '$1 : ($2? "obtenu caché" : "non caché")<br />', |
106 | | - 'newsextension-purge' => '$1 : purge, cache ignoré<br />', |
107 | | - 'newsextension-loggin' => '$1 : en session, cache ignoré<br />', |
108 | | - 'newsextension-outputting' => '$1 : sortie de la copie en cache ($2) : $3 < {$4}<br />', |
109 | | - 'newsextension-stale' => '$1 : copie périmée trouvée en cache ($2) : $3 >= {$4}<br />', |
110 | | - 'newsextension-nofoundonpage' => '$1 : aucune alimentation trouvée sur la page : $2<br / >', |
111 | | - 'newsextension-renderedfeed' => '$1 : alimentation rendue<br />', |
112 | | - 'newsextension-cachingfeed' => '$1 : cache l’alimentation ($2)<br / >', |
113 | | - 'newsextension-freshfeed' => '$1 : sortie de l’alimentation récente<br />', |
114 | 58 | ); |
115 | 59 | |
116 | 60 | /** Galician (Galego) |
— | — | @@ -138,20 +82,6 @@ |
139 | 83 | */ |
140 | 84 | $messages['ia'] = array( |
141 | 85 | 'newsextension-desc' => 'Monstra modificationes recente in modo personalisate in un pagina wiki o como un syndication RSS o Atom', |
142 | | - 'newsextension-unknownformat' => '$1: formato de syndication incognite: $2<br />', |
143 | | - 'newsextension-feednotfound' => '$1: pagina de syndication non trovate: $2<br />', |
144 | | - 'newsextension-feedrequest' => '$1: gestion del requesta de syndication pro $2<br />', |
145 | | - 'newsextension-checkok' => '$1: cache HTTP ok, capite 304 inviate<br />', |
146 | | - 'newsextension-checkok1' => '$1: verification de cache correcte: IMS $2 contra $3 cambiate<br />', |
147 | | - 'newsextension-gotcached' => '$1: ($2? "obteneva version del cache": "nulle version del cache")<br />', |
148 | | - 'newsextension-purge' => '$1: purgar, ignorante cache<br />', |
149 | | - 'newsextension-loggin' => '$1: session aperte, le cache es ignorate<br />', |
150 | | - 'newsextension-outputting' => '$1: se monstra le copia del cache ($2): $3 < {$4}<br />', |
151 | | - 'newsextension-stale' => '$1: incontrava un copia obsolete in le cache ($2): $3 >= {$4}<br />', |
152 | | - 'newsextension-nofoundonpage' => '$1: nulle syndication trovate in pagina: $2<br / >', |
153 | | - 'newsextension-renderedfeed' => '$1: syndication visualisate<br />', |
154 | | - 'newsextension-cachingfeed' => '$1: mitte in cache le syndication ($2)<br / >', |
155 | | - 'newsextension-freshfeed' => '$1: se rende un syndication fresc<br />', |
156 | 86 | ); |
157 | 87 | |
158 | 88 | /** Italian (Italiano) |
— | — | @@ -159,10 +89,6 @@ |
160 | 90 | */ |
161 | 91 | $messages['it'] = array( |
162 | 92 | 'newsextension-desc' => 'Mostra ultime modifiche personalizzate su una pagina wiki o come feed RSS o Atom', |
163 | | - 'newsextension-unknownformat' => '$1: formato feed sconosciuto: $2<br />', |
164 | | - 'newsextension-feednotfound' => '$1: pagina del feed non trovata: $2<br />', |
165 | | - 'newsextension-feedrequest' => '$1: gestione della richiesta feed per $2<br />', |
166 | | - 'newsextension-checkok' => '$1: cache HTTP ok, header 304 inviato<br />', |
167 | 93 | ); |
168 | 94 | |
169 | 95 | /** Khmer (ភាសាខ្មែរ) |
— | — | @@ -178,10 +104,6 @@ |
179 | 105 | */ |
180 | 106 | $messages['ksh'] = array( |
181 | 107 | 'newsextension-desc' => 'Zeich en extra ennjeshtallte Leß met {{lcfirst:{{int:Recentchanges}}}} als en Sigg em Wiki udder als en RSS udder Atom <i lang="en">feed</i> aan.', |
182 | | - 'newsextension-unknownformat' => '$1: unbikannt <i lang="en">feed</i> Fomaat: $2<br />', |
183 | | - 'newsextension-feednotfound' => '$1: <i lang="en">feed</i> Sigg nit jefonge: $2<br />', |
184 | | - 'newsextension-feedrequest' => '$1: donn dä <i lang="en">feed</i> Opdraach för $2 affhandelle<br />', |
185 | | - 'newsextension-checkok' => '$1: HTTP <i lang="en">cache</i> en Odenung, 304 <i lang="en">header</i> jescheck<br />', |
186 | 108 | ); |
187 | 109 | |
188 | 110 | /** Luxembourgish (Lëtzebuergesch) |
— | — | @@ -189,8 +111,6 @@ |
190 | 112 | */ |
191 | 113 | $messages['lb'] = array( |
192 | 114 | 'newsextension-desc' => 'Weist déi spezifesch rezent Ännerungen op enger wiki-Säit oder als RSS oder Atom Lëscht', |
193 | | - 'newsextension-unknownformat' => '$1: onbekannte Feed Format: $2<br />', |
194 | | - 'newsextension-loggin' => '$1: ageloggt, Cache ignoréiert<br />', |
195 | 115 | ); |
196 | 116 | |
197 | 117 | /** Marathi (मराठी) |
— | — | @@ -198,19 +118,6 @@ |
199 | 119 | */ |
200 | 120 | $messages['mr'] = array( |
201 | 121 | 'newsextension-desc' => 'एखाद्या विकिवरील पानांमध्ये झालेले अलीकडील बदल आरएसएस फीड किंवा ऍटम फीड च्या स्वरुपात दर्शविते', |
202 | | - 'newsextension-unknownformat' => '$1: चुकीची फीड रुपरेषा : $2<br />', |
203 | | - 'newsextension-feednotfound' => '$1: फीड पृष्ठ सापडले नाही : $2<br />', |
204 | | - 'newsextension-feedrequest' => '$1: $2 साठीची फीड मागणी पूर्ण करीत आहे<br />', |
205 | | - 'newsextension-checkok' => '$1: HTTP सय ठीक, ३०४ हेडर पाठविले <br />', |
206 | | - 'newsextension-checkok1' => '$1: सय तपासणी-ठीक: IMS $2 वि. $3 बदलले <br />', |
207 | | - 'newsextension-purge' => '$1: पर्ज, सयीकडे दुर्लक्ष करीत आहे<br />', |
208 | | - 'newsextension-loggin' => '$1: प्रवेश पूर्ण, सयीकडे दुर्लक्ष करीत आहे<br />', |
209 | | - 'newsextension-outputting' => '$1: सयीतील प्रत काढट आहे ($2): $3 < {$4}<br />', |
210 | | - 'newsextension-stale' => '$1: सय प्रत सापडली ($2): $3 >= {$4}<br />', |
211 | | - 'newsextension-nofoundonpage' => '$1: पानावर फीड सापडला नाही: $2<br / >', |
212 | | - 'newsextension-renderedfeed' => '$1: रेंडर्ड फीड <br />', |
213 | | - 'newsextension-cachingfeed' => '$1: फीड सयीत टाकत आहे ($2)<br / >', |
214 | | - 'newsextension-freshfeed' => '$1: नवीन फीड बाहेर काढत आहे<br />', |
215 | 122 | ); |
216 | 123 | |
217 | 124 | /** Dutch (Nederlands) |
— | — | @@ -219,10 +126,6 @@ |
220 | 127 | */ |
221 | 128 | $messages['nl'] = array( |
222 | 129 | 'newsextension-desc' => 'Aangepaste recente wijzigingen weergeven op een wikipagina, of als RSS-feed of Atom-feed', |
223 | | - 'newsextension-unknownformat' => '$1: onbekend feedformaat: $2<br />', |
224 | | - 'newsextension-feednotfound' => '$1: feed-pagina niet gevonden: $2<br />', |
225 | | - 'newsextension-feedrequest' => '$1: bezig met afhandelen van feed-aanvraag voor $2<br />', |
226 | | - 'newsextension-nofoundonpage' => '$1: geen feed gevonden op pagina: $2<br />', |
227 | 130 | ); |
228 | 131 | |
229 | 132 | /** Norwegian (bokmål) (Norsk (bokmål)) |
— | — | @@ -237,20 +140,6 @@ |
238 | 141 | */ |
239 | 142 | $messages['oc'] = array( |
240 | 143 | 'newsextension-desc' => 'Mòstra los darrièrs cambiaments especifics sus una pagina wiki o coma un flus RSS o Atom.', |
241 | | - 'newsextension-unknownformat' => '$1 : format de flus desconegut : $2<br />', |
242 | | - 'newsextension-feednotfound' => '$1 : pagina de fluses introbabla : $2<br />', |
243 | | - 'newsextension-feedrequest' => '$1 : Presa en carga de la requèsta per $2<br />', |
244 | | - 'newsextension-checkok' => '$1 : amagatal HTTP corrècte, entèsta 304 header mandat<br />', |
245 | | - 'newsextension-checkok1' => "$1 : verificacion de l'amagatal corrècta : IMS $2 c/ $3 modificat<br />", |
246 | | - 'newsextension-gotcached' => '$1 : ($2 ? « obtengut amagat » : « pas amagat »)<br />', |
247 | | - 'newsextension-purge' => '$1 : purga, amagatal ignorat<br />', |
248 | | - 'newsextension-loggin' => '$1 : en sesilha, amagatal ignorat<br />', |
249 | | - 'newsextension-outputting' => '$1 : sortida de la còpia en amagatal ($2): $3 < {$4}', |
250 | | - 'newsextension-stale' => '$1 : trobat una còpia en amagatal anciana ($2): $3 >= {$4}<br />', |
251 | | - 'newsextension-nofoundonpage' => "$1 : cap d'alimentacion pas trobada sus la pagina : $2<br / >", |
252 | | - 'newsextension-renderedfeed' => '$1 : alimentacion renduda<br />', |
253 | | - 'newsextension-cachingfeed' => '$1 : amaga l’alimentacion ($2)<br / >', |
254 | | - 'newsextension-freshfeed' => '$1 : sortida alimentacion recenta<br />', |
255 | 144 | ); |
256 | 145 | |
257 | 146 | /** Russian (Русский) |
— | — | @@ -294,4 +183,3 @@ |
295 | 184 | $messages['vi'] = array( |
296 | 185 | 'newsextension-desc' => 'Hiển thị các thay đổi gần đây đã tinh chỉnh trên các trang của một wiki hoặc bằng feed RSS hoặc Atom', |
297 | 186 | ); |
298 | | - |
Index: trunk/extensions/News/News.php |
— | — | @@ -94,18 +94,18 @@ |
95 | 95 | if ($action != 'view' && $action != 'purge') return true; |
96 | 96 | |
97 | 97 | if ( !isset($wgFeedClasses[$format] ) ) { |
98 | | - wfDebug( wfMsg( 'newsextension-unknownformat', $fname, $format) ); |
| 98 | + wfDebug( "$fname: unknown feed format: $format \n" ); |
99 | 99 | wfHttpError(400, "Bad Request", "unknown feed format: " . $format); //TODO: better code & text |
100 | 100 | return false; |
101 | 101 | } |
102 | 102 | |
103 | 103 | if (!$title->exists()) { |
104 | | - wfDebug( wfMsg( 'newsextension-feednotfound', $fname, $title->getPrefixedDBKey() ) ); |
| 104 | + wfDebug( "$fname: feed page not found: " . $title->getPrefixedDBKey() . "\n" ); |
105 | 105 | wfHttpError(404, "Not Found", "feed page not found: " . $title->getPrefixedText()); //TODO: better text |
106 | 106 | return false; |
107 | 107 | } |
108 | 108 | |
109 | | - wfDebug( wfMsg( 'newsextension-feedrequest', $fname, $title->getPrefixedDBKey() ) ); |
| 109 | + wfDebug( "$fname: handling feed request for " . $title->getPrefixedDBKey() . "\n" ); |
110 | 110 | |
111 | 111 | $article = new NewsFeedPage( $title, $format ); |
112 | 112 | return false; |
Index: trunk/extensions/News/NewsRenderer.php |
— | — | @@ -774,9 +774,9 @@ |
775 | 775 | if ( $ims && $usecache ) { |
776 | 776 | $lastchange = wfTimestamp(TS_UNIX, NewsRenderer::getLastChangeTime()); |
777 | 777 | |
778 | | - wfDebug( wfMsg( 'newsextension-checkok1', $fname, $ims, $lastchange ) ); |
| 778 | + wfDebug( "$fname: checking cache-ok: IMS $ims vs. changed $lastchange \n" ); |
779 | 779 | if ( $wgOut->checkLastModified( $lastchange ) ) { |
780 | | - wfDebug( wfMsg( 'newsextension-checkok' , $fname) ); |
| 780 | + wfDebug( "$fname: HTTP cache ok, 304 header sent \n" ); |
781 | 781 | return; // done, 304 header sent. |
782 | 782 | } |
783 | 783 | } |
— | — | @@ -788,15 +788,16 @@ |
789 | 789 | $ocache = wfGetParserCacheStorage(); |
790 | 790 | $e = $ocache ? $ocache->get( $cachekey ) : NULL; |
791 | 791 | $note .= ' anon;'; |
792 | | - wfDebug( wfMsg( 'newsextension-gotcached', $fname, $e) ); |
| 792 | + $debug = $e ? "got cached" : "no cached"; |
| 793 | + wfDebug( "$fname: ($debug) \n" ); |
793 | 794 | } |
794 | 795 | else { |
795 | 796 | if (!$usecache) { |
796 | | - wfDebug( wfMsg( 'newsextension-purge', $fname ) ); |
| 797 | + wfDebug( "$fname: purge, ignoring cache \n" ); |
797 | 798 | $note .= ' purged;'; |
798 | 799 | } |
799 | 800 | else { |
800 | | - wfDebug( wfMsg( 'newsextension-loggin', $fname ) ); |
| 801 | + wfDebug( "$fname: logged in, ignoring cache \n" ); |
801 | 802 | $note .= ' user;'; |
802 | 803 | } |
803 | 804 | |
— | — | @@ -813,7 +814,7 @@ |
814 | 815 | $last = wfTimestamp(TS_UNIX, $lastchange); |
815 | 816 | |
816 | 817 | if ($last < $e['timestamp']) { |
817 | | - wfDebug( wfMsg( 'newsextension-outputting', $fname, $cachekey, $last, $e['timestamp'] ) ); |
| 818 | + wfDebug( "$fname: outputting cached copy ($cacheKey): $last < " . $e['timestamp'] . " \n" ); |
818 | 819 | header('Content-Type: application/' . $this->mFeedFormat . '+xml; charset=UTF-8'); |
819 | 820 | |
820 | 821 | print $e['xml']; |
— | — | @@ -822,7 +823,7 @@ |
823 | 824 | return; //done |
824 | 825 | } |
825 | 826 | else { |
826 | | - wfDebug( wfMsg('newsextension-stale', $fname, $cachekey, $last, $e['timestamp'] ) ); |
| 827 | + wfDebug( "$fname: found stale cached copy ($cacheKey): $last <= " . $e['timestamp'] . " \n" ); |
827 | 828 | $note .= " stale: $last >= {$e['timestamp']};"; |
828 | 829 | } |
829 | 830 | } |
— | — | @@ -845,7 +846,7 @@ |
846 | 847 | |
847 | 848 | $renderer = NewsRenderer::newFromArticle( $this, $wgParser ); |
848 | 849 | if (!$renderer) { |
849 | | - wfDebug( wfMsg( 'newsextension-nofoundonpage', $fname, $this->mTitle->getPrefixedText() ) ); |
| 850 | + wfDebug( "$fname: no feed found on page: " . $this->mTitle->getPrefixedText() . "\n" ); |
850 | 851 | wfHttpError(404, "Not Found", "no feed found on page: " . $this->mTitle->getPrefixedText() ); //TODO: better code & text |
851 | 852 | return; |
852 | 853 | } |
— | — | @@ -855,16 +856,16 @@ |
856 | 857 | |
857 | 858 | //this also sends the right headers |
858 | 859 | $xml = $renderer->renderFeed( $this->mFeedFormat, $description ); |
859 | | - wfDebug( wfMsg( 'newsextension-renderedfeed', $fname ) ); |
| 860 | + wfDebug( "$fname: rendered feed \n" ); |
860 | 861 | |
861 | 862 | $e = array( 'xml' => $xml, 'timestamp' => $ts ); |
862 | 863 | if ($ocache) { |
863 | | - wfDebug( wfMsg( 'newsextension-cachingfeed', $fname, $cachekey ) ); |
| 864 | + wfDebug( "$fname: caching feed ($cachekey) \n" ); |
864 | 865 | $ocache->set( $cachekey, $e, $ts + 24 * 60 * 60 ); //cache for max 24 hours; cached record is discarded when anything turns up in RC anyway. |
865 | 866 | $note .= ' updated;'; |
866 | 867 | } |
867 | 868 | |
868 | | - wfDebug( wfMsg( 'newsextension-freshfeed', $fname ) ); |
| 869 | + wfDebug( "$fname: outputting fresh feed \n" ); |
869 | 870 | header('Content-Type: application/' . $this->mFeedFormat . '+xml; charset=UTF-8'); |
870 | 871 | print $xml; |
871 | 872 | print "\n<!-- fresh: $note -->\n"; |