* Restructured

diff --git a/languages/LanguageBn.php b/languages/LanguageBn.php
index 2e52651..d61c995 100644 (file)
--- a/languages/LanguageBn.php
+++ b/languages/LanguageBn.php
@@ -5,46 +5,54 @@
   * @subpackage Language
   */
 
-/** This is an UTF8 language */
 require_once( 'LanguageUtf8.php' );
 
-/* private */ $wgNamespaceNamesBn = array(
-       NS_SPECIAL  => 'বিশেষ',
-       NS_MAIN => '',
-       NS_TALK => 'আলাপ',
-       NS_USER => 'ব্যবহারকারী',
-       NS_USER_TALK => 'ব্যবহারকারী_আলাপ',
-       NS_PROJECT => $wgMetaNamespace,
-       NS_PROJECT_TALK => $wgMetaNamespace . '_আলাপ',
-       NS_IMAGE => 'চিত্র',
-       NS_IMAGE_TALK => 'চিত্র_আলাপ',
-       NS_MEDIAWIKI_TALK => 'MediaWik i_আলাপ',
-) + $wgNamespaceNamesEn;
-
-/* private */ $wgDateFormatsBn = array();
-
 if (!$wgCachedMessageArrays) {
        require_once('MessagesBn.php');
 }
 
 class LanguageBn extends LanguageUtf8 {
+       private $mMessagesBn, $mNamespaceNamesBn = null;
+
+       function __construct() {
+               parent::__construct();
+
+               global $wgAllMessagesBn;
+               $this->mMessagesBn =& $wgAllMessagesBn;
+
+               global $wgMetaNamespace;
+               $this->mNamespaceNamesBn = array(
+                       NS_SPECIAL        => 'বিশেষ',
+                       NS_MAIN           => '',
+                       NS_TALK           => 'আলাপ',
+                       NS_USER           => 'ব্যবহারকারী',
+                       NS_USER_TALK      => 'ব্যবহারকারী_আলাপ',
+                       NS_PROJECT        => $wgMetaNamespace,
+                       NS_PROJECT_TALK   => $wgMetaNamespace . '_আলাপ',
+                       NS_IMAGE          => 'চিত্র',
+                       NS_IMAGE_TALK     => 'চিত্র_আলাপ',
+                       NS_MEDIAWIKI_TALK => 'MediaWiki_আলাপ'
+               );
+       }
+
        function getNamespaces() {
-               global $wgNamespaceNamesBn;
-               return $wgNamespaceNamesBn;
+               return $this->mNamespaceNamesBn + parent::getNamespaces();
+       }
+
+       function getDateFormats() {
+               return false;
        }
 
        function getMessage( $key ) {
-               global $wgAllMessagesBn;
-               if(array_key_exists($key, $wgAllMessagesBn)) {
-                       return $wgAllMessagesBn[$key];
+               if( isset( $this->mMessagesBn[$key] ) ) {
+                       return $this->mMessagesBn[$key];
                } else {
                        return parent::getMessage( $key );
                }
        }
 
-       function getDateFormats() {
-               global $wgDateFormatsBn;
-               return $wgDateFormatsBn;
+       function getAllMessages() {
+               return $this->mMessagesBn;
        }
 
        function digitTransformTable() {

diff --git a/languages/MessagesBn.php b/languages/MessagesBn.php
index b88f84c..83b4a70 100644 (file)
--- a/languages/MessagesBn.php
+++ b/languages/MessagesBn.php
@@ -1,7 +1,7 @@
 <?php
 
-
-/* private */ $wgAllMessagesBn = array(
+global $wgAllMessagesBn;
+$wgAllMessagesBn = array(
 # Dates
 
 'sunday' => 'রবিবার',