inherit default user options from En where not already done

diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php
index 5539d08..2770915 100644 (file)
--- a/languages/LanguageDa.php
+++ b/languages/LanguageDa.php
@@ -22,16 +22,6 @@
        9       => "MediaWiki_diskussion",
 );
 
-/* private */ $wgDefaultUserOptionsDa = array(
-       "quickbar" => 1, "underline" => 1, "hover" => 1,
-       "cols" => 80, "rows" => 25, "searchlimit" => 20,
-       "contextlines" => 5, "contextchars" => 50,
-       "skin" => 0, "math" => 1, "rcdays" => 7, "rclimit" => 50,
-       "highlightbroken" => 1, "stubthreshold" => 0,
-       "previewontop" => 1, "editsection"=>1,"editsectiononrightclick"=>0, "showtoc"=>1,
-       "date" => 0
-);
-
 /* private */ $wgQuickbarSettingsDa = array(
        "Ingen", "Fast venstre", "Fast højre", "Flydende venstre"
 );
@@ -1215,10 +1205,10 @@ med den nye titel. Du er n
 
 class LanguageDa extends Language {
 
-       function getDefaultUserOptions () {
-               global $wgDefaultUserOptionsDa ;
-               return $wgDefaultUserOptionsDa ;
-               }
+        function getDefaultUserOptions () {
+                $opt = Language::getDefaultUserOptions();
+                return $opt;
+                }
 
        function getBookstoreList () {
                global $wgBookstoreListDa ;

diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index 38894dc..07bd770 100644 (file)
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -891,7 +891,7 @@ class LanguageDe extends Language {
        function getDefaultUserOptions () {
                $opt = Language::getDefaultUserOptions();
                return $opt;
-               }
+       }
 
        function getBookstoreList () {
                global $wgBookstoreListDe ;

diff --git a/languages/LanguageEs.php b/languages/LanguageEs.php
index 8a27a29..2954ba2 100644 (file)
--- a/languages/LanguageEs.php
+++ b/languages/LanguageEs.php
@@ -19,18 +19,6 @@
        9       => "MediaWiki_Discusión",
 );
 
-/* Note that some default options can be customized -- see
-   '$wgDefaultUserOptionsEn' in Language.php */
-/* private */ $wgDefaultUserOptionsEs = array(
-       "quickbar" => 1, "underline" => 1, "hover" => 1,
-       "cols" => 80, "rows" => 25, "searchlimit" => 20,
-       "contextlines" => 5, "contextchars" => 50,
-       "skin" => 0, "math" => 1, "rcdays" => 7, "rclimit" => 50,
-       "highlightbroken" => 1, "stubthreshold" => 0,
-       "previewontop" => 1, "editsection"=>1,"editsectiononrightclick"=>0, "showtoc"=>1,
-       "date" => 0
-);
-
 /* private */ $wgQuickbarSettingsEs = array(
 
        "None", "Fixed left", "Fixed right", "Floating left"
@@ -978,8 +966,12 @@ Por favor, elije otro nombre.",
 class LanguageEs extends Language {
 
        # Inherent default user options unless customization is desired
+        function getDefaultUserOptions () {
+               $opt = Language::getDefaultUserOptions();
+                return $opt;
+        }
 
-    function getBookstoreList () {
+       function getBookstoreList () {
                global $wgBookstoreListEn ;
                return $wgBookstoreListEn ;
        }

diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index 455bd1b..787cb3b 100644 (file)
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -21,29 +21,6 @@
        9       => "Discussion_MediaWiki",
 );
 
-/* using default options */
-/* private */ $wgDefaultUserOptionsFr = array(
-       "quickbar"                      => 1,
-       "underline"                     => 1,
-       "hover"                         => 1,
-       "cols"                          => 80,
-       "rows"                          => 25,
-       "searchlimit"                   => 20,
-       "contextlines"                  => 5,
-       "contextchars"                  => 50,
-       "skin"                          => 0,
-       "math"                          => 1,
-       "rcdays"                        => 7,
-       "rclimit"                       => 50,
-       "highlightbroken"               => 1,
-       "stubthreshold"                 => 0,
-       "previewontop"                  => 1,
-       "editsection"                   => 1,
-       "editsectiononrightclick"       => 0,
-       "showtoc"                       => 1,
-       "date"                          => 0
-);
-
 /* private */ $wgQuickbarSettingsFr = array(
        "Aucune", "Gauche", "Droite", "Flottante à gauche"
 );
@@ -954,8 +931,8 @@ class LanguageFr extends Language
 
        function getDefaultUserOptions()
        {
-               global $wgDefaultUserOptionsFr;
-               return $wgDefaultUserOptionsFr;
+               $opt = Language::getDefaultUserOptions();
+                return $opt;
        }
 
         function getBookstoreList () {

diff --git a/languages/LanguageHe.php b/languages/LanguageHe.php
index 1a15fb2..e6adf37 100644 (file)
--- a/languages/LanguageHe.php
+++ b/languages/LanguageHe.php
@@ -24,14 +24,6 @@ include_once("LanguageUtf8.php");
        9       => "MediaWiki_talk",
 );
 
-/* private */ $wgDefaultUserOptionsHe = array(
-       "quickbar" => 2, "underline" => 1, "hover" => 1,
-       "cols" => 80, "rows" => 25, "searchlimit" => 20,
-       "contextlines" => 5, "contextchars" => 50,
-       "skin" => 0, "math" => 1, "rcdays" => 7, "rclimit" => 50,
-       "highlightbroken" => 1, "stubthreshold" => 0
-);
-
 /* private */ $wgQuickbarSettingsHe = array(
        "ללא", "קבוע משמאל", "קבוע מימין", "צף משמאל"
 );
@@ -774,10 +766,11 @@ $3 $9",
 
 class LanguageHe extends LanguageUtf8 {
 
-       function getDefaultUserOptions () {
-               global $wgDefaultUserOptionsHe ;
-               return $wgDefaultUserOptionsHe ;
-       }
+        function getDefaultUserOptions () {
+                $opt = Language::getDefaultUserOptions();
+               $opt["quickbar"]=2;
+                return $opt;
+        }
 
        function getBookstoreList () {
                global $wgBookstoreListHe ;

diff --git a/languages/LanguageKo.php b/languages/LanguageKo.php
index afc7249..911740a 100644 (file)
--- a/languages/LanguageKo.php
+++ b/languages/LanguageKo.php
@@ -30,14 +30,6 @@ include_once( "LanguageUtf8.php" );
 # option values if you like. These will be the defaults for any user
 # who isn't logged in, or a newly created user account.
 
-/* private */ $wgDefaultUserOptionsKo = array(
-       "quickbar" => 1, "underline" => 1, "hover" => 1,
-       "cols" => 80, "rows" => 25, "searchlimit" => 20,
-       "contextlines" => 5, "contextchars" => 50,
-       "skin" => 0, "math" => 1, "rcdays" => 14, "rclimit" => 50,
-       "highlightbroken" => 1, "stubthreshold" => 0
-);
-
 /* private */ $wgQuickbarSettingsKo = array(
 #      "None", "Fixed left", "Fixed right", "Floating left"
        "없음", "왼쪽 붙박이", "오른쪽 붙박이", "왼쪽 떠다님"
@@ -944,10 +936,11 @@ Wikipedia developers.",
 
 class LanguageKo extends LanguageUtf8 {
 
-       function getDefaultUserOptions () {
-               global $wgDefaultUserOptionsKo ;
-               return $wgDefaultUserOptionsKo ;
-               }
+        function getDefaultUserOptions () {
+                $opt = Language::getDefaultUserOptions();
+               $opt["rcdays"]=14;
+                return $opt;
+        }
 
        function getBookstoreList () {
                global $wgBookstoreListKo ;

diff --git a/languages/LanguageNl.php b/languages/LanguageNl.php
index 1a6d0a5..d2bc169 100644 (file)
--- a/languages/LanguageNl.php
+++ b/languages/LanguageNl.php
@@ -21,17 +21,6 @@
  9 => "Overleg_MediaWiki"
 );
 
-/* private */ $wgDefaultUserOptionsNl = array(
- "quickbar" => 1, "underline" => 1, "hover" => 1,
- "cols" => 80, "rows" => 25, "searchlimit" => 20,
- "contextlines" => 5, "contextchars" => 50,
- "skin" => 0, "math" => 1, "rcdays" => 3, "rclimit" => 50,
- "highlightbroken" => 0, "stubthreshold" => 0,
- "previewontop" => 1, "editsection" => 0,
- "editsectiononrightclick" => 0, "showtoc" => 0,
- "date" => 2
-);
-
 /* private */ $wgQuickbarSettingsNl = array(
  "Uitgeschakeld", "Links vast", "Rechts vast", "Links zwevend"
 );
@@ -1000,9 +989,10 @@ te zijn om een pagina te verplaatsen.",
 
 class LanguageNl extends Language {
 
- function getDefaultUserOptions () {
-  global $wgDefaultUserOptionsNl ;
-  return $wgDefaultUserOptionsNl ;
+  function getDefaultUserOptions () {
+    $opt = Language::getDefaultUserOptions();
+    $opt["date"]=2;
+    return $opt;
   }
 
  function getBookstoreList () {

diff --git a/languages/LanguageOc.php b/languages/LanguageOc.php
index 91bd899..1be7057 100644 (file)
--- a/languages/LanguageOc.php
+++ b/languages/LanguageOc.php
@@ -20,29 +20,6 @@ include_once( "LanguageUtf8.php" );
        9       => "MediaWiki_talk",
 );
 
-/* using default options */
-/* private */ $wgDefaultUserOptionsOc = array(
-       "quickbar"                      => 1,
-       "underline"                     => 1,
-       "hover"                         => 1,
-       "cols"                          => 80,
-       "rows"                          => 25,
-       "searchlimit"                   => 20,
-       "contextlines"                  => 5,
-       "contextchars"                  => 50,
-       "skin"                          => 0,
-       "math"                          => 1,
-       "rcdays"                        => 7,
-       "rclimit"                       => 50,
-       "highlightbroken"               => 1,
-       "stubthreshold"                 => 0,
-       "previewontop"                  => 1,
-       "editsection"                   => 1,
-       "editsectiononrightclick"       => 0,
-       "showtoc"                       => 1,
-       "date"                          => 0
-);
-
 /* private */ $wgQuickbarSettingsOc = array(
        "Cap", "Esquèr", "Drech", "Flotejant a esquèr"
 );
@@ -1048,8 +1025,8 @@ class LanguageOc extends LanguageUtf8
 
        function getDefaultUserOptions()
        {
-               global $wgDefaultUserOptionsOc;
-               return $wgDefaultUserOptionsOc;
+                $opt = Language::getDefaultUserOptions();
+                return $opt;
        }
 
         function getBookstoreList () {

diff --git a/languages/LanguagePl.php b/languages/LanguagePl.php
index 5310b57..220a2ba 100644 (file)
--- a/languages/LanguagePl.php
+++ b/languages/LanguagePl.php
@@ -25,15 +25,6 @@ include_once("LanguageUtf8.php");
        11      => "Dyskusja źródeł"
 );
 
-/* private */ $wgDefaultUserOptionsPl = array(
-        "quickbar" => 1, "underline" => 1, "hover" => 1,
-        "cols" => 80, "rows" => 25, "searchlimit" => 20,
-        "contextlines" => 5, "contextchars" => 50,
-        "skin" => 0, "math" => 1, "rcdays" => 3, "rclimit" => 50,
-        "highlightbroken" => 1, "stubthreshold" => 0,
-                "previewontop" => 1, "editsection" => 1, "editsectiononrightclick" => 0, "showtoc" => 1
-);
-
 /* private */ $wgQuickbarSettingsPl = array(
         "Brak", "Stały, z lewej", "Stały, z prawej", "Unoszący się, z lewej"
 );
@@ -1178,6 +1169,11 @@ Wybierz, proszę, nową nazwę.",
 
 class LanguagePl extends LanguageUtf8 {
 
+        function getDefaultUserOptions () {
+                $opt = Language::getDefaultUserOptions();
+                return $opt;
+        }
+       
         function getNamespaces() {
                 global $wgNamespaceNamesPl;
                 return $wgNamespaceNamesPl;

diff --git a/languages/LanguagePt.php b/languages/LanguagePt.php
index 7a11868..a6b54fc 100644 (file)
--- a/languages/LanguagePt.php
+++ b/languages/LanguagePt.php
@@ -24,16 +24,6 @@
        9       => "MediaWiki_Discussão",
 );
 
-/* private */ $wgDefaultUserOptionsPt = array(
-       "quickbar" => 1, "underline" => 1, "hover" => 1,
-       "cols" => 80, "rows" => 25, "searchlimit" => 20,
-       "contextlines" => 5, "contextchars" => 50,
-       "skin" => 0, "math" => 1, "rcdays" => 7, "rclimit" => 50,
-       "highlightbroken" => 1, "stubthreshold" => 0,
-       "previewontop" => 1, "editsection"=>1,"editsectiononrightclick"=>0, "showtoc"=>1,
-       "date" => 0
-);
-
 /* private */ $wgQuickbarSettingsPt = array(
        "Nada", "Fixado à esquerda", "Fixado à direita", "Flutuando à Esquerda"
 );
@@ -932,6 +922,11 @@ include_once( "LanguageUtf8.php" );
 
 class LanguagePt extends LanguageUtf8 {
 
+        function getDefaultUserOptions () {
+                $opt = Language::getDefaultUserOptions();
+                return $opt;
+        }
+
        function getBookstoreList () {
                global $wgBookstoreListPt;
                return $wgBookstoreListPt;
@@ -1035,11 +1030,14 @@ class LanguagePt extends LanguageUtf8 {
                return $wgDeveloperSpecialPagesPt;
        }
 
-       function getMessage( $key )
-       {
-               global $wgAllMessagesPt;
-               return $wgAllMessagesPt[$key];
-       }
+       function getMessage( $key )
+        {
+                global $wgAllMessagesPt;
+                if(array_key_exists($key, $wgAllMessagesPt))
+                        return $wgAllMessagesPt[$key];
+                else
+                        return Language::getMessage($key);
+        }
 }
 
 ?>

diff --git a/languages/LanguageSl.php b/languages/LanguageSl.php
index 1680817..c08731e 100644 (file)
--- a/languages/LanguageSl.php
+++ b/languages/LanguageSl.php
@@ -36,14 +36,6 @@ include_once( "LanguageUtf8.php" );
        9       => "MediaWiki_talk",
 );
 
-/* private */ $wgDefaultUserOptionsSl = array(
-       "quickbar" => 1, "underline" => 1, "hover" => 1,
-       "cols" => 80, "rows" => 25, "searchlimit" => 20,
-       "contextlines" => 5, "contextchars" => 50,
-       "skin" => 0, "math" => 1, "rcdays" => 7, "rclimit" => 50,
-       "highlightbroken" => 1, "stubthreshold" => 0
-);
-
 /* private */ $wgQuickbarSettingsSl = array(
        "Brez", "Levo nepomično", "Desno nepomično", "Levo leteče"
 );
@@ -872,6 +864,11 @@ V teh primerih boste morali prestaviti ali povezati stran ročno, če to želite
 
 class LanguageSl extends LanguageUtf8 {
 
+  function getDefaultUserOptions () {
+   $opt = Language::getDefaultUserOptions();
+   return $opt;
+  }
+
  function getNamespaces() {
   global $wgNamespaceNamesSl;
   return $wgNamespaceNamesSl;

diff --git a/languages/LanguageZh.php b/languages/LanguageZh.php
index 28b9c62..035c795 100644 (file)
--- a/languages/LanguageZh.php
+++ b/languages/LanguageZh.php
@@ -23,16 +23,6 @@ include_once( "LanguageUtf8.php" );
        9       => "MediaWiki_talk",
 );
 
-/* private */ $wgDefaultUserOptionsZh = array(
-       "quickbar" => 1, "underline" => 1, "hover" => 1,
-       "cols" => 80, "rows" => 25, "searchlimit" => 20,
-       "contextlines" => 5, "contextchars" => 50,
-       "skin" => 0, "math" => 1, "rcdays" => 7, "rclimit" => 50,
-       "highlightbroken" => 1, "stubthreshold" => 0,
- "previewontop" => 1, "editsection"=>1,"editsectiononrightclick"=>0, "showtoc"=>1,
-                "date" => 0
-);
-
 /* private */ $wgQuickbarSettingsZh = array(
         "无", /* "None" */ 
        "左侧固定", /* "Fixed left" */ 
@@ -1088,10 +1078,10 @@ Wikipedia与这些公司并没有任何商业关系，因此本表不应该
 
 class LanguageZh extends LanguageUtf8 {
 
-       function getDefaultUserOptions () {
-               global $wgDefaultUserOptionsZh ;
-               return $wgDefaultUserOptionsZh ;
-               }
+        function getDefaultUserOptions () {
+                $opt = Language::getDefaultUserOptions();
+                return $opt;
+        }
 
        function getBookstoreList () {
                global $wgBookstoreListZh ;