* Restructured

diff --git a/languages/LanguageLi.php b/languages/LanguageLi.php
index 85d87fe..2e7fe8c 100644 (file)
--- a/languages/LanguageLi.php
+++ b/languages/LanguageLi.php
@@ -1,69 +1,83 @@
 <?php
-/** Limburgish (Limburgs)
+/** Limburgian (Limburgs)
   *
   * @package MediaWiki
   * @subpackage Language
   */
-/**
- * @private
- */
-$wgNamespaceNamesLi = array(
-       NS_MEDIA                        => 'Media',
-       NS_SPECIAL                      => 'Speciaal',
-       NS_MAIN                         => '',
-       NS_TALK                         => 'Euverlik',
-       NS_USER                         => 'Gebroeker',
-       NS_USER_TALK            => 'Euverlik_gebroeker',
-       NS_PROJECT                      => $wgMetaNamespace,
-       NS_PROJECT_TALK         => 'Euverlik_'.$wgMetaNamespace,
-       NS_IMAGE                        => 'Aafbeilding',
-       NS_IMAGE_TALK           => 'Euverlik_afbeelding',
-       NS_MEDIAWIKI            => 'MediaWiki',
-       NS_MEDIAWIKI_TALK       => 'Euverlik_MediaWiki',
-       NS_TEMPLATE                     => 'Sjabloon',
-       NS_TEMPLATE_TALK        => 'Euverlik_sjabloon',
-       NS_HELP                         => 'Help',
-       NS_HELP_TALK            => 'Euverlik_help',
-       NS_CATEGORY                     => 'Kategorie',
-       NS_CATEGORY_TALK        => 'Euverlik_kategorie'
-
-) + $wgNamespaceNamesEn;
-
-/* private */ $wgQuickbarSettingsLi = array(
- "Oetgesjakeld", "Links vas", "Rechts vas", "Links zwevend"
-);
-
-/* private */ $wgSkinNamesLi = array(
-       'standard' => "Standaard",
-       'nostalgia' => "Nostalgie",
-       'cologneblue' => "Keuls blauw",
-) + $wgSkinNamesEn;
+
+require_once( 'LanguageUtf8.php' );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesLi.php');
 }
 
+class LanguageLi extends LanguageUtf8 {
+       private $mMessagesLi, $mNamespaceNamesLi = null;
 
-require_once( "LanguageUtf8.php" );
+       private $mQuickbarSettingsLi = array(
+               'Oetgesjakeld', 'Links vas', 'Rechts vas', 'Links zwevend'
+       );
+       
+       private $mSkinNamesLi = array(
+               'standard' => 'Standaard',
+               'nostalgia' => 'Nostalgie',
+               'cologneblue' => 'Keuls blauw',
+       );
 
-class LanguageLi extends LanguageUtf8 {
+       function __construct() {
+               parent::__construct();
+
+               global $wgAllMessagesLi;
+               $this->mMessagesLi =& $wgAllMessagesLi;
+
+               global $wgMetaNamespace;
+               $this->mNamespaceNamesLi = array(
+                       NS_MEDIA          => 'Media',
+                       NS_SPECIAL        => 'Speciaal',
+                       NS_MAIN           => '',
+                       NS_TALK           => 'Euverlik',
+                       NS_USER           => 'Gebroeker',
+                       NS_USER_TALK      => 'Euverlik_gebroeker',
+                       NS_PROJECT        => $wgMetaNamespace,
+                       NS_PROJECT_TALK   => 'Euverlik_' . $wgMetaNamespace,
+                       NS_IMAGE          => 'Aafbeilding',
+                       NS_IMAGE_TALK     => 'Euverlik_afbeelding',
+                       NS_MEDIAWIKI      => 'MediaWiki',
+                       NS_MEDIAWIKI_TALK => 'Euverlik_MediaWiki',
+                       NS_TEMPLATE       => 'Sjabloon',
+                       NS_TEMPLATE_TALK  => 'Euverlik_sjabloon',
+                       NS_HELP           => 'Help',
+                       NS_HELP_TALK      => 'Euverlik_help',
+                       NS_CATEGORY       => 'Kategorie',
+                       NS_CATEGORY_TALK  => 'Euverlik_kategorie'
+               );
+       }
 
        function getNamespaces() {
-               global $wgNamespaceNamesLi;
-               return $wgNamespaceNamesLi;
+               return $this->mNamespaceNamesLi + parent::getNamespaces();
        }
 
        function getQuickbarSettings() {
-               global $wgQuickbarSettingsLi;
-               return $wgQuickbarSettingsLi;
+               return $this->mQuickbarSettingsLi;
        }
 
        function getSkinNames() {
-               global $wgSkinNamesLi;
-               return $wgSkinNamesLi;
+               return $this->mSkinNamesLi + parent::getSkinNames();
        }
 
-       function timeBeforeDate( $format ) {
+       function getMessage( $key ) {
+               if( isset( $this->mMessagesLi[$key] ) ) {
+                       return $this->mMessagesLi[$key];
+               } else {
+                       return parent::getMessage( $key );
+               }
+       }
+
+       function getAllMessages() {
+               return $this->mMessagesLi;
+       }
+
+       function timeBeforeDate( ) {
                return false;
        }
 
@@ -75,13 +89,5 @@ class LanguageLi extends LanguageUtf8 {
                return $this->getMonthAbbreviation( $month );
        }
 
-       function getMessage( $key ) {
-               global $wgAllMessagesLi;
-               if( isset( $wgAllMessagesLi[$key] ) ) {
-                       return $wgAllMessagesLi[$key];
-               } else {
-                       return parent::getMessage( $key );
-               }
-       }
 }
 ?>