moved weekday, monthname etc to AllMessages arrays.

diff --git a/languages/Language.php b/languages/Language.php
index 31f3af6..96790cc 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -140,6 +140,11 @@ $wgLanguageNamesEn =& $wgLanguageNames;
        'july', 'august', 'september', 'october', 'november',
        'december'
 );
+/* private */ $wgMonthNamesGenEn = array(
+       'january-gen', 'february-gen', 'march-gen', 'april-gen', 'may-gen', 'june-gen',
+       'july-gen', 'august-gen', 'september-gen', 'october-gen', 'november-gen',
+       'december-gen'
+);
 
 /* private */ $wgMonthAbbreviationsEn = array(
        'jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug',

diff --git a/languages/LanguagePl.php b/languages/LanguagePl.php
index b67b72f..19ec9a2 100644 (file)
--- a/languages/LanguagePl.php
+++ b/languages/LanguagePl.php
@@ -85,28 +85,6 @@ if( $wgMetaNamespace == "Wikipedia" ) {
         "Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1"
 );
 
-/* private */ $wgWeekdayNamesPl = array(
-        "niedziela", "poniedziałek", "wtorek", "środa", "czwartek",
-        "piątek", "sobota"
-);
-
-/* private */ $wgMonthNamesPl = array(
-        "styczeń", "luty", "marzec", "kwiecień", "maj", "czerwiec",
-        "lipiec", "sierpień", "wrzesień", "październik", "listopad",
-        "grudzień"
-);
-
-/* private */ $wgMonthNamesGenPl = array(
-        "stycznia", "lutego", "marca", "kwietnia", "maja", "czerwca",
-        "lipca", "sierpnia", "września", "października", "listopada",
-        "grudnia"
-);
-
-/* private */ $wgMonthAbbreviationsPl = array(
-        "sty", "lut", "mar", "kwi", "maj", "cze", "lip", "sie",
-        "wrz", "paź", "lis", "gru"
-);
-
 # All special pages have to be listed here: a description of ""
 # will make them not show up on the "Special Pages" page, which
 # is the right thing for some of them (such as the "targeted" ones).
@@ -160,6 +138,50 @@ if( $wgMetaNamespace == "Wikipedia" ) {
 );
 
 /* private */ $wgAllMessagesPl = array(
+# Dates
+'sunday' => "niedziela",
+'monday' => "poniedziałek",
+'tuesday' => "wtorek",
+'wednesday' => "środa",
+'thursday' => "czwartek",
+'friday' => "piątek",
+'saturday' => "sobota",
+'january' => "styczeń",
+'february' => "luty",
+'march' => "marzec",
+'april' => "kwiecień",
+'may_long' => "maj",
+'june' => "czerwiec",
+'july' => "lipiec",
+'august' => "sierpień",
+'september' => "wrzesień",
+'october' => "październik",
+'november' => "listopad",
+'december' => "grudzień",
+'january-gen' => "stycznia",
+'february-gen' => "lutego",
+'march-gen' => "marca",
+'april-gen' => "kwietnia",
+'may-gen' => "maja",
+'june-gen' => "czerwca",
+'july-gen' => "lipca",
+'august-gen' => "sierpnia",
+'september-gen' => "września",
+'october-gen' => "października",
+'november-gen' => "listopada",
+'december-gen' => "grudnia",
+'jan' => "sty",
+'feb' => "lut",
+'mar' => "mar",
+'apr' => "kwi",
+'may' => "maj",
+'jun' => "cze",
+'jul' => "lip",
+'aug' => "sie",
+'sep' => "wrz",
+'oct' => "paź",
+'nov' => "lis",
+'dec' => "gru",
 
 # Bits of text used by many pages:
 #
@@ -1087,29 +1109,12 @@ class LanguagePl extends LanguageUtf8 {
                 return $wgUserTogglesPl;
         }
 
-        function getMonthName( $key )
-        {
-                global $wgMonthNamesPl;
-                return $wgMonthNamesPl[$key-1];
-        }
-
         function getMonthNameGen( $key )
         {
-                global $wgMonthNamesGenPl;
-                return $wgMonthNamesGenPl[$key-1];
-        }
-
-        function getMonthAbbreviation( $key )
-        {
-                global $wgMonthAbbreviationsPl;
-                return $wgMonthAbbreviationsPl[$key-1];
+                global $wgMonthNamesGenEn;
+                return wfMsg( $wgMonthNamesGenEn[$key-1] );
         }
 
-        function getWeekdayName( $key )
-        {
-                global $wgWeekdayNamesPl;
-                return $wgWeekdayNamesPl[$key-1];
-        }
 
         function userAdjust( $ts )
         {

diff --git a/languages/LanguageUk.php b/languages/LanguageUk.php
index 983f14a..707b10f 100755 (executable)
--- a/languages/LanguageUk.php
+++ b/languages/LanguageUk.php
@@ -74,21 +74,6 @@ require_once( "LanguageUtf8.php" );
 /* Add a $wgBookstoreListUk to override default list of book links for ISBN links */
 
 
-/* private */ $wgWeekdayNamesUk = array(
-       "Неділя", "Понеділок", "Вівторок", "Середа", "Четвер",
-       "П'ятниця", "Субота"
-);
-
-/* private */ $wgMonthNamesUk = array(
-       "Січень", "Лютий", "Березень", "Квітень", "Травень", "Червень",
-       "Липень", "Серпень", "Вересень", "Жовтень", "Листопад",
-       "Грудень"
-);
-
-/* private */ $wgMonthAbbreviationsUk = array(
-       "Січ", "Лют", "Бер", "Квіт", "Трав", "Черв", "Лип", "Серп",
-       "Вер", "Жов", "Лист", "Груд"
-);
 
 # All special pages have to be listed here: a description of ""
 # will make them not show up on the "Special Pages" page, which
@@ -140,6 +125,38 @@ require_once( "LanguageUtf8.php" );
 );
 
 /* private */ $wgAllMessagesUk = array(
+# Dates
+'sunday' => "Неділя",
+'monday' => "Понеділок",
+'tuesday' => "Вівторок",
+'wednesday' => "Середа",
+'thursday' => "Четвер",
+'friday' => "П'ятниця",
+'saturday' => "Субота",
+'january' => "Січень",
+'february' => "Лютий",
+'march' => "Березень",
+'april' => "Квітень",
+'may_long' => "Травень",
+'june' => "Червень",
+'july' => "Липень",
+'augst' => "Серпень",
+'september' => "Вересень",
+'october' => "Жовтень",
+'november' => "Листопад",
+'december' => "Грудень",
+'jan' => "Січ",
+'feb' => "Лют",
+'mar' => "Бер",
+'apr' => "Квіт",
+'may' => "Трав",
+'jun' => "Черв",
+'jul' => "Лип",
+'aug' => "Серп",
+'sep' => "Вер",
+'oct' => "Жов",
+'nov' => "Лист",
+'dec' => "Груд",
 
 # Bits of text used by many pages:
 #
@@ -1003,36 +1020,11 @@ class LanguageUk extends LanguageUtf8 {
                return $wgUserTogglesUk;
        }
 
-       function getMonthName( $key )
-       {
-               global $wgMonthNamesUk;
-               return $wgMonthNamesUk[$key-1];
-       }
-
-       /* by default we just return base form */
-       function getMonthNameGen( $key )
-       {
-               global $wgMonthNamesUk;
-               return $wgMonthNamesUk[$key-1];
-       }
-
-       function getMonthRegex()
-       {
-               global $wgMonthNamesUk;
-               return implode( "|", $wgMonthNamesUk );
-       }
-
-       function getMonthAbbreviation( $key )
-       {
-               global $wgMonthAbbreviationsUk;
-               return $wgMonthAbbreviationsUk[$key-1];
-       }
-
-       function getWeekdayName( $key )
-       {
-               global $wgWeekdayNamesUk;
-               return $wgWeekdayNamesUk[$key-1];
-       }
+       #function getMonthRegex()
+       #{
+       #       global $wgMonthNamesUk;
+       #       return implode( "|", $wgMonthNamesUk );
+       #}
 
        function getValidSpecialPages()
        {

diff --git a/languages/LanguageWa.php b/languages/LanguageWa.php
index a959fac..78ada57 100644 (file)
--- a/languages/LanguageWa.php
+++ b/languages/LanguageWa.php
@@ -79,21 +79,6 @@ require_once( "LanguageUtf8.php" );
        "Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1"
 );
 
-/* private */ $wgWeekdayNamesWa = array(
-       "dimegne", "londi", "mårdi", "mierkidi", "djudi",
-       "vénrdi", "semdi"
-);
-
-/* private */ $wgMonthNamesWa = array(
-       "djanvî", "fevrî", "måss", "avri", "may", "djun",
-       "djulete", "awousse", "setimbe", "octôbe", "nôvimbe",
-       "decimbe"
-);
-
-/* private */ $wgMonthAbbreviationsWa = array(
-       "dja", "fev", "mås", "avr", "may", "djn", "djl", "awo",
-       "set", "oct", "nôv", "dec"
-);
 
 # All special pages have to be listed here: a description of ""
 # will make them not show up on the "Special Pages" page, which
@@ -154,6 +139,39 @@ require_once( "LanguageUtf8.php" );
 );
 
 /* private */ $wgAllMessagesWa = array(
+# Dates
+'sunday' => "dimegne",
+'monday' => "londi",
+'tuesday' => "mårdi",
+'wednesday' => "mierkidi",
+'thursday' => "djudi",
+'friday' => "vénrdi",
+'saturday' => "semdi",
+'january' => "djanvî",
+'february' => "fevrî",
+'march' => "måss",
+'april' => "avri",
+'may_long' => "may",
+'june' => "djun",
+'july' => "djulete",
+'august' => "awousse",
+'september' => "setimbe",
+'october' => "octôbe",
+'november' => "nôvimbe",
+'december' => "decimbe",
+'jan' => "dja",
+'feb' => "fev",
+'mar' => "mås",
+'apr' => "avr",
+'may' => "may",
+'jun' => "djn",
+'jul' => "djl",
+'aug' => "awo",
+'sep' => "set",
+'oct' => "oct",
+'nov' => "nôv",
+'dec' => "dec",
+
 
 # Bits of text used by many pages:
 #
@@ -1204,31 +1222,6 @@ class LanguageWa extends LanguageUtf8 {
                return $wgUserTogglesWa;
        }
 
-       function getMonthName( $key )
-       {
-               global $wgMonthNamesWa;
-               return $wgMonthNamesWa[$key-1];
-       }
-
-       /* by default we just return base form */
-       function getMonthNameGen( $key )
-       {
-               global $wgMonthNamesWa;
-               return $wgMonthNamesWa[$key-1];
-       }
-
-       function getMonthAbbreviation( $key )
-       {
-               global $wgMonthAbbreviationsWa;
-               return $wgMonthAbbreviationsWa[$key-1];
-       }
-
-       function getWeekdayName( $key )
-       {
-               global $wgWeekdayNamesWa;
-               return $wgWeekdayNamesWa[$key-1];
-       }
-
        # Inherit userAdjust()
 
        ###