From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sun, 25 Jun 2006 15:19:32 +0000 (+0000)
Subject: * Restructured
X-Git-Tag: 1.31.0-rc.0~56605
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=085e98f4d64af5a8e9b446af2010a5af8e63edf8;p=lhc%2Fweb%2Fwiklou.git

* Restructured
---

diff --git a/languages/LanguageFur.php b/languages/LanguageFur.php
index f58b205fa0..fa5ef4342c 100644
--- a/languages/LanguageFur.php
+++ b/languages/LanguageFur.php
@@ -1,93 +1,103 @@
 <?php
-/**
-  * @package MediaWiki
-  * @subpackage Language
-  */
+/** Friulian (Furlan)
+ *
+ * @package MediaWiki
+ * @subpackage Language
+ */
 
 require_once( 'LanguageUtf8.php' );
 
-/* private */ $wgNamespaceNamesFur = array(
-	NS_MEDIA			=> 'Media',
-	NS_SPECIAL			=> 'Speciâl',
-	NS_MAIN				=> '',
-	NS_TALK				=> 'Discussion',
-	NS_USER				=> 'Utent',
-	NS_USER_TALK			=> 'Discussion_utent',
-	NS_PROJECT			=> $wgMetaNamespace,
-	NS_PROJECT_TALK			=> 'Discussion_'.$wgMetaNamespace,
-	NS_IMAGE			=> 'Figure',
-	NS_IMAGE_TALK			=> 'Discussion_figure',
-	NS_MEDIAWIKI			=> 'MediaWiki',
-	NS_MEDIAWIKI_TALK		=> 'Discussion_MediaWiki',
-	NS_TEMPLATE			=> 'Model',
-	NS_TEMPLATE_TALK		=> 'Discussion_model',
-	NS_HELP				=> 'Jutori',
-	NS_HELP_TALK			=> 'Discussion_jutori',
-	NS_CATEGORY			=> 'Categorie',
-	NS_CATEGORY_TALK		=> 'Discussion_categorie'
-) + $wgNamespaceNamesEn;
-
-
-
-/* private */ $wgQuickbarSettingsFur = array(
-	'Nissune', 'Fis a Çampe', 'Fis a Drete', 'Flutuant a çampe'
-);
-
-/* private */ $wgSkinNamesFur = array(
-	'nostalgia'		=> 'Nostalgie',
-) + $wgSkinNamesEn;
-
 if (!$wgCachedMessageArrays) {
 	require_once('MessagesFur.php');
 }
 
 class LanguageFur extends LanguageUtf8 {
+	private $mMessagesFur, $mNamespaceNamesFur = null;
+
+	private $mQuickbarSettingsFur = array(
+		'Nissune', 'Fis a Çampe', 'Fis a Drete', 'Flutuant a çampe'
+	);
+	
+	private $mSkinNamesFur = array(
+		'nostalgia' => 'Nostalgie',
+	);
+
+	function __construct() {
+		parent::__construct();
+
+		global $wgAllMessagesFur;
+		$this->mMessagesFur =& $wgAllMessagesFur;
+
+		global $wgMetaNamespace;
+		$this->mNamespaceNamesFur = array(
+			NS_MEDIA          => 'Media',
+			NS_SPECIAL        => 'Speciâl',
+			NS_MAIN           => '',
+			NS_TALK           => 'Discussion',
+			NS_USER           => 'Utent',
+			NS_USER_TALK      => 'Discussion_utent',
+			NS_PROJECT        => $wgMetaNamespace,
+			NS_PROJECT_TALK   => 'Discussion_' . $wgMetaNamespace,
+			NS_IMAGE          => 'Figure',
+			NS_IMAGE_TALK     => 'Discussion_figure',
+			NS_MEDIAWIKI      => 'MediaWiki',
+			NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
+			NS_TEMPLATE       => 'Model',
+			NS_TEMPLATE_TALK  => 'Discussion_model',
+			NS_HELP	          => 'Jutori',
+			NS_HELP_TALK      => 'Discussion_jutori',
+			NS_CATEGORY       => 'Categorie',
+			NS_CATEGORY_TALK  => 'Discussion_categorie'
+		);
+
+	}
 
 	function getNamespaces() {
-		global $wgNamespaceNamesFur;
-		return $wgNamespaceNamesFur;
+		return $this->mNamespaceNamesFur + parent::getNamespaces();
 	}
 
 	function getQuickbarSettings() {
-		global $wgQuickbarSettingsFur;
-		return $wgQuickbarSettingsFur;
+		return $this->mQuickbarSettingsFur;
 	}
 
 	function getSkinNames() {
-		global $wgSkinNamesFur;
-		return $wgSkinNamesFur;
+		return $this->mSkinNamesFur + parent::getSkinNames();
 	}
 
-
 	function getDateFormats() {
 		return false;
 	}
 
+	function getMessage( $key ) {
+		if( isset( $this->mMessagesFur[$key] ) ) {
+			return $this->mMessagesFur[$key];
+		} else {
+			return parent::getMessage( $key );
+		}
+	}
+
+	function getAllMessages() {
+		return $this->mMessagesFur;
+	}
 
-	function date( $ts, $adj = false ) {
-		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
+	function timeDateSeparator( $format ) {
+		return ' a lis ';
+	}
 
-		$d = (0 + substr( $ts, 6, 2 )) . " di " .
-		  $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
-		  " " . substr( $ts, 0, 4 );
-		return $d;
+	function timeBeforeDate() {
+		return false;
 	}
 
-	function timeanddate( $ts, $adj = false ) {
-		return $this->date( $ts, $adj ) . " a lis " . $this->time( $ts, $adj );
+	function formatMonth( $month, $format ) {
+		return $this->getMonthAbbreviation( $month );
 	}
 
-	function separatorTransformTable() {
-		return array(',' => "\xc2\xa0", '.' => ',' );
+	function formatDay( $day, $format ) {
+		return $this->formatNum( 0 + $day, true ) . ' di ';
 	}
 
-	function getMessage( $key ) {
-		global $wgAllMessagesFur;
-		if( isset( $wgAllMessagesFur[$key] ) ) {
-			return $wgAllMessagesFur[$key];
-		} else {
-			return parent::getMessage( $key );
-		}
+	function separatorTransformTable() {
+		return array(',' => "\xc2\xa0", '.' => ',' );
 	}
 
 }
diff --git a/languages/MessagesFur.php b/languages/MessagesFur.php
index a4f8607f93..8c653ff3e0 100644
--- a/languages/MessagesFur.php
+++ b/languages/MessagesFur.php
@@ -1,6 +1,6 @@
 <?php
 
-
+global $wgAllMessagesFur;
 $wgAllMessagesFur = array(
 '1movedto2'		=> "$1 movût in $2",
 'about' => "Informazions",
@@ -278,7 +278,6 @@ cheste vecje version, (rip) = torne a ripristinâ cheste vecje version.
 'linklistsub' => "(Liste di leams)",
 'linkshere' => "Lis pagjinis ca sot a son leadis a cheste:",
 'linkstoimage' => "Lis pagjinis ca sot a son leadis a cheste figure:",
-'linktrail' => "/^([a-z]+)(.*)$/sD",
 'listingcontinuesabbrev' => " cont.",
 'listredirects' => 'Liste des redirezions',
 'listusers' => "Liste dai utents",