From 1ebfd26c1f36c04ce783c3781dcf9cf8e2be9c85 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Sat, 1 Jul 2006 13:09:57 +0000
Subject: [PATCH] * Restructured

---
 languages/LanguageNv.php | 138 +++++++++++++++++----------------------
 1 file changed, 61 insertions(+), 77 deletions(-)

diff --git a/languages/LanguageNv.php b/languages/LanguageNv.php
index 2e398bc32b..28a924b007 100644
--- a/languages/LanguageNv.php
+++ b/languages/LanguageNv.php
@@ -1,101 +1,85 @@
 <?php
-/**
-  * @package MediaWiki
-  * @subpackage Language
-  */
+/** Navajo (Diné bizaad)
+ *
+ * @package MediaWiki
+ * @subpackage Language
+ */
 
-# Navajo language file
-# No messages at the moment, just all the other stuff
-
-require_once( "LanguageUtf8.php" );
-
-/* private */ $wgNamespaceNamesNv = array(
-	NS_MEDIA            => 'Media',
-	NS_SPECIAL          => 'Special',
-	NS_MAIN	            => '',
-	NS_TALK	            => 'Naaltsoos_baa_yinísht\'į́',
-	NS_USER             => 'Choinish\'įįhí',
-	NS_USER_TALK        => 'Choinish\'įįhí_baa_yinísht\'į́',
-	NS_PROJECT          => $wgMetaNamespace,
-	NS_PROJECT_TALK     => $wgMetaNamespace.'_baa_yinísht\'į́',
-	NS_IMAGE            => 'E\'elyaaígíí',
-	NS_IMAGE_TALK       => 'E\'elyaaígíí_baa_yinísht\'į́',
-	NS_MEDIAWIKI        => 'MediaWiki',
-	NS_MEDIAWIKI_TALK   => 'MediaWiki_baa_yinísht\'į́',
-	NS_TEMPLATE         => 'Template',
-	NS_TEMPLATE_TALK    => 'Template_talk',
-	NS_HELP             => 'Aná\'álwo\'',
-	NS_HELP_TALK        => 'Aná\'álwo\'_baa_yinísht\'į́',
-	NS_CATEGORY         => 'T\'ááłáhági_át\'éego',
-	NS_CATEGORY_TALK    => 'T\'ááłáhági_át\'éego_baa_yinísht\'į́'
-);
-
-
-/* private */ $wgSkinNamesNv = array(
-	'mono' => 'Łáa\'ígíí',
-	'monobook' => 'NaaltsoosŁáa\'ígíí'
-) + $wgSkinNamesEn;
-
-
-/* private */ $wgDateFormatsNv = array(
-#	'No preference',
-);
-
-/* private */ $wgWeekdayNamesNv = array(
-	'Damóogo', 'Damóo biiskání', 'Damóodóó naakiską́o', 'Damóodóó tágí jį́', 'Damóodóó dį́į́\' yiską́o',
-	'Nda\'iiníísh', 'Yiską́ damóo'
-);
-
-/* private */ $wgMonthNamesNv = array(
-	'Yas Niłt\'ees', 'Atsá Biyáázh', 'Wóózhch\'į́į́d', 'T\'ą́ą́chil', 'T\'ą́ą́tsoh', 'Ya\'iishjááshchilí',
-	'Ya\'iishjáástsoh', 'Bini\'ant\'ą́ą́ts\'ózí', 'Bini\'ant\'ą́ą́tsoh', 'Ghąąjį', 'Níłch\'its\'ósí',
-	'Níłch\'itsoh'
-);
-
-/* private */ $wgMonthAbbreviationsNv = array(
-	'Ynts', 'Atsb', 'Wozh', 'Tchi', 'Ttso', 'Yjsh', 'Yjts', 'Btsz',
-	'Btsx', 'Ghąj', 'Ntss', 'Ntsx'
-);
-
-#--------------------------------------------------------------------------
-# Internationalisation code
-#--------------------------------------------------------------------------
+require_once( 'LanguageUtf8.php' );
 
 class LanguageNv extends LanguageUtf8 {
+	private $mMessagesNv, $mNamespaceNamesNv = null;
+
+	private $mSkinNamesNv = array(
+		'mono' => 'Łáa\'ígíí',
+		'monobook' => 'NaaltsoosŁáa\'ígíí'
+	);
+	
+	private $mWeekdayNamesNv = array(
+		'Damóogo', 'Damóo biiskání', 'Damóodóó naakiską́o', 'Damóodóó tágí jį́', 'Damóodóó dį́į́\' yiską́o',
+		'Nda\'iiníísh', 'Yiską́ damóo'
+	);
+	
+	private $mMonthNamesNv = array(
+		'Yas Niłt\'ees', 'Atsá Biyáázh', 'Wóózhch\'į́į́d', 'T\'ą́ą́chil', 'T\'ą́ą́tsoh', 'Ya\'iishjááshchilí',
+		'Ya\'iishjáástsoh', 'Bini\'ant\'ą́ą́ts\'ózí', 'Bini\'ant\'ą́ą́tsoh', 'Ghąąjį', 'Níłch\'its\'ósí',
+		'Níłch\'itsoh'
+	);
+	
+	private $mMonthAbbreviationsNv = array(
+		'Ynts', 'Atsb', 'Wozh', 'Tchi', 'Ttso', 'Yjsh', 'Yjts', 'Btsz',
+		'Btsx', 'Ghąj', 'Ntss', 'Ntsx'
+	);
+
+	function __construct() {
+		parent::__construct();
+
+		global $wgMetaNamespace;
+		$this->mNamespaceNamesNv = array(
+			NS_MEDIA            => 'Media',
+			NS_SPECIAL          => 'Special',
+			NS_MAIN	            => '',
+			NS_TALK	            => 'Naaltsoos_baa_yinísht\'į́',
+			NS_USER             => 'Choinish\'įįhí',
+			NS_USER_TALK        => 'Choinish\'įįhí_baa_yinísht\'į́',
+			NS_PROJECT          => $wgMetaNamespace,
+			NS_PROJECT_TALK     => $wgMetaNamespace.'_baa_yinísht\'į́',
+			NS_IMAGE            => 'E\'elyaaígíí',
+			NS_IMAGE_TALK       => 'E\'elyaaígíí_baa_yinísht\'į́',
+			NS_MEDIAWIKI        => 'MediaWiki',
+			NS_MEDIAWIKI_TALK   => 'MediaWiki_baa_yinísht\'į́',
+			NS_TEMPLATE         => 'Template',
+			NS_TEMPLATE_TALK    => 'Template_talk',
+			NS_HELP             => 'Aná\'álwo\'',
+			NS_HELP_TALK        => 'Aná\'álwo\'_baa_yinísht\'į́',
+			NS_CATEGORY         => 'T\'ááłáhági_át\'éego',
+			NS_CATEGORY_TALK    => 'T\'ááłáhági_át\'éego_baa_yinísht\'į́'
+		);
+
+	}
 
 	function getNamespaces() {
-		global $wgNamespaceNamesNv;
-		return $wgNamespaceNamesNv;
+		return $this->mNamespaceNamesNv + parent::getNamespaces();
 	}
 
 	function getSkinNames() {
-		global $wgSkinNamesNv;
-		return $wgSkinNamesNv;
+		return $this->mSkinNamesNv;
 	}
 
 	function getDateFormats() {
-		global $wgDateFormatsNv;
-		return $wgDateFormatsNv;
+		return false;
 	}
 
 	function getMonthName( $key ) {
-		global $wgMonthNamesNv;
-		return $wgMonthNamesNv[$key-1];
-	}
-
-	/* by default we just return base form */
-	function getMonthNameGen( $key ) {
-		return $this->getMonthName( $key );
+		return $this->mMonthNamesNv[$key-1];
 	}
 
 	function getMonthAbbreviation( $key ) {
-		global $wgMonthAbbreviationsNv;
-		return @$wgMonthAbbreviationsNv[$key-1];
+		return @$this->mMonthAbbreviationsNv[$key-1];
 	}
 
 	function getWeekdayName( $key ) {
-		global $wgWeekdayNamesNv;
-		return $wgWeekdayNamesNv[$key-1];
+		return $this->mWeekdayNamesNv[$key-1];
 	}
 
 
-- 
2.20.1