* Restructured

diff --git a/languages/LanguageLt.php b/languages/LanguageLt.php
index 483df2b..688dfa0 100644 (file)
--- a/languages/LanguageLt.php
+++ b/languages/LanguageLt.php
@@ -1,91 +1,94 @@
 <?php
-/**
-  * @package MediaWiki
-  * @subpackage Language
-  */
+/** Lithuanian (Lietuvių)
+ *
+ * @package MediaWiki
+ * @subpackage Language
+ *
+ */
 
-require_once( "LanguageUtf8.php" );
-
-/* private */ $wgNamespaceNamesLt = array(
-       NS_MEDIA            => 'Medija',
-       NS_SPECIAL          => 'Specialus',
-       NS_MAIN             => '',
-       NS_TALK             => 'Aptarimas',
-       NS_USER             => 'Naudotojas',
-       NS_USER_TALK        => 'Naudotojo_aptarimas',
-       NS_PROJECT          => $wgMetaNamespace,
-       NS_PROJECT_TALK     => $wgMetaNamespace.'_aptarimas',
-       NS_IMAGE            => 'Vaizdas',
-       NS_IMAGE_TALK       => 'Vaizdo_aptarimas',
-       NS_MEDIAWIKI        => 'MediaWiki',
-       NS_MEDIAWIKI_TALK   => 'MediaWiki_aptarimas',
-       NS_TEMPLATE         => 'Šablonas',
-       NS_TEMPLATE_TALK    => 'Šablono_aptarimas',
-       NS_HELP             => 'Pagalba',
-       NS_HELP_TALK        => 'Pagalbos_aptarimas',
-       NS_CATEGORY         => 'Kategorija',
-       NS_CATEGORY_TALK    => 'Kategorijos_aptarimas',
-);
-
-/* private */ $wgQuickbarSettingsLt = array(
-       "Nerodyti", "Fiksuoti kairėje", "Fiksuoti dešinėje", "Plaukiojantis kairėje"
-);
-
-/* private */ $wgSkinNamesLt = array(
-       'standard' => 'Standartinė',
-       'nostalgia' => 'Nostalgija',
-       'cologneblue' => 'Kiolno Mėlyna',
-       'davinci' => 'Da Vinči',
-       'mono' => 'Mono',
-       'monobook' => 'MonoBook',
-       'myskin' => 'MySkin',
-       'chick' => 'Chick'
-) + $wgSkinNamesEn;
+require_once( 'LanguageUtf8.php' );
 
 if (!$wgCachedMessageArrays) {
        require_once('MessagesLt.php');
 }
 
-#--------------------------------------------------------------------------
-# Internationalisation code
-#--------------------------------------------------------------------------
+class LanguageLt extends LanguageUtf8 {
+       private $mMessagesLt, $mNamespaceNamesLt = null;
 
-class LanguageLt extends LanguageUtf8  {
-       # Inherent default user options unless customization is desired
+       function __construct() {
+               parent::__construct();
+
+               global $wgAllMessagesLt;
+               $this->mMessagesLt =& $wgAllMessagesLt;
+
+               global $wgMetaNamespace;
+               $this->mNamespaceNamesLt = array(
+                       NS_MEDIA            => 'Medija',
+                       NS_SPECIAL          => 'Specialus',
+                       NS_MAIN             => '',
+                       NS_TALK             => 'Aptarimas',
+                       NS_USER             => 'Naudotojas',
+                       NS_USER_TALK        => 'Naudotojo_aptarimas',
+                       NS_PROJECT          => $wgMetaNamespace,
+                       NS_PROJECT_TALK     => $wgMetaNamespace . '_aptarimas',
+                       NS_IMAGE            => 'Vaizdas',
+                       NS_IMAGE_TALK       => 'Vaizdo_aptarimas',
+                       NS_MEDIAWIKI        => 'MediaWiki',
+                       NS_MEDIAWIKI_TALK   => 'MediaWiki_aptarimas',
+                       NS_TEMPLATE         => 'Šablonas',
+                       NS_TEMPLATE_TALK    => 'Šablono_aptarimas',
+                       NS_HELP             => 'Pagalba',
+                       NS_HELP_TALK        => 'Pagalbos_aptarimas',
+                       NS_CATEGORY         => 'Kategorija',
+                       NS_CATEGORY_TALK    => 'Kategorijos_aptarimas',
+               );
 
-       function getQuickbarSettings() {
-               global $wgQuickbarSettingsLt;
-               return $wgQuickbarSettingsLt;
        }
+       
+       private $mQuickbarSettingsLt = array(
+               'Nerodyti', 'Fiksuoti kairėje', 'Fiksuoti dešinėje', 'Plaukiojantis kairėje'
+       );
+       
+       private $mSkinNamesLt = array(
+               'standard' => 'Standartinė',
+               'nostalgia' => 'Nostalgija',
+               'cologneblue' => 'Kiolno Mėlyna',
+               'davinci' => 'Da Vinči',
+               'mono' => 'Mono',
+               'monobook' => 'MonoBook',
+               'myskin' => 'MySkin',
+               'chick' => 'Chick'
+       );
 
        function getNamespaces() {
-               global $wgNamespaceNamesLt;
-               return $wgNamespaceNamesLt;
+               return $this->mNamespaceNamesLt + parent::getNamespaces();
        }
 
-       function getSkinNames() {
-               global $wgSkinNamesLt;
-               return $wgSkinNamesLt;
+       function getQuickbarSettings() {
+               return $this->mQuickbarSettingsLt;
        }
 
-       function fallback8bitEncoding() {
-               return "windows-1257";
+       function getSkinNames() {
+               return $this->mSkinNamesLt + parent::getSkinNames();
        }
 
        function getMessage( $key ) {
-               global $wgAllMessagesLt;
-
-               if(array_key_exists($key, $wgAllMessagesLt))
-                       return $wgAllMessagesLt[$key];
-               else
-                       return parent::getMessage($key);
+               if( isset( $this->mMessagesLt[$key] ) ) {
+                       return $this->mMessagesLt[$key];
+               } else {
+                       return parent::getMessage( $key );
+               }
        }
 
        function getAllMessages() {
-               global $wgAllMessagesLt;
-               return $wgAllMessagesLt;
+               return $this->mMessagesLt;
        }
 
+       function fallback8bitEncoding() {
+               return 'windows-1257';
+       }
+
+
        function separatorTransformTable() {
                return array(',' => ' ', '.' => ',' );
        }

diff --git a/languages/MessagesLt.php b/languages/MessagesLt.php
index 8b69e8f..f00281f 100644 (file)
--- a/languages/MessagesLt.php
+++ b/languages/MessagesLt.php
@@ -2,6 +2,7 @@
 
 /* Messages for LanguageLt */
 
+global $wgAllMessagesLt;
 $wgAllMessagesLt = array(
 '1movedto2' => 'Straipsnis \'$1\' pervadintas į \'$2\'',
 '1movedto2_redir' => '\'$1\' pervadintas į \'$2\' (anksčiau buvo nukreipiamasis)',