* use wfLoadExtensionMessages for SyntaxHighlight_GeSHi

* add version in extension credits
* update Translate extension

SyntaxHighlight_GeSHi.class.php

@@ -200,28 +200,11 @@ class SyntaxHighlight_GeSHi {
 	 */
 	private static function initialise() {
 		if( !self::$initialised ) {
-			self::loadMessages();
+			wfLoadExtensionMessages( 'SyntaxHighlight_GeSHi' );
 			if( !class_exists( 'GeSHi' ) )
 				require( 'geshi/geshi.php' );
 			self::$initialised = true;
 		}
 		return true;
 	}
-	
-	/**
-	 * Load extension messages
-	 *
-	 * @return bool
-	 */
-	public static function loadMessages() {
-		static $done = false;
-		if( !$done ) {
-			global $wgMessageCache;
-			require_once( dirname( __FILE__ ) . '/SyntaxHighlight_GeSHi.i18n.php' );
-			foreach( efSyntaxHighlight_GeSHiMessages() as $lang => $messages )
-				$wgMessageCache->addMessages( $messages, $lang );
-		}
-		return true;
-	}
-
 }

SyntaxHighlight_GeSHi.i18n.php

@@ -1,381 +1,371 @@
 <?php
-
 /**
- * Internationalisation file for the SyntaxHighlight extension
+ * Internationalisation file for extension SyntaxHighlight.
  *
  * @addtogroup Extensions
 */
 
-function efSyntaxHighlight_GeSHiMessages() {
-	$messages = array(
+$messages = array();
 
-/* English (Brion Vibber) */
-'en' => array(
+/* English
+ * @author Brion Vibber
+ */
+$messages['en'] = array(
 	'syntaxhighlight-specify' => 'You need to specify a language like this:',
 	'syntaxhighlight-supported' => 'Supported languages for syntax highlighting:',
 	'syntaxhighlight-err-loading' => '(error loading supported language list)',
 	'syntaxhighlight-err-language' => 'Invalid language.',
 	'geshi.css' => '/* CSS placed here will be applied to GeSHi syntax highlighting */',
-),
+);
 
-'ar' => array(
+$messages['ar'] = array(
 	'syntaxhighlight-specify' => 'يجب عليك تحديد لغة مثل هذه:',
 	'syntaxhighlight-supported' => 'اللغات المدعومة لتظليل الصياغة:',
 	'syntaxhighlight-err-loading' => '(خطأ في تحميل قائمة اللغات المدعومة)',
 	'syntaxhighlight-err-language' => 'لغة غير صحيحة.',
 	'geshi.css' => '/* الأنماط المتراصة CSS المعروضة هنا ستطبق على GeSHi syntax highlighting */',
-),
+);
 
 /** Bulgarian (Български)
  * @author DCLXVI
  */
-'bg' => array(
+$messages['bg'] = array(
 	'syntaxhighlight-err-language' => 'Невалиден език.',
-),
+);
 
 /** Bengali (বাংলা)
  * @author Zaheen
  */
-'bn' => array(
+$messages['bn'] = array(
 	'syntaxhighlight-specify'      => 'আপনাকে এভাবে একটি ভাষা নির্দিষ্ট করতে হবে:',
 	'syntaxhighlight-supported'    => 'যেসব ভাষার জন্য সিনট্যাক্স হাইলাইটিং সমর্থিত:',
 	'syntaxhighlight-err-loading'  => '(সমর্থিত ভাষার তালিকা আনতে ত্রুটি)',
 	'syntaxhighlight-err-language' => 'অবৈধ ভাষা।',
 	'geshi.css'                    => '/* এখানে স্থাপিত CSS কোড GeSHi সিনট্যাক্স হাইলাইটিং-এ ব্যবহার করা হবে */',
-),
+);
 
 /** Catalan (Català)
  * @author SMP
  */
-'ca' => array(
+$messages['ca'] = array(
 	'syntaxhighlight-specify'      => "Heu d'especificar un dels llenguatges:",
 	'syntaxhighlight-supported'    => 'Llenguatges admesos per al ressaltament sintàctic:',
 	'syntaxhighlight-err-loading'  => '(error en carregar la llista de llenguatges)',
 	'syntaxhighlight-err-language' => 'Llenguatge invàlid.',
-),
+);
 
 /** Czech (Česky)
  * @author Li-sung
  */
-'cs' => array(
+$messages['cs'] = array(
 	'syntaxhighlight-specify'      => 'Musíte určit jazyk tímto způsobem:',
 	'syntaxhighlight-supported'    => 'Seznam jazyků, u kterých je podporováno zvýrazňování syntaxe:',
 	'syntaxhighlight-err-loading'  => '(chyba při načítání seznamu podporovaných jazyků)',
 	'syntaxhighlight-err-language' => 'Neplatný jazyk.',
 	'geshi.css'                    => '/* Zde uvedené CSS bude ovlivňovat zvýrazňování syntaxe GeSHi */',
-),
+);
 
 /* German (Raymond) */
-'de' => array(
+$messages['de'] = array(
 	'syntaxhighlight-specify'      => 'Die gewünschte Sprache muss wie folgt definiert werden:',
 	'syntaxhighlight-supported'    => 'Unterstützte Sprachen für die Syntax-Hervorhebung:',
 	'syntaxhighlight-err-loading'  => '(Fehler beim Laden der Sprachenliste)',
 	'syntaxhighlight-err-language' => 'Ungültige Sprache.',
 	'geshi.css'                    => '/* CSS in dieser MediaWiki-Systemnachricht wird auf die GeSHi-Syntaxhervorhebung angewendet */',
-),
+);
 
 /** Greek (Ελληνικά)
  * @author Consta
  */
-'el' => array(
+$messages['el'] = array(
 	'syntaxhighlight-err-language' => 'Άκυρη γλώσσα.',
-),
+);
 
 /* Estonian [[et:Kasutaja:M2s17]] */
-'et' => array(
+$messages['et'] = array(
 	'syntaxhighlight-specify' => 'Sa pead täpsustama keelt nõnda:',
 	'syntaxhighlight-supported' => 'Süntaksi esiletoomise on toetatud järgnevates keeltes:',
 	'syntaxhighlight-err-loading' => '(toetatud keelte loetelu laadimisel esines viga)',
 	'syntaxhighlight-err-language' => 'antud keel on mittekehtiv',
 	'geshi.css' => '/* CSS mis on asetatud siia, määrab GeSHi süntaksi esiletoomise stiili */',
-),
+);
 
-'eu' => array(
+$messages['eu'] = array(
 	'syntaxhighlight-err-language' => 'Baliogabeko hizkuntza.',
-),
+);
 
 # فارسی (Huji)
-'fa' => array(
+$messages['fa'] = array(
 	'syntaxhighlight-specify'      => 'شما باید به این شکل زبانی را مشخص کنید:',
 	'syntaxhighlight-supported'    => 'زبان‌های پشتیبانی‌شده برای رنگین‌کردن دستورات:',
 	'syntaxhighlight-err-loading'  => '(خطا در بارگذاری فهرست زبان‌های پشتیبانی‌شده)',
 	'syntaxhighlight-err-language' => 'زبان غیرمجاز.',
 	'geshi.css'                    => '/* دستورات CSS این‌جا توسط سامانه رنگین‌کردن دستورات GeSHi به کار گرفته می‌شوند */',
 
-),
+);
 
 /** Finnish (Suomi)
  * @author Nike
  */
-'fi' => array(
+$messages['fi'] = array(
 	'syntaxhighlight-specify'      => 'Kieli pitää määritellä seuraavasti:',
 	'syntaxhighlight-supported'    => 'Syntaksinkorostus on mahdollista seuraaville kielille:',
 	'syntaxhighlight-err-loading'  => '(tuettujen kielten luettelon lataaminen epäonnistui)',
 	'syntaxhighlight-err-language' => 'Kelpaamaton kieli.',
 	'geshi.css'                    => '/* Tänne lisätty CSS vaikuttaa GeSHi-syntaksinkorostukseen */',
-),
+);
 
 /** French
  *@author 
  */
-'fr' => array(
+$messages['fr'] = array(
 	'syntaxhighlight-specify' => 'Vous devez spécifier un langage comme ceci :',
 	'syntaxhighlight-supported' => 'Langages supportés pour la coloration syntaxique :',
 	'syntaxhighlight-err-loading' => '(erreur en chargeant la liste des langages supportés)',
 	'syntaxhighlight-err-language' => 'Langage invalide',
 	'geshi.css' => '/* Le code CSS inséré ici sera appliqué par GeSHi pour la coloration syntaxique. */',
-),
+);
 
-'gl' => array(
+$messages['gl'] = array(
 	'syntaxhighlight-specify' => 'Ten que especificar unha linguaxe así:',
 	'syntaxhighlight-supported' => 'Linguaxes coñecidas para resaltar a sintaxe:',
 	'syntaxhighlight-err-loading' => '(erro ao cargar a listaxe de linguaxes coñecidas)',
 	'syntaxhighlight-err-language' => 'Linguaxe non válida.',
 	'geshi.css' => '/* O CSS colocado aquí será aplicado ao resalte da sintaxe de GeSHi */',
-),
+);
 
 /* Hebrew (Rotem Liss) */
-'he' => array(
+$messages['he'] = array(
 	'syntaxhighlight-specify'      => 'עליכם לציין שפה באופן הבא:',
 	'syntaxhighlight-supported'    => 'שפות נתמכות:',
 	'syntaxhighlight-err-loading'  => '(שגיאה בטעינת הרשימה של השפות הנתמכות)',
 	'syntaxhighlight-err-language' => 'שפה שגויה.',
 	'geshi.css'                    => '/* סגנונות CSS שייכתבו כאן יפעלו על התגית source */',
-),
+);
 
-'hr' => array(
+$messages['hr'] = array(
 	'syntaxhighlight-specify' => 'Molimo navedite jezik na slijedeći način:',
 	'syntaxhighlight-supported' => 'Jezici podržani za bojanje sintakse:',
 	'syntaxhighlight-err-loading' => '(greška pri učitavanju popisa podržanih jezika)',
 	'syntaxhighlight-err-language' => 'Nevaljani jezik.',
 	'geshi.css' => '/* CSS kod napisan ovdje će biti primijenjen na GeSHi bojanje sintakse */',
-),
+);
 
-'hsb' => array(
+$messages['hsb'] = array(
 	'syntaxhighlight-specify' => 'Dyrbiš rěč takle definować:',
 	'syntaxhighlight-supported' => 'Podpěrowane rěče za syntaksowe wuzběhnjenje:',
 	'syntaxhighlight-err-loading' => '(Zmylk při začitanju lisćiny rěčow)',
 	'syntaxhighlight-err-language' => 'Njepłaćiwa rěč.',
 	'geshi.css' => '/* CSS w tutej zdźělence so na syntaksowe wuzběhnjenje GeSHi nałoži */',
-),
+);
 
-'hu' => array(
+$messages['hu'] = array(
 	'syntaxhighlight-specify' => 'Meg kell adnod egy nyelvet az alábbi módon:',
 	'syntaxhighlight-supported' => 'Támogatott programozási nyelvek:',
 	'syntaxhighlight-err-loading' => '(hiba történt a támogatott nyelvek listájának betöltése közben)',
 	'syntaxhighlight-err-language' => 'Érvénytelen nyelv.',
 	'geshi.css' => '/* Az itt elhelyezett CSS-t fogja alkalmazni a GeSHi szintaxiskiemelő */',
-),
+);
 
 /* Indonesian (Ivan Lanin) */
-'id' => array(
+$messages['id'] = array(
 	'syntaxhighlight-specify' => 'Anda harus menentukan suatu bahasa seperti ini:',
 	'syntaxhighlight-supported' => 'Bahasa-bahasa yang didukung oleh pewarnaan sintaks:',
 	'syntaxhighlight-err-loading' => '(kesalahan pemuatan daftar bahasa yang didukung)',
 	'syntaxhighlight-err-language' => 'Bahasa tak sah.',
-),
+);
 
 /** Italian (Italiano)
  * @author BrokenArrow
  */
-'it' => array(
+$messages['it'] = array(
 	'syntaxhighlight-specify'      => 'È necessario specificare un linguaggio in questo modo:',
 	'syntaxhighlight-supported'    => 'Linguaggi di cui è possibile evidenziare la sintassi in colore:',
 	'syntaxhighlight-err-loading'  => "(errore nel caricamento dell'elenco dei linguaggi supportati)",
 	'syntaxhighlight-err-language' => 'Linguaggio non riconosciuto.',
 	'geshi.css'                    => "/* Gli stili CSS inseriti qui si applicano all'evidenziazione di sintassi con GeSHi */",
-),
+);
 
 /* Japanese */
-'ja' => array(
+$messages['ja'] = array(
 	'syntaxhighlight-specify' => '以下のように言語を指定する必要があります:',
 	'syntaxhighlight-supported' => 'シンタックスハイライト機能に対応している言語は以下の通りです:',
 	'syntaxhighlight-err-loading' => '（対応言語のロード時にエラーが発生しました）',
 	'syntaxhighlight-err-language' => '不正な言語名です。',
-),
+);
 
 /* Kazakh Cyrillic (AlefZet) */
-'kk-cyrl' => array(
+$messages['kk-cyrl'] = array(
 	'syntaxhighlight-specify' => 'Тілді былайша көрсетуіңіз қажет:',
 	'syntaxhighlight-supported' => 'Синтаксисі көмескі жарықталатын сүйемелденген тілдер:',
 	'syntaxhighlight-err-loading' => '(сүйемелденген тілдер тізімін жүктеу қатесі)',
 	'syntaxhighlight-err-language' => 'Жарамсыз тіл.',
 	'geshi.css' => '/* Мындағы CSS әмірлері GeSHi синтаксисті көмескі жарықтауға қолданылады */',
-),
+);
 
 /* Kazakh Latin (AlefZet) */
-'kk-latn' => array(
+$messages['kk-latn'] = array(
 	'syntaxhighlight-specify' => 'Tildi bılaýşa körsetwiñiz qajet:',
 	'syntaxhighlight-supported' => 'Sïntaksïsi kömeski jarıqtalatın süýemeldengen tilder:',
 	'syntaxhighlight-err-loading' => '(süýemeldengen tilder tizimin jüktew qatesi)',
 	'syntaxhighlight-err-language' => 'Jaramsız til.',
 	'geshi.css' => '/* Mındağı CSS ämirleri GeSHi sïntaksïsti kömeski jarıqtawğa qoldanıladı */',
-),
+);
 
 /* Kazakh Arabic (AlefZet) */
-'kk-arab' => array(
+$messages['kk-arab'] = array(
 	'syntaxhighlight-specify' => 'تٸلدٸ بىلايشا كٶرسەتۋٸڭٸز قاجەت:',
 	'syntaxhighlight-supported' => 'سينتاكسيسٸ كٶمەسكٸ جارىقتالاتىن سٷيەمەلدەنگەن تٸلدەر:',
 	'syntaxhighlight-err-loading' => '(سٷيەمەلدەنگەن تٸلدەر تٸزٸمٸن جٷكتەۋ قاتەسٸ)',
 	'syntaxhighlight-err-language' => 'جارامسىز تٸل.',
 	'geshi.css' => '/* مىنداعى CSS ٵمٸرلەرٸ GeSHi سينتاكسيستٸ كٶمەسكٸ جارىقتاۋعا قولدانىلادى */',
-),
+);
 
 /** Luxembourgish (Lëtzebuergesch)
  * @author Robby
  */
-'lb' => array(
+$messages['lb'] = array(
 	'syntaxhighlight-specify'      => 'Déi gewënschte Sprooch muss esou definéiert ginn:',
 	'syntaxhighlight-err-language' => 'Ongëlteg Sprooch',
-),
+);
 
 /* nld / Dutch (Siebrand Mazeland) */
-'nl' => array(
+$messages['nl'] = array(
 	'syntaxhighlight-specify' => 'Geef een taal als volgt op:',
 	'syntaxhighlight-supported' => 'Ondersteunde talen voor syntaxismarkering:',
 	'syntaxhighlight-err-loading' => '(fout bij het laden van de lijst met ondersteunde talen)',
 	'syntaxhighlight-err-language' => 'Onjuiste taal.',
 	'geshi.css' => '/* Hier geplaatste CSS wordt toegepast op GeSHi syntax highlighting */',
-),
+);
 
 /** Norwegian (‪Norsk (bokmål)‬)
  * @author Jon Harald Søby
  */
-'no' => array(
+$messages['no'] = array(
 	'syntaxhighlight-specify'      => 'Du må oppgi et språk slik:',
 	'syntaxhighlight-supported'    => 'Støttede språk for syntaksutheving:',
 	'syntaxhighlight-err-loading'  => '(feil under last av liste over støttede språk)',
 	'syntaxhighlight-err-language' => 'Ugyldig språk.',
 	'geshi.css'                    => '/* CSS plassert her gjelder GeSHi syntaksutheving */',
-),
+);
 
 /** Occitan (Occitan)
  * @author Cedric31
  */
-'oc' => array(
+$messages['oc'] = array(
 	'syntaxhighlight-specify'      => 'Devètz especificar un lengatge coma aquò :',
 	'syntaxhighlight-supported'    => 'Lengatges suportats per la coloracion sintaxica :',
 	'syntaxhighlight-err-loading'  => '(error en cargant la lista dels lengatges suportats)',
 	'syntaxhighlight-err-language' => 'Lengatge invalid.',
 	'geshi.css'                    => '/* Lo còde CSS inserit aicí serà aplicat per GeSHi per la coloracion sintaxica. */',
-),
+);
 
-'pl' => array(
+$messages['pl'] = array(
 	'syntaxhighlight-specify' => 'Musisz wybrać język w następujący sposób:',
 	'syntaxhighlight-supported' => 'Języki obsługiwane w podświetlaniu składni:',
 	'syntaxhighlight-err-loading' => '(błąd przy wczytywaniu listy obsługiwanych języków)',
 	'syntaxhighlight-err-language' => 'Niepoprawny język.',
 	'geshi.css' => '/* CSS umieszczony tutaj będzie zastosowany do kolorowania składni GeSHi  */',
-),
+);
 
-'pms' => array(
+$messages['pms'] = array(
 	'syntaxhighlight-specify' => 'A venta specifiché na lenga coma:',
 	'syntaxhighlight-supported' => 'Lenghe dont as peul fé l\'evidensiassion dla sintassi:',
 	'syntaxhighlight-err-loading' => '(eror ën cariand la lista dle lenghe dont sintassi as peul evidensié)',
 	'syntaxhighlight-err-language' => 'Lenga nen bon-a',
 	'geshi.css' => '/* ël CSS piassà ambelessì a sarà aplicà a l\'evidensiassion ëd sintassi GeSHi */',
-),
+);
 
 /* Portuguese (Lugusto) */
-'pt' => array(
+$messages['pt'] = array(
 	'syntaxhighlight-specify'      => 'Você precisa especificar uma linguagem, tal como:',
 	'syntaxhighlight-supported'    => 'Linguagens suportadas no realce de sintaxe:',
 	'syntaxhighlight-err-loading'  => '(erro ao carregar a lista de linguagens suportadas)',
 	'syntaxhighlight-err-language' => 'Linguagem inválida.',
 	'geshi.css'                    => '/* O código CSS aqui colocado será aplicado ao realce de sintaxe GeSHi */',
-),
+);
 
 /* Russian */
-'ru' => array(
+$messages['ru'] = array(
 	'syntaxhighlight-specify' => 'Вы должны указать язык следующим образом:',
 	'syntaxhighlight-supported' => 'Поддерживаемые языки:',
 	'syntaxhighlight-err-loading' => '(невозможно загрузить список языков)',
 	'syntaxhighlight-err-language' => 'Указан неподдерживаемый язык.',
 	'geshi.css' => '/* CSS-код, размещённый здесь, будет применён для подсветки синтаксиса GeSHI */',
-),
+);
 
 /** Slovak (Slovenčina)
  * @author Helix84
  */
-'sk' => array(
+$messages['sk'] = array(
 	'syntaxhighlight-specify'      => 'Musíte uviesť jazyk takto:',
 	'syntaxhighlight-supported'    => 'Jazyky, pre ktoré je zvýrazňovanie syntaxe podporované:',
 	'syntaxhighlight-err-loading'  => '(chyba pri načítaní zoznamu podporovaných jazykov)',
 	'syntaxhighlight-err-language' => 'Neplatný jazyk.',
 	'geshi.css'                    => '/* Tu umiestnené CSS sa použije pre zvýrazňovanie syntaxe GeSHi */',
-),
+);
 
 /** Seeltersk (Seeltersk)
  * @author Pyt
  */
-'stq' => array(
+$messages['stq'] = array(
 	'syntaxhighlight-specify'      => 'Ju wonskede Sproake mout as foulget definierd wäide:',
 	'syntaxhighlight-supported'    => 'Unnerstöände Sproaken foar ju Syntax-Betoonenge:',
 	'syntaxhighlight-err-loading'  => '(Failer bie dät Leeden fon ju Sproakenlieste)',
 	'syntaxhighlight-err-language' => 'Uungultige Sproake.',
 	'geshi.css'                    => '/* CSS in disse MediaWiki-Systemättergjucht wäd ap ju GeSHi-Syntaxbetoonenge anwoand */',
-),
+);
 
 /* Swedish */
-'sv' => array(
+$messages['sv'] = array(
 	'syntaxhighlight-specify' => 'Du måste ange vilket språk som används, så här:',
 	'syntaxhighlight-supported' => 'Det finns stöd för följande språk:',
 	'syntaxhighlight-err-loading' => '(fel vid laddning av listan över stödda språk)',
 	'syntaxhighlight-err-language' => 'Ogiltigt språk.',
 	'geshi.css' => '/* CSS som skrivs här används för syntax highlighting med GeSHI */',
-),
+);
 
 /** Volapük (Volapük)
  * @author Malafaya
  */
-'vo' => array(
+$messages['vo'] = array(
 	'syntaxhighlight-err-language' => 'Pük no dabinöl.',
-),
+);
 
 /* Cantonese (Shinjiman) */
-'yue' => array(
+$messages['yue'] = array(
 	'syntaxhighlight-specify' => '你需要指定一種語言，好似咁:',
 	'syntaxhighlight-supported' => '語法醒目標示所支援嘅語言:',
 	'syntaxhighlight-err-loading' => '(支援語言清單載入錯誤)',
 	'syntaxhighlight-err-language' => '無效嘅語言。',
 	'geshi.css' => '/* 放響呢度嘅CSS會以GeSHi語法醒目提示方式顯示 */',
-),
+);
 
 /* Chinese (Simplified) (Shinjiman) */
-'zh-hans' => array(
+$messages['zh-hans'] = array(
 	'syntaxhighlight-specify' => '您需要指定一种语言，像这样:',
 	'syntaxhighlight-supported' => '语法高亮所支持的语言:',
 	'syntaxhighlight-err-loading' => '(支持语言列表载入错误)',
 	'syntaxhighlight-err-language' => '无效的语言。',
 	'geshi.css' => '/* 放在这里的CSS会以GeSHi语法高亮方式显示 */',
-),
+);
 
 /* Chinese (Traditional) (Shinjiman) */
-'zh-hant' => array(
+$messages['zh-hant'] = array(
 	'syntaxhighlight-specify' => '您需要指定一種語言，像這樣:',
 	'syntaxhighlight-supported' => '語法醒目標示所支援的語言:',
 	'syntaxhighlight-err-loading' => '(支援語言清單載入錯誤)',
 	'syntaxhighlight-err-language' => '無效的語言。',
 	'geshi.css' => '/* 放在這裏的CSS會以GeSHi語法醒目提示方式顯示 */',
-),
-
 );
 
-	/* Kazakh fallbacks */
 $messages['kk-kz'] = $messages['kk-cyrl'];
 $messages['kk-tr'] = $messages['kk-latn'];
 $messages['kk-cn'] = $messages['kk-arab'];
 $messages['kk'] = $messages['kk-cyrl'];
-
-	/* Chinese defaults, fallback to zh-hans or zh-hant */
 $messages['zh'] = $messages['zh-hans'];
 $messages['zh-cn'] = $messages['zh-hans'];
 $messages['zh-hk'] = $messages['zh-hant'];
 $messages['zh-sg'] = $messages['zh-hans'];
 $messages['zh-tw'] = $messages['zh-hant'];
-	/* Cantonese default, fallback to yue */
 $messages['zh-yue'] = $messages['yue'];
-
-	return $messages; 
-
-}

SyntaxHighlight_GeSHi.php

@@ -43,14 +43,16 @@ if( !defined( 'MEDIAWIKI' ) )
 
 $wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi'] = array(
 	'name'          => 'SyntaxHighlight',
+	'version'       => '2008-01-11',
 	'author'        => array( 'Brion Vibber', 'Tim Starling', 'Rob Church' ),
 	'description'   => 'Provides syntax highlighting using [http://qbnz.com/highlighter/ GeSHi Highlighter]',
 	'url'           => 'http://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi',
 );
 
-$wgAutoloadClasses['SyntaxHighlight_GeSHi'] = dirname( __FILE__ ) . '/SyntaxHighlight_GeSHi.class.php';
+$dir = dirname(__FILE__) . '/';
+$wgExtensionMessagesFiles['SyntaxHighlight_GeSHi'] = $dir . 'SyntaxHighlight_GeSHi.i18n.php';
+$wgAutoloadClasses['SyntaxHighlight_GeSHi'] = $dir . 'SyntaxHighlight_GeSHi.class.php';
 $wgHooks['ShowRawCssJs'][] = 'SyntaxHighlight_GeSHi::viewHook';
-$wgHooks['LoadAllMessages'][] = 'SyntaxHighlight_GeSHi::loadMessages';
 $wgExtensionFunctions[] = 'efSyntaxHighlight_GeSHiSetup';
 
 /**