r54534 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r54533‎ | r54534 | r54535 >
Date:17:38, 6 August 2009
Author:brion
Status:ok
Tags:
Comment:
Merge TitleKey updates from trunk through r54533:
* i18n updates to about info
* hook setup ordering fix for compat w/ MWSearch
Modified paths:
  • /branches/wmf-deployment/extensions/TitleKey (modified) (history)
  • /branches/wmf-deployment/extensions/TitleKey/TitleKey.i18n.php (modified) (history)
  • /branches/wmf-deployment/extensions/TitleKey/TitleKey.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/TitleKey/TitleKey.php
@@ -43,9 +43,18 @@
4444 $wgHooks['LoadExtensionSchemaUpdates'][] = 'TitleKey::schemaUpdates';
4545
4646 // Search hooks...
47 -$wgHooks['PrefixSearchBackend'][] = 'TitleKey::prefixSearchBackend';
48 -$wgHooks['SearchGetNearMatch' ][] = 'TitleKey::searchGetNearMatch';
 47+// Delay setup to avoid compatibility problems with hook ordering
 48+// when coexisting with MWSearch... we want MWSearch to be able to
 49+// take over the PrefixSearchBackend hook without disabling the
 50+// SearchGetNearMatch hook point.
 51+$wgExtensionFunctions[] = 'efTitleKeySetup';
4952
 53+function efTitleKeySetup() {
 54+ global $wgHooks;
 55+ $wgHooks['PrefixSearchBackend'][] = 'TitleKey::prefixSearchBackend';
 56+ $wgHooks['SearchGetNearMatch' ][] = 'TitleKey::searchGetNearMatch';
 57+}
 58+
5059 $dir = dirname(__FILE__) . '/';
5160 $wgExtensionMessagesFiles['TitleKey'] = $dir . 'TitleKey.i18n.php';
5261 $wgAutoloadClasses['TitleKey'] = $dir . 'TitleKey_body.php';
Index: branches/wmf-deployment/extensions/TitleKey/TitleKey.i18n.php
@@ -171,6 +171,13 @@
172172 'titlekey-desc' => 'शीर्षक उपपद खोज सजेशन बॅकएन्ड',
173173 );
174174
 175+/** Hiligaynon (Ilonggo)
 176+ * @author Tagimata
 177+ */
 178+$messages['hil'] = array(
 179+ 'titlekey-desc' => 'Titulo prefiks pangitaon sugestiyon bakend',
 180+);
 181+
175182 /** Croatian (Hrvatski)
176183 * @author Dalibor Bosits
177184 */
@@ -229,6 +236,13 @@
230237 'titlekey-desc' => 'Backend prosès panggolèkan irah-irahan préfiks',
231238 );
232239
 240+/** Georgian (ქართული)
 241+ * @author გიორგიმელა
 242+ */
 243+$messages['ka'] = array(
 244+ 'titlekey-desc' => 'საძიება დახმარებათა ძრავა სიტყვების პირველი ასოების გამოყენებით',
 245+);
 246+
233247 /** Korean (한국어)
234248 * @author Kwj2772
235249 */
@@ -257,6 +271,13 @@
258272 'titlekey-desc' => 'Backend veur zeuksuggesties veur paginanaamveurvoegsels',
259273 );
260274
 275+/** Lithuanian (Lietuvių)
 276+ * @author Matasg
 277+ */
 278+$messages['lt'] = array(
 279+ 'titlekey-desc' => 'Pavadinimo prefikso paieška pasiūlymo sugrąžinimui',
 280+);
 281+
261282 /** Marathi (मराठी)
262283 * @author Kaustubh
263284 */
@@ -376,6 +397,13 @@
377398 'titlekey-desc' => 'Bakstycke för sökning efter titelprefix',
378399 );
379400
 401+/** Telugu (తెలుగు)
 402+ * @author Kiranmayee
 403+ */
 404+$messages['te'] = array(
 405+ 'titlekey-desc' => 'శీర్షిక ప్రీఫిక్స్ వెతుకు సలహా బ్యాక్ఎండ్',
 406+);
 407+
380408 /** Tagalog (Tagalog)
381409 * @author AnakngAraw
382410 */
Property changes on: branches/wmf-deployment/extensions/TitleKey
___________________________________________________________________
Name: svn:mergeinfo
383411 + /branches/REL1_15/phase3/extensions/TitleKey:51646
/trunk/extensions/TitleKey:52089-54533
/trunk/phase3/TitleKey:52859,53272
/trunk/phase3/extensions/TitleKey:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r54533Delay hook setup to avoid compatibility problems with ordering...brion17:36, 6 August 2009

Status & tagging log