Fix fallback message checks.
authorBrion Vibber <brion@users.mediawiki.org>
Sun, 26 Sep 2004 00:02:28 +0000 (00:02 +0000)
committerBrion Vibber <brion@users.mediawiki.org>
Sun, 26 Sep 2004 00:02:28 +0000 (00:02 +0000)
22 files changed:
languages/LanguageBg.php
languages/LanguageCa.php
languages/LanguageCy.php
languages/LanguageDa.php
languages/LanguageDe.php
languages/LanguageEl.php
languages/LanguageEs.php
languages/LanguageEt.php
languages/LanguageFi.php
languages/LanguageFy.php
languages/LanguageGa.php
languages/LanguageId.php
languages/LanguageIs.php
languages/LanguageMs.php
languages/LanguageNl.php
languages/LanguageNo.php
languages/LanguagePt.php
languages/LanguageRu.php
languages/LanguageSv.php
languages/LanguageTh.php
languages/LanguageTt.php
languages/LanguageUk.php

index 18687e2..16bdc76 100644 (file)
@@ -1459,7 +1459,7 @@ class LanguageBg extends LanguageUtf8 {
                if( isset( $wgAllMessagesBg[$key] ) ) {
                        return $wgAllMessagesBg[$key];
                } else {
-                       return "";
+                       return Language::getMessage( $key );
                }
        }
 
index c013c02..243be8e 100644 (file)
@@ -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 );
+               }
        }
 }
 
index 40bd55d..b8ab171 100644 (file)
@@ -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()
index 40a847b..26a22a8 100644 (file)
@@ -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()
index a2636ea..65f9f06 100644 (file)
@@ -1276,7 +1276,7 @@ class LanguageDe extends LanguageUtf8 {
                if( isset( $wgAllMessagesDe[$key] ) ) {
                        return $wgAllMessagesDe[$key];
                } else {
-                       return "";
+                       return Language::getMessage( $key );
                }
        }
 
index c233ae7..d264a03 100644 (file)
@@ -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 "";
-                }
-        }
-
 }
 
 ?>
index 57d2992..fefcb0c 100644 (file)
@@ -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 );
+               }
        }
 }
 ?>
index 63ad9fb..abb6192 100644 (file)
@@ -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 );
+               }
        }
 }
 
index 234d028..9a4e4e0 100644 (file)
@@ -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
index f6e13a7..9dc81df 100644 (file)
@@ -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()
index 7360f6c..734100f 100755 (executable)
@@ -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()
index 7748a5e..c599fc5 100644 (file)
@@ -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 );
+               }
        }
 }
 
index c8eda04..fb54b5b 100644 (file)
@@ -1188,7 +1188,7 @@ class LanguageIs extends LanguageUtf8 {
                if( isset( $wgAllMessagesIs[$key] ) ) {
                        return $wgAllMessagesIs[$key];
                } else {
-                       return "";
+                       return Language::getMessage( $key );
                }
        }
        
index 0f0e172..bad5588 100644 (file)
@@ -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 );
+               }
        }
 }
 
index a7414e2..ed2b1a5 100644 (file)
@@ -937,7 +937,7 @@ class LanguageNl extends LanguageUtf8 {
                if( isset( $wgAllMessagesNl[$key] ) ) {
                        return $wgAllMessagesNl[$key];
                } else {
-                       return "";
+                       return Language::getMessage( $key );
                }
        }
        
index 65c798f..1692ac5 100644 (file)
@@ -1150,7 +1150,7 @@ class LanguageNo extends LanguageUtf8 {
                if( isset( $wgAllMessagesNo[$key] ) ) {
                        return $wgAllMessagesNo[$key];
                } else {
-                       return ""; # ??
+                       return Language::getMessage( $key );
                }
        }
 
index add2a42..66cdabb 100644 (file)
@@ -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 );
+               }
     }
 }
 
index c4b64c4..69c1dc3 100644 (file)
@@ -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() {
index 73a1e5a..5878f4a 100644 (file)
@@ -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 );
+               }
        }
        
 }
index 8dbf2d1..cbfdf89 100644 (file)
@@ -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()
index d664a89..7038e3f 100644 (file)
@@ -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()
 
index 556bc60..27df16b 100755 (executable)
@@ -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() {