From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Fri, 23 Jun 2006 21:11:16 +0000 (+0000)
Subject: * Restructured
X-Git-Tag: 1.31.0-rc.0~56668
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=80046746f02a0b4a69ef46fb562e897a30aeb820;p=lhc%2Fweb%2Fwiklou.git

* Restructured
---

diff --git a/languages/LanguageCv.php b/languages/LanguageCv.php
index 88ca347b8b..7cf4b2450d 100644
--- a/languages/LanguageCv.php
+++ b/languages/LanguageCv.php
@@ -1,56 +1,73 @@
 <?php
-/**
-  * @package MediaWiki
-  * @subpackage Language
-  */
+/** Chuvash (Чăвашла)
+ *
+ * @package MediaWiki
+ * @subpackage Language
+ */
+
 # Chuvash stub localization; default to Russian instead of English.
 
 # Cyrillic chars:   Ӑӑ Ӗӗ Ҫҫ Ӳӳ
 # Latin substitute: Ăă Ĕĕ Çç Ÿÿ
 # Where are latin substitute in this file because of font problems.
 
-
 require_once( "LanguageRu.php" );
 
-/* private */ $wgNamespaceNamesCv = array(
-	NS_MEDIA            => 'Медиа',
-	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        => 'MediaWiki',
-	NS_MEDIAWIKI_TALK   => 'MediaWiki_сӳтсе_явмалли',
-	NS_TEMPLATE         => 'Шаблон',
-	NS_TEMPLATE_TALK    => 'Шаблона_сӳтсе_явмалли',
-	NS_HELP             => 'Пулăшу',
-	NS_HELP_TALK        => 'Пулăшăва_сӳтсе_явмалли',
-	NS_CATEGORY         => 'Категори',
-	NS_CATEGORY_TALK    => 'Категорине_сӳтсе_явмалли',
-) + $wgNamespaceNamesEn;
-
 if (!$wgCachedMessageArrays) {
 	require_once('MessagesCv.php');
 }
 
 class LanguageCv extends LanguageRu {
-	function LanguageCv() {
-		global $wgNamespaceNamesCv, $wgMetaNamespace;
-		LanguageUtf8::LanguageUtf8();
+	private $mMessagesCv, $mNamespaceNamesCv = null;
+
+	function __construct() {
+		parent::__construct();
+
+		global $wgAllMessagesCv;
+		$this->mMessagesCv =& $wgAllMessagesCv;
+
+		global $wgMetaNamespace;
+		$this->mNamespaceNamesCv = array(
+			NS_MEDIA            => 'Медиа',
+			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        => 'MediaWiki',
+			NS_MEDIAWIKI_TALK   => 'MediaWiki_сӳтсе_явмалли',
+			NS_TEMPLATE         => 'Шаблон',
+			NS_TEMPLATE_TALK    => 'Шаблона_сӳтсе_явмалли',
+			NS_HELP             => 'Пулăшу',
+			NS_HELP_TALK        => 'Пулăшăва_сӳтсе_явмалли',
+			NS_CATEGORY         => 'Категори',
+			NS_CATEGORY_TALK    => 'Категорине_сӳтсе_явмалли',
+		);
+
 	}
 
 	function getNamespaces() {
-		global $wgNamespaceNamesCv;
-		return $wgNamespaceNamesCv;
+		return $this->mNamespaceNamesCv + parent::getNamespaces();
 	}
 
 	function getMessage( $key ) {
-		global $wgAllMessagesCv;
-		return isset($wgAllMessagesCv[$key]) ? $wgAllMessagesCv[$key] : parent::getMessage($key);
+		if( isset( $this->mMessagesCv[$key] ) ) {
+			return $this->mMessagesCv[$key];
+		} else {
+			return parent::getMessage( $key );
+		}
+	}
+
+	function getAllMessages() {
+		return $this->mMessagesCv;
+	}
+
+	function getFallbackLanguage() {
+		return 'ru';
 	}
 
 	function date( $ts, $adj = false, $format = true, $timecorrection = false ) {
diff --git a/languages/MessagesCv.php b/languages/MessagesCv.php
index 7e7eaa1cc8..9a000990d1 100644
--- a/languages/MessagesCv.php
+++ b/languages/MessagesCv.php
@@ -1,6 +1,7 @@
 <?php
 
-/* private */ $wgAllMessagesCv = array(
+global $wgAllMessagesCv;
+$wgAllMessagesCv = array(
 
 'Monobook.js' => '/* tooltips and access keys */
 ta = new Object();