From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Wed, 21 Jun 2006 17:30:16 +0000 (+0000)
Subject: * Restructured
X-Git-Tag: 1.31.0-rc.0~56706
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=7c4bfb979ec31602271873206503f1e1dec345d3;p=lhc%2Fweb%2Fwiklou.git

* Restructured
---

diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index 33f78daf72..b9c262a6b3 100644
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -1,70 +1,98 @@
 <?php
-/**
-  * @package MediaWiki
-  * @subpackage Language
-  */
+/** French (Français)
+ *
+ * @package MediaWiki
+ * @subpackage Language
+ *
+ */
 
 require_once( 'LanguageUtf8.php' );
 
-/* private */ $wgNamespaceNamesFr = array(
-	NS_MEDIA			=> 'Media',
-	NS_SPECIAL			=> 'Special',
-	NS_MAIN				=> '',
-	NS_TALK				=> 'Discuter',
-	NS_USER				=> 'Utilisateur',
-	NS_USER_TALK		=> 'Discussion_Utilisateur',
-	NS_PROJECT			=> $wgMetaNamespace,
-	NS_PROJECT_TALK		=> 'Discussion_'.$wgMetaNamespace,
-	NS_IMAGE			=> 'Image',
-	NS_IMAGE_TALK		=> 'Discussion_Image',
-	NS_MEDIAWIKI		=> 'MediaWiki',
-	NS_MEDIAWIKI_TALK	=> 'Discussion_MediaWiki',
-	NS_TEMPLATE			=> 'Modèle',
-	NS_TEMPLATE_TALK	=> 'Discussion_Modèle',
-	NS_HELP				=> 'Aide',
-	NS_HELP_TALK		=> 'Discussion_Aide',
-	NS_CATEGORY			=> 'Catégorie',
-	NS_CATEGORY_TALK	=> 'Discussion_Catégorie'
-) + $wgNamespaceNamesEn;
-
-/* private */ $wgQuickbarSettingsFr = array(
-	'Aucune', 'Gauche', 'Droite', 'Flottante à gauche'
-);
-
-/* private */ $wgSkinNamesFr = array(
-	'standard'		=> 'Standard',
-	'nostalgia'		=> 'Nostalgie',
-) + $wgSkinNamesEn;
-
-
-
-/* private */ $wgBookstoreListFr = array(
-	'Amazon.fr'		=> 'http://www.amazon.fr/exec/obidos/ISBN=$1',
-	'alapage.fr'	=> 'http://www.alapage.com/mx/?tp=F&type=101&l_isbn=$1&donnee_appel=ALASQ&devise=&',
-	'fnac.com'		=> 'http://www3.fnac.com/advanced/book.do?isbn=$1',
-	'chapitre.com'	=> 'http://www.chapitre.com/frame_rec.asp?isbn=$1',
-);
-
 if (!$wgCachedMessageArrays) {
 	require_once('MessagesFr.php');
 }
 
 class LanguageFr extends LanguageUtf8 {
+	private $mMessagesFr, $mNamespaceNamesFr = null;
+
+	private $mQuickbarSettingsFr = array(
+		'Aucune', 'Gauche', 'Droite', 'Flottante à gauche'
+	);
+	
+	private $mSkinNamesFr = array(
+		'standard'  => 'Standard',
+		'nostalgia' => 'Nostalgie',
+	);
+	
+	private $mBookstoreListFr = array(
+		'Amazon.fr'    => 'http://www.amazon.fr/exec/obidos/ISBN=$1',
+		'alapage.fr'   => 'http://www.alapage.com/mx/?tp=F&type=101&l_isbn=$1&donnee_appel=ALASQ&devise=&',
+		'fnac.com'     => 'http://www3.fnac.com/advanced/book.do?isbn=$1',
+		'chapitre.com' => 'http://www.chapitre.com/frame_rec.asp?isbn=$1',
+	);
+
+	function __construct() {
+		parent::__construct();
+
+		global $wgAllMessagesFr;
+		$this->mMessagesFr =& $wgAllMessagesFr;
+
+		global $wgMetaNamespace;
+		$this->mNamespaceNamesFr = array(
+			NS_MEDIA          => 'Media',
+			NS_SPECIAL        => 'Special',
+			NS_MAIN           => '',
+			NS_TALK           => 'Discuter',
+			NS_USER           => 'Utilisateur',
+			NS_USER_TALK      => 'Discussion_Utilisateur',
+			NS_PROJECT        => $wgMetaNamespace,
+			NS_PROJECT_TALK   => 'Discussion_' . $wgMetaNamespace,
+			NS_IMAGE          => 'Image',
+			NS_IMAGE_TALK     => 'Discussion_Image',
+			NS_MEDIAWIKI      => 'MediaWiki',
+			NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
+			NS_TEMPLATE       => 'Modèle',
+			NS_TEMPLATE_TALK  => 'Discussion_Modèle',
+			NS_HELP           => 'Aide',
+			NS_HELP_TALK      => 'Discussion_Aide',
+			NS_CATEGORY       => 'Catégorie',
+			NS_CATEGORY_TALK  => 'Discussion_Catégorie'
+		);
 
-	function getBookstoreList () {
-		global $wgBookstoreListFr ;
-		return $wgBookstoreListFr ;
 	}
 
 	function getNamespaces() {
-		global $wgNamespaceNamesFr;
-		return $wgNamespaceNamesFr;
+		return $this->mNamespaceNamesFr + parent::getNamespaces();
+	}
+
+	function getQuickbarSettings() {
+		return $this->mQuickbarSettingsFr;
+	}
+
+	function getSkinNames() {
+		return $this->mSkinNamesFr + parent::getSkinNames();
+	}
+
+	function getBookstoreList() {
+		return $this->mBookstoreListFr;
+	}
+
+	function getMessage( $key ) {
+		if( isset( $this->mMessagesFr[$key] ) ) {
+			return $this->mMessagesFr[$key];
+		} else {
+			return parent::getMessage( $key );
+		}
+	}
+
+	function getAllMessages() {
+		return $this->mMessagesFr;
 	}
 
 	function getNsIndex( $text ) {
-		global $wgNamespaceNamesFr, $wgSitename;
+		global $wgSitename;
 
-		foreach ( $wgNamespaceNamesFr as $i => $n ) {
+		foreach ( $this->mNamespaceNamesFr as $i => $n ) {
 			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
 		}
 		if( $wgSitename == 'Wikipédia' ) {
@@ -74,16 +102,6 @@ class LanguageFr extends LanguageUtf8 {
 		return false;
 	}
 
-	function getQuickbarSettings() {
-		global $wgQuickbarSettingsFr;
-		return $wgQuickbarSettingsFr;
-	}
-
-	function getSkinNames() {
-		global $wgSkinNamesFr;
-		return $wgSkinNamesFr;
-	}
-
 	function timeBeforeDate( $format ) {
 		return false;
 	}
@@ -96,15 +114,6 @@ class LanguageFr extends LanguageUtf8 {
 		return array(',' => "\xc2\xa0", '.' => ',' );
 	}
 
-	function getMessage( $key ) {
-		global $wgAllMessagesFr;
-		if( isset( $wgAllMessagesFr[$key] ) ) {
-			return $wgAllMessagesFr[$key];
-		} else {
-			return parent::getMessage( $key );
-		}
-	}
-
 }
 
 ?>
diff --git a/languages/MessagesFr.php b/languages/MessagesFr.php
index 7ec82aeb29..bda6aec100 100644
--- a/languages/MessagesFr.php
+++ b/languages/MessagesFr.php
@@ -1,7 +1,7 @@
 <?php
 
-
-/* private */ $wgAllMessagesFr = array(
+global $wgAllMessagesFr;
+$wgAllMessagesFr = array(
 
 # User preference Toggles