From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Wed, 7 Jun 2006 20:36:39 +0000 (+0000)
Subject: * Restructured
X-Git-Tag: 1.31.0-rc.0~56842
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=551d63cc68e476f4ca809c0eefbb7dd69106d3a6;p=lhc%2Fweb%2Fwiklou.git

* Restructured
---

diff --git a/languages/LanguageAf.php b/languages/LanguageAf.php
index d7822c25c9..14414d423d 100644
--- a/languages/LanguageAf.php
+++ b/languages/LanguageAf.php
@@ -7,68 +7,77 @@
 
 require_once( 'LanguageUtf8.php' );
 
-/* private */ $wgNamespaceNamesAf = array(
-	NS_MEDIA		=> "Media",
-	NS_SPECIAL		=> "Spesiaal",
-	NS_MAIN			=> "",
-	NS_TALK			=> "Bespreking",
-	NS_USER			=> "Gebruiker",
-	NS_USER_TALK		=> "Gebruikerbespreking",
-	NS_PROJECT		=> $wgMetaNamespace,
-	NS_PROJECT_TALK		=> $wgMetaNamespace."bespreking",
-	NS_IMAGE		=> "Beeld",
-	NS_IMAGE_TALK		=> "Beeldbespreking",
-	NS_MEDIAWIKI		=> "MediaWiki",
-	NS_MEDIAWIKI_TALK	=> "MediaWikibespreking",
-	NS_TEMPLATE		=> 'Sjabloon',
-	NS_TEMPLATE_TALK	=> 'Sjabloonbespreking',
-	NS_HELP			=> 'Hulp',
-	NS_HELP_TALK		=> 'Hulpbespreking',
-	NS_CATEGORY		=> 'Kategorie',
-	NS_CATEGORY_TALK	=> 'Kategoriebespreking'
-) + $wgNamespaceNamesEn;
-
-/* private */ $wgQuickbarSettingsAf = array(
-	"Geen.", "Links vas.", "Regs vas.", "Dryf links."
-);
-
-/* private */ $wgSkinNamesAf = array(
-	'standard' => "Standaard",
-	'nostalgia' => "Nostalgie",
-	'cologneblue' => "Keulen blou",
-) + $wgSkinNamesEn;
-
 if (!$wgCachedMessageArrays) {
 	require_once('MessagesAf.php');
 }
 
-
 class LanguageAf extends LanguageUtf8 {
+	private $mMessagesAf, $mNamespaceNamesAf = null;
+
+	private $mQuickbarSettingsAf = array(
+		"Geen.", "Links vas.", "Regs vas.", "Dryf links."
+	);
+	
+	private $mSkinNamesAf = array(
+		'standard' => "Standaard",
+		'nostalgia' => "Nostalgie",
+		'cologneblue' => "Keulen blou",
+	);
+
+	function LanguageAf() {
+		LanguageUtf8::LanguageUtf8();
+
+		global $wgAllMessagesAf;
+		$this->mMessagesAf =& $wgAllMessagesAf;
+
+		global $wgMetaNamespace;
+		$this->mNamespaceNamesAf = array(
+			NS_MEDIA          => "Media",
+			NS_SPECIAL        => "Spesiaal",
+			NS_MAIN           => "",
+			NS_TALK           => "Bespreking",
+			NS_USER           => "Gebruiker",
+			NS_USER_TALK      => "Gebruikerbespreking",
+			NS_PROJECT        => $wgMetaNamespace,
+			NS_PROJECT_TALK   => $wgMetaNamespace."bespreking",
+			NS_IMAGE          => "Beeld",
+			NS_IMAGE_TALK     => "Beeldbespreking",
+			NS_MEDIAWIKI      => "MediaWiki",
+			NS_MEDIAWIKI_TALK => "MediaWikibespreking",
+			NS_TEMPLATE       => 'Sjabloon',
+			NS_TEMPLATE_TALK  => 'Sjabloonbespreking',
+			NS_HELP           => 'Hulp',
+			NS_HELP_TALK      => 'Hulpbespreking',
+			NS_CATEGORY       => 'Kategorie',
+			NS_CATEGORY_TALK  => 'Kategoriebespreking'
+		);
+
+	}
 
 	function getNamespaces() {
-		global $wgNamespaceNamesAf;
-		return $wgNamespaceNamesAf;
+		return $this->mNamespaceNamesAf + parent::getNamespaces();
 	}
 
 	function getQuickbarSettings() {
-		global $wgQuickbarSettingsAf;
-		return $wgQuickbarSettingsAf;
+		return $this->mQuickbarSettingsAf;
 	}
 
 	function getSkinNames() {
-		global $wgSkinNamesAf;
-		return $wgSkinNamesAf;
+		return $this->mSkinNamesAf + parent::getSkinNames();
 	}
 
 	function getMessage( $key ) {
-		global $wgAllMessagesAf;
-		if( isset( $wgAllMessagesAf[$key] ) ) {
-			return $wgAllMessagesAf[$key];
+		if( isset( $this->mMessagesAf[$key] ) ) {
+			return $this->mMessagesAf[$key];
 		} else {
 			return parent::getMessage( $key );
 		}
 	}
 
+	function getAllMessages() {
+		return $this->mMessagesAf;
+	}
+
 	# South Africa uses space for thousands and comma for decimal
 	# Reference: AWS Reël 7.4 p. 52, 2002 edition
 	# glibc is wrong in this respect in some versions