From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Tue, 6 Jun 2006 21:43:47 +0000 (+0000)
Subject: * Reformat (fixes bug 6206)
X-Git-Tag: 1.31.0-rc.0~56865
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=078c940e0b9683d0f87a61234308f0eb9a479c93;p=lhc%2Fweb%2Fwiklou.git

* Reformat (fixes bug 6206)
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b2c0d1a04a..44b688c3d7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -442,6 +442,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6197) Update to Indonesian translation (id) #19
 * (bug 6175) Improvement to German translation (de)
 * Redirect Special:Logs to Special:Log
+* (bug 6206) Linktrail for Swedish localization (se)
+
 
 == Compatibility ==
 
diff --git a/languages/LanguageSv.php b/languages/LanguageSv.php
index 02c73297c4..305212b959 100644
--- a/languages/LanguageSv.php
+++ b/languages/LanguageSv.php
@@ -1,75 +1,101 @@
 <?php
 /**
-  * @package MediaWiki
-  * @subpackage Language
-  */
-#
-# Swedish localisation for MediaWiki
-#
+ * Swedish (Svenska)
+ *
+ * @package MediaWiki
+ * @subpackage Language
+ */
 
 require_once( "LanguageUtf8.php" );
 
-/* private */ $wgNamespaceNamesSv = array(
-	NS_MEDIA            => "Media",
-	NS_SPECIAL          => "Special",
-	NS_MAIN	            => "",
-	NS_TALK	            => "Diskussion",
-	NS_USER             => "Användare",
-	NS_USER_TALK        => "Användardiskussion",
-	NS_PROJECT	        => $wgMetaNamespace,
-	NS_PROJECT_TALK     => $wgMetaNamespace . "diskussion",
-	NS_IMAGE            => "Bild",
-	NS_IMAGE_TALK       => "Bilddiskussion",
-	NS_MEDIAWIKI        => "MediaWiki",
-	NS_MEDIAWIKI_TALK   => "MediaWiki_diskussion",
-	NS_TEMPLATE         => "Mall",
-	NS_TEMPLATE_TALK    => "Malldiskussion",
-	NS_HELP             => "Hjälp",
-	NS_HELP_TALK        => "Hjälp_diskussion",
-	NS_CATEGORY	    => "Kategori",
-	NS_CATEGORY_TALK    => "Kategoridiskussion"
-) + $wgNamespaceNamesEn;
-
-/* inherit standard defaults */
-
-/* private */ $wgQuickbarSettingsSv = array(
-	"Ingen",
-	"Fast vänster",
-	"Fast höger",
-	"Flytande vänster"
-);
-
-/* private */ $wgSkinNamesSv = array(
-	'standard' => "Standard",
-	'nostalgia' => "Nostalgi",
-	'cologneblue' => "Cologne Blå",
-) + $wgSkinNamesEn;
-
-
 if (!$wgCachedMessageArrays) {
 	require_once('MessagesSv.php');
 }
 
 class LanguageSv extends LanguageUtf8 {
+	private $mMessagesSv, $mNamespaceNamesSv;
+	
+	private $mQuickbarSettingsSv = array(
+		"Ingen",
+		"Fast vänster",
+		"Fast höger",
+		"Flytande vänster"
+	);
+	
+	private $mSkinNamesSv = array(
+		'standard' => "Standard",
+		'nostalgia' => "Nostalgi",
+		'cologneblue' => "Cologne Blå",
+	);
+
+	function LanguageSv() {
+		LanguageUtf8::LanguageUtf8();
+
+		global $wgAllMessagesSv;
+		$this->mMessagesSv =& $wgAllMessagesSv;
+
+		global $wgMetaNamespace;
+		$this->mNamespaceNamesSv = array(
+			NS_MEDIA            => "Media",
+			NS_SPECIAL          => "Special",
+			NS_MAIN	            => "",
+			NS_TALK	            => "Diskussion",
+			NS_USER             => "Användare",
+			NS_USER_TALK        => "Användardiskussion",
+			NS_PROJECT	        => $wgMetaNamespace,
+			NS_PROJECT_TALK     => $wgMetaNamespace . "diskussion",
+			NS_IMAGE            => "Bild",
+			NS_IMAGE_TALK       => "Bilddiskussion",
+			NS_MEDIAWIKI        => "MediaWiki",
+			NS_MEDIAWIKI_TALK   => "MediaWiki_diskussion",
+			NS_TEMPLATE         => "Mall",
+			NS_TEMPLATE_TALK    => "Malldiskussion",
+			NS_HELP             => "Hjälp",
+			NS_HELP_TALK        => "Hjälp_diskussion",
+			NS_CATEGORY         => "Kategori",
+			NS_CATEGORY_TALK    => "Kategoridiskussion"
+		);
+	}
 
 	function getNamespaces() {
-		global $wgNamespaceNamesSv;
-		return $wgNamespaceNamesSv;
+		return $this->mNamespaceNamesSv + parent::getNamespaces();
 	}
 
 	function getQuickbarSettings() {
-		global $wgQuickbarSettingsSv;
-		return $wgQuickbarSettingsSv;
+		return $this->mQuickbarSettingsSv;
 	}
 
 	function getSkinNames() {
-		global $wgSkinNamesSv;
-		return $wgSkinNamesSv;
+		return $this->mSkinNamesSv + parent::getSkinNames();
+	}
+
+	function getMessage( $key ) {
+		if( isset( $this->mMessagesSv[$key] ) ) {
+			return $this->mMessagesSv[$key];
+		} else {
+			return parent::getMessage( $key );
+		}
+	}
+
+	function getAllMessages() {
+		return $this->mMessagesSv;
+	}
+
+	function linkTrail() {
+		return '/^([a-zåäöéÅÄÖÉ]+)(.*)$/sDu';
+	}
+
+
+	function separatorTransformTable() {
+		return array(
+			',' => "\xc2\xa0", // @bug 2749
+			'.' => ','
+		);
 	}
 
 	// "." is used as the character to separate the
 	// hours from the minutes in the date output
-	function timeSeparator() {
+	function timeSeparator( $format ) {
 		return '.';
 	}
 
@@ -84,21 +110,5 @@ class LanguageSv extends LanguageUtf8 {
 		}
 	}
 
-	function getMessage( $key ) {
-		global $wgAllMessagesSv;
-		if( isset( $wgAllMessagesSv[$key] ) ) {
-			return $wgAllMessagesSv[$key];
-		} else {
-			return parent::getMessage( $key );
-		}
-	}
-
-	function separatorTransformTable() {
-		return array(
-			',' => "\xc2\xa0", // @bug 2749
-			'.' => ','
-		);
-	}
-
 }
 ?>