From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 26 Sep 2004 00:02:28 +0000 (+0000)
Subject: Fix fallback message checks.
X-Git-Tag: 1.5.0alpha1~1785
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=5ab89f81e707b5d0507012613beebabb66eebc0b;p=lhc%2Fweb%2Fwiklou.git

Fix fallback message checks.
---

diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php
index 18687e22ea..16bdc76c22 100644
--- a/languages/LanguageBg.php
+++ b/languages/LanguageBg.php
@@ -1459,7 +1459,7 @@ class LanguageBg extends LanguageUtf8 {
 		if( isset( $wgAllMessagesBg[$key] ) ) {
 			return $wgAllMessagesBg[$key];
 		} else {
-			return "";
+			return Language::getMessage( $key );
 		}
 	}
 
diff --git a/languages/LanguageCa.php b/languages/LanguageCa.php
index c013c0225a..243be8efdf 100644
--- a/languages/LanguageCa.php
+++ b/languages/LanguageCa.php
@@ -1005,7 +1005,11 @@ class LanguageCa extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesCa;
-		return $wgAllMessagesCa[$key];
+		if( isset( $wgAllMessagesCa[$key] ) ) {
+			return $wgAllMessagesCa[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 }
 
diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index 40bd55d4ec..b8ab171a22 100644
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -1112,7 +1112,11 @@ class LanguageCy extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesCy;
-		return @$wgAllMessagesCy[$key];
+		if( isset( $wgAllMessagesCy[$key] ) ) {
+			return $wgAllMessagesCy[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 	
 	function getAllMessages()
diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php
index 40a847bbdc..26a22a8241 100644
--- a/languages/LanguageDa.php
+++ b/languages/LanguageDa.php
@@ -1211,9 +1211,11 @@ class LanguageDa extends LanguageUtf8 {
 
 	function getMessage( $key ) {
 		global $wgAllMessagesDa;
-		if( isset( $wgAllMessagesDa[$key] ) )
+		if( isset( $wgAllMessagesDa[$key] ) ) {
 			return $wgAllMessagesDa[$key];
-		return "";
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 
 	# Inherit iconv()
diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index a2636ea9fd..65f9f06ebf 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -1276,7 +1276,7 @@ class LanguageDe extends LanguageUtf8 {
 		if( isset( $wgAllMessagesDe[$key] ) ) {
 			return $wgAllMessagesDe[$key];
 		} else {
-			return "";
+			return Language::getMessage( $key );
 		}
 	}
 
diff --git a/languages/LanguageEl.php b/languages/LanguageEl.php
index c233ae7a5d..d264a036dc 100644
--- a/languages/LanguageEl.php
+++ b/languages/LanguageEl.php
@@ -46,17 +46,6 @@ class LanguageEl extends LanguageUtf8 {
 	function fallback8bitEncoding() {
 		return "windows-1253";
 	}
-
-        function getMessage( $key )
-        {
-                global $wgAllMessagesDe;
-                if( isset( $wgAllMessagesDe[$key] ) ) {
-                        return $wgAllMessagesDe[$key];
-                } else {
-                        return "";
-                }
-        }
-
 }
 
 ?>
diff --git a/languages/LanguageEs.php b/languages/LanguageEs.php
index 57d299267d..fefcb0c79b 100644
--- a/languages/LanguageEs.php
+++ b/languages/LanguageEs.php
@@ -1083,9 +1083,11 @@ class LanguageEs extends LanguageUtf8 {
 
 	function getMessage( $key ) {
 		global $wgAllMessagesEs;
-		if( isset( $wgAllMessagesEs[$key] ) )
+		if( isset( $wgAllMessagesEs[$key] ) ) {
 			return $wgAllMessagesEs[$key];
-		return "";
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 }
 ?>
diff --git a/languages/LanguageEt.php b/languages/LanguageEt.php
index 63ad9fbe31..abb6192de0 100644
--- a/languages/LanguageEt.php
+++ b/languages/LanguageEt.php
@@ -929,7 +929,11 @@ class LanguageEt extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesEt;
-		return $wgAllMessagesEt[$key];
+		if( isset( $wgAllMessagesEt[$key] ) ) {
+			return $wgAllMessagesEt[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 }
 
diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php
index 234d02837f..9a4e4e06c6 100644
--- a/languages/LanguageFi.php
+++ b/languages/LanguageFi.php
@@ -924,7 +924,11 @@ class LanguageFi extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesFi;
-		return @$wgAllMessagesFi[$key];
+		if( isset( $wgAllMessagesFi[$key] ) ) {
+			return $wgAllMessagesFi[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 
 	# Convert from the nominative form of a noun to some other case
diff --git a/languages/LanguageFy.php b/languages/LanguageFy.php
index f6e13a7fdf..9dc81dfc3e 100644
--- a/languages/LanguageFy.php
+++ b/languages/LanguageFy.php
@@ -1144,7 +1144,11 @@ class LanguageFy extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesFy;
-		return $wgAllMessagesFy[$key];
+		if( isset( $wgAllMessagesFy[$key] ) ) {
+			return $wgAllMessagesFy[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 	
 # Inherit iconv()
diff --git a/languages/LanguageGa.php b/languages/LanguageGa.php
index 7360f6c21a..734100f7a9 100755
--- a/languages/LanguageGa.php
+++ b/languages/LanguageGa.php
@@ -1526,7 +1526,11 @@ class LanguageGa extends LanguageUtf8 {
     function getMessage( $key )
     {
         global $wgAllMessagesGa;
-        return $wgAllMessagesGa[$key];
+		if( isset( $wgAllMessagesGa[$key] ) ) {
+			return $wgAllMessagesGa[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
     }
 
     function getAllMessages()
diff --git a/languages/LanguageId.php b/languages/LanguageId.php
index 7748a5e161..c599fc527c 100644
--- a/languages/LanguageId.php
+++ b/languages/LanguageId.php
@@ -1431,7 +1431,11 @@ class LanguageId extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesId;
-		return $wgAllMessagesId[$key];
+		if( isset( $wgAllMessagesId[$key] ) ) {
+			return $wgAllMessagesId[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 }
 
diff --git a/languages/LanguageIs.php b/languages/LanguageIs.php
index c8eda04850..fb54b5bf4d 100644
--- a/languages/LanguageIs.php
+++ b/languages/LanguageIs.php
@@ -1188,7 +1188,7 @@ class LanguageIs extends LanguageUtf8 {
 		if( isset( $wgAllMessagesIs[$key] ) ) {
 			return $wgAllMessagesIs[$key];
 		} else {
-			return "";
+			return Language::getMessage( $key );
 		}
 	}
 	
diff --git a/languages/LanguageMs.php b/languages/LanguageMs.php
index 0f0e1720b1..bad5588c93 100644
--- a/languages/LanguageMs.php
+++ b/languages/LanguageMs.php
@@ -1019,7 +1019,11 @@ class LanguageMs extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesMs;
-		return $wgAllMessagesMs[$key];
+		if( isset( $wgAllMessagesMs[$key] ) ) {
+			return $wgAllMessagesMs[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 }
 
diff --git a/languages/LanguageNl.php b/languages/LanguageNl.php
index a7414e280b..ed2b1a5433 100644
--- a/languages/LanguageNl.php
+++ b/languages/LanguageNl.php
@@ -937,7 +937,7 @@ class LanguageNl extends LanguageUtf8 {
 		if( isset( $wgAllMessagesNl[$key] ) ) {
 			return $wgAllMessagesNl[$key];
 		} else {
-			return "";
+			return Language::getMessage( $key );
 		}
 	}
 	
diff --git a/languages/LanguageNo.php b/languages/LanguageNo.php
index 65c798f78b..1692ac5040 100644
--- a/languages/LanguageNo.php
+++ b/languages/LanguageNo.php
@@ -1150,7 +1150,7 @@ class LanguageNo extends LanguageUtf8 {
 		if( isset( $wgAllMessagesNo[$key] ) ) {
 			return $wgAllMessagesNo[$key];
 		} else {
-			return ""; # ??
+			return Language::getMessage( $key );
 		}
 	}
 
diff --git a/languages/LanguagePt.php b/languages/LanguagePt.php
index add2a42af9..66cdabb289 100644
--- a/languages/LanguagePt.php
+++ b/languages/LanguagePt.php
@@ -1023,7 +1023,11 @@ class LanguagePt extends LanguageUtf8 {
     function getMessage( $key )
     {
         global $wgAllMessagesPt;
-        return $wgAllMessagesPt[$key];
+		if( isset( $wgAllMessagesPt[$key] ) ) {
+			return $wgAllMessagesPt[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
     }
 }
 
diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index c4b64c4c82..69c1dc3856 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -1001,7 +1001,11 @@ class LanguageRu extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesRu;
-		return $wgAllMessagesRu[$key];
+		if( isset( $wgAllMessagesRu[$key] ) ) {
+			return $wgAllMessagesRu[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 
 	function fallback8bitEncoding() {
diff --git a/languages/LanguageSv.php b/languages/LanguageSv.php
index 73a1e5a950..5878f4abec 100644
--- a/languages/LanguageSv.php
+++ b/languages/LanguageSv.php
@@ -53,13 +53,6 @@ require_once( "LanguageUtf8.php" );
  "myskin" => "MySkin" 
 );
 
-define( "MW_MATH_PNG",    0 );
-define( "MW_MATH_SIMPLE", 1 );
-define( "MW_MATH_HTML",   2 );
-define( "MW_MATH_SOURCE", 3 );
-define( "MW_MATH_MODERN", 4 );
-define( "MW_MATH_MATHML", 5 );
-
 /* private */ $wgMathNamesSv = array(
 	MW_MATH_PNG    => "Rendera alltid PNG",
 	MW_MATH_SIMPLE => "HTML om den är väldigt enkel, annars PNG",
@@ -1137,9 +1130,11 @@ class LanguageSv extends LanguageUtf8 {
 	
 	function getMessage( $key ) {
 		global $wgAllMessagesSv;
-		if( array_key_exists( $key, $wgAllMessagesSv ) )
+		if( isset( $wgAllMessagesSv[$key] ) ) {
 			return $wgAllMessagesSv[$key];
-		return "";
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 	
 }
diff --git a/languages/LanguageTh.php b/languages/LanguageTh.php
index 8dbf2d1cc4..cbfdf899b9 100644
--- a/languages/LanguageTh.php
+++ b/languages/LanguageTh.php
@@ -1121,7 +1121,11 @@ class LanguageTh extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesTh;
-		return $wgAllMessagesTh[$key];
+		if( isset( $wgAllMessagesTh[$key] ) ) {
+			return $wgAllMessagesTh[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 
 	function getAllMessages()
diff --git a/languages/LanguageTt.php b/languages/LanguageTt.php
index d664a89f22..7038e3ff53 100644
--- a/languages/LanguageTt.php
+++ b/languages/LanguageTt.php
@@ -280,12 +280,14 @@ class LanguageTt extends LanguageUtf8 {
                 return $wgDeveloperSpecialPagesTt;
         }
 
-        function getMessage( $key ) {
-                global $wgAllMessagesTt;
-                if( isset( $wgAllMessagesTt[$key] ) )
-                        return $wgAllMessagesTt[$key];
-                return "";
-        }
+	function getMessage( $key ) {
+		global $wgAllMessagesTt;
+		if( isset( $wgAllMessagesTt[$key] ) ) {
+			return $wgAllMessagesTt[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
+	}
 
         # Inherit iconv()
 
diff --git a/languages/LanguageUk.php b/languages/LanguageUk.php
index 556bc60b43..27df16bcfe 100755
--- a/languages/LanguageUk.php
+++ b/languages/LanguageUk.php
@@ -1043,7 +1043,11 @@ class LanguageUk extends LanguageUtf8 {
 	function getMessage( $key )
 	{
 		global $wgAllMessagesUk;
-		return $wgAllMessagesUk[$key];
+		if( isset( $wgAllMessagesUk[$key] ) ) {
+			return $wgAllMessagesUk[$key];
+		} else {
+			return Language::getMessage( $key );
+		}
 	}
 
 	function fallback8bitEncoding() {