From 50a6204c47aad4b6822193ddd6058a61d34c6720 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Sun, 25 Jun 2006 14:58:03 +0000
Subject: [PATCH] * Restructured

---
 languages/LanguageFo.php | 133 ++++++++++++++++++++-------------------
 languages/MessagesFo.php |   4 +-
 2 files changed, 72 insertions(+), 65 deletions(-)

diff --git a/languages/LanguageFo.php b/languages/LanguageFo.php
index 183222fb92..6df7bd7340 100644
--- a/languages/LanguageFo.php
+++ b/languages/LanguageFo.php
@@ -4,97 +4,104 @@
   * @package MediaWiki
   * @subpackage Language
   */
-require_once( 'LanguageUtf8.php');
 
-/* private */ $wgNamespaceNamesFo = array(
-	NS_MEDIA            => "Miðil",
-	NS_SPECIAL          => "Serstakur",
-	NS_MAIN             => "",
-	NS_TALK             => "Kjak",
-	NS_USER             => "Brúkari",
-	NS_USER_TALK        => "Brúkari_kjak",
-	NS_PROJECT          => $wgMetaNamespace,
-	NS_PROJECT_TALK     => $wgMetaNamespace . '_kjak',
-	NS_IMAGE            => "Mynd",
-	NS_IMAGE_TALK       => "Mynd_kjak",
-	NS_MEDIAWIKI        => "MidiaWiki",
-	NS_MEDIAWIKI_TALK   => "MidiaWiki_kjak",
-	NS_TEMPLATE         => "Fyrimynd",
-	NS_TEMPLATE_TALK    => "Fyrimynd_kjak",
-	NS_HELP             => "Hjálp",
-	NS_HELP_TALK        => "Hjálp_kjak",
-	NS_CATEGORY         => "Bólkur",
-	NS_CATEGORY_TALK    => "Bólkur_kjak"
-) + $wgNamespaceNamesEn;
-
-/* private */ $wgQuickbarSettingsFo = array(
-	"Eingin", "Fast vinstru", "Fast høgru", "Flótandi vinstru"
-);
-
-/* private */ $wgSkinNamesFo = array(
-	"Standardur", "Nostalgiskur", "Cologne-bláur", "Paddington", "Montparnasse"
-);
-
-/* private */ $wgDateFormatsFo = array(
-#	"Ongi forrættindi",
-);
-
-/* private */ $wgBookstoreListFo = array(
-	"Bokasolan.fo" => "http://www.bokasolan.fo/vleitari.asp?haattur=bok.alfa&Heiti=&Hovindur=&Forlag=&innbinding=Oell&bolkur=Allir&prisur=Allir&Aarstal=Oell&mal=Oell&status=Oell&ISBN=$1",
-) + $wgBookstoreListEn;
+require_once( 'LanguageUtf8.php');
 
 if (!$wgCachedMessageArrays) {
 	require_once('MessagesFo.php');
 }
 
 class LanguageFo extends LanguageUtf8 {
+	private $mMessagesFo, $mNamespaceNamesFo = null;
+	
+	private $mQuickbarSettingsFo = array(
+		'Eingin', 'Fast vinstru', 'Fast høgru', 'Flótandi vinstru'
+	);
+	
+	private $mSkinNamesFo = array(
+		'Standardur', 'Nostalgiskur', 'Cologne-bláur', 'Paddington', 'Montparnasse'
+	);
+	
+	private $mBookstoreListFo = array(
+		'Bokasolan.fo' => 'http://www.bokasolan.fo/vleitari.asp?haattur=bok.alfa&Heiti=&Hovindur=&Forlag=&innbinding=Oell&bolkur=Allir&prisur=Allir&Aarstal=Oell&mal=Oell&status=Oell&ISBN=$1',
+	);
+
+	function __construct() {
+		parent::__construct();
+
+		global $wgAllMessagesFo;
+		$this->mMessagesFo =& $wgAllMessagesFo;
+
+		global $wgMetaNamespace;
+		$this->mNamespaceNamesFo = array(
+			NS_MEDIA            => 'Miðil',
+			NS_SPECIAL          => 'Serstakur',
+			NS_MAIN             => '',
+			NS_TALK             => 'Kjak',
+			NS_USER             => 'Brúkari',
+			NS_USER_TALK        => 'Brúkari_kjak',
+			NS_PROJECT          => $wgMetaNamespace,
+			NS_PROJECT_TALK     => $wgMetaNamespace . '_kjak',
+			NS_IMAGE            => 'Mynd',
+			NS_IMAGE_TALK       => 'Mynd_kjak',
+			NS_MEDIAWIKI        => 'MidiaWiki',
+			NS_MEDIAWIKI_TALK   => 'MidiaWiki_kjak',
+			NS_TEMPLATE         => 'Fyrimynd',
+			NS_TEMPLATE_TALK    => 'Fyrimynd_kjak',
+			NS_HELP             => 'Hjálp',
+			NS_HELP_TALK        => 'Hjálp_kjak',
+			NS_CATEGORY         => 'Bólkur',
+			NS_CATEGORY_TALK    => 'Bólkur_kjak'
+		);
 
-	function getBookstoreList () {
-		global $wgBookstoreListFo ;
-		return $wgBookstoreListFo ;
 	}
 
 	function getNamespaces() {
-		global $wgNamespaceNamesFo;
-		return $wgNamespaceNamesFo;
+		return $this->mNamespaceNamesFo + parent::getNamespaces();
 	}
 
 	function getQuickbarSettings() {
-		global $wgQuickbarSettingsFo;
-		return $wgQuickbarSettingsFo;
+		return $this->mQuickbarSettingsFo;
 	}
 
 	function getSkinNames() {
-		global $wgSkinNamesFo;
-		return $wgSkinNamesFo;
+		return $this->mSkinNamesFo + parent::getSkinNames();
+	}
+
+	function getBookstoreList() {
+		return $this->mBookstoreListFo + parent::getBookstoreList();
 	}
 
 	function getDateFormats() {
-		global $wgDateFormatsFo;
-		return $wgDateFormatsFo;
+		return false;
 	}
 
+	function getMessage( $key ) {
+		if( isset( $this->mMessagesFo[$key] ) ) {
+			return $this->mMessagesFo[$key];
+		} else {
+			return parent::getMessage( $key );
+		}
+	}
 
-	function date( $ts, $adj = false ) {
-		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
+	function getAllMessages() {
+		return $this->mMessagesFo;
+	}
 
-		$d = (0 + substr( $ts, 6, 2 )) . ". " .
-		  $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) . " " .
-		  substr( $ts, 0, 4 );
-		return $d;
+	function timeDateSeparator( $format ) {
+		return ' kl. ';
 	}
 
-	function timeanddate( $ts, $adj = false ) {
-		return $this->date( $ts, $adj ) . " kl. " . $this->time( $ts, $adj );
+	function timeBeforeDate() {
+		return false;
 	}
 
-	function getMessage( $key ) {
-		global $wgAllMessagesFo;
-		if( isset( $wgAllMessagesFo[$key] ) ) {
-			return $wgAllMessagesFo[$key];
-		} else {
-			return parent::getMessage( $key );
-		}
+	function formatMonth( $month, $format ) {
+		return $this->getMonthAbbreviation( $month );
+	}
+
+	function formatDay( $day, $format ) {
+		return $this->formatNum( 0 + $day, true ) . '.';
 	}
 
 }
diff --git a/languages/MessagesFo.php b/languages/MessagesFo.php
index 259edf40c9..66953ca436 100644
--- a/languages/MessagesFo.php
+++ b/languages/MessagesFo.php
@@ -1,7 +1,7 @@
 <?php
 
-
-/* private */ $wgAllMessagesFo = array(
+global $wgAllMessagesFo;
+$wgAllMessagesFo = array(
 
 # User toggles
 "tog-underline"	   => "Undurstrika ávísingar",
-- 
2.20.1