* (bug 14165, bug 14294) Wikimedia specific configuration in convertGrammar() for...
authorSiebrand Mazeland <siebrand@users.mediawiki.org>
Sun, 10 Aug 2008 18:32:10 +0000 (18:32 +0000)
committerSiebrand Mazeland <siebrand@users.mediawiki.org>
Sun, 10 Aug 2008 18:32:10 +0000 (18:32 +0000)
* Also put the wgGrammarForms from the Wikimedia configuration in here, so everything is in one place. Bonus with this setup is that there will be a little less work for Wikimedia shell operators, as the wgGrammarForms configuration is now accessible to i18n committers.
* Header for WikimediaMessages.php, and add myself to extension credits.

WARNING to Wikimedia shell operators: the whole section "wgGrammarForms" in InitialiseSettings.php.html should be remove after updating to this version. It will most probably overrule all settings in WikimediaMessages because of "'default' => array()"

15 files changed:
CREDITS
RELEASE-NOTES
languages/classes/LanguageBe.php
languages/classes/LanguageBe_tarask.php
languages/classes/LanguageBs.php
languages/classes/LanguageCs.php
languages/classes/LanguageDsb.php
languages/classes/LanguageGa.php
languages/classes/LanguageGsw.php [deleted file]
languages/classes/LanguageHsb.php
languages/classes/LanguageHu.php
languages/classes/LanguageLv.php
languages/classes/LanguageRmy.php [deleted file]
languages/classes/LanguageSk.php
languages/classes/LanguageSl.php

diff --git a/CREDITS b/CREDITS
index 5bc5a95..ceeca45 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -22,6 +22,7 @@ following names for their contribution to the product.
 
 == Patch Contributors ==
 * Daniel Arnold
+* Danny B.
 * Max Semenik
 * RememberTheDot
 
index 9302f34..773c5bf 100644 (file)
@@ -95,6 +95,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 15079) Add class="ns-talk" / "ns-subject" to <body>. Also added ns-special to 
   special pages.
 * (bug 15052) Skins should add their name as a class in <body>
+* (bug 14165, bug 14294) Wikimedia specific configuration in convertGrammar()
+  for several languages was removed. The settings have been put in extension
+  WikimediaMessages. Patch for Czech by Danny B.
 
 === API changes in 1.14 ===
 
index 7633f03..1468daf 100644 (file)
@@ -31,61 +31,4 @@ class LanguageBe extends Language {
                        }
                }
        }
-
-       # Convert from the nominative form of a noun to some other case
-       # Invoked with {{GRAMMAR:case|word}}
-       /**
-   * Cases: родны, вінавальны, месны
-   */
-       function convertGrammar( $word, $case ) {
-               switch ( $case ) {
-                       case 'родны': # genitive
-                               if ( $word == 'Вікіпэдыя' ) {
-                                       $word = 'Вікіпэдыі';
-                               } elseif ( $word == 'ВікіСлоўнік' ) {
-                                       $word = 'ВікіСлоўніка';
-                               } elseif ( $word == 'ВікіКнігі' ) {
-                                       $word = 'ВікіКніг';
-                               } elseif ( $word == 'ВікіКрыніца' ) {
-                                       $word = 'ВікіКрыніцы';
-                               } elseif ( $word == 'ВікіНавіны' ) {
-                                       $word = 'ВікіНавін';
-                               } elseif ( $word == 'ВікіВіды' ) {
-                                       $word = 'ВікіВідаў';
-                               }
-                       break;
-                       case 'вінавальны': # akusative
-                               if ( $word == 'Вікіпэдыя' ) {
-                                       $word = 'Вікіпэдыю';
-                               } elseif ( $word == 'ВікіСлоўнік' ) {
-                                       $word = 'ВікіСлоўнік';
-                               } elseif ( $word == 'ВікіКнігі' ) {
-                                       $word = 'ВікіКнігі';
-                               } elseif ( $word == 'ВікіКрыніца' ) {
-                                       $word = 'ВікіКрыніцу';
-                               } elseif ( $word == 'ВікіНавіны' ) {
-                                       $word = 'ВікіНавіны';
-                               } elseif ( $word == 'ВікіВіды' ) {
-                                       $word = 'ВікіВіды';
-                               }
-                       break;
-                       case 'месны': # prepositional
-                               if ( $word == 'Вікіпэдыя' ) {
-                                       $word = 'Вікіпэдыі';
-                               } elseif ( $word == 'ВікіСлоўнік' ) {
-                                       $word = 'ВікіСлоўніку';
-                               } elseif ( $word == 'ВікіКнігі' ) {
-                                       $word = 'ВікіКнігах';
-                               } elseif ( $word == 'ВікіКрыніца' ) {
-                                       $word = 'ВікіКрыніцы';
-                               } elseif ( $word == 'ВікіНавіны' ) {
-                                       $word = 'ВікіНавінах';
-                               } elseif ( $word == 'ВікіВіды' ) {
-                                       $word = 'ВікіВідах';
-                               }
-                       break;
-               }
-
-               return $word; # this will return the original value for 'назоўны' (nominative) and all undefined case values
-       }
 }
index 312735d..358cb48 100644 (file)
@@ -39,61 +39,4 @@ class LanguageBe_tarask extends Language {
                        }
                }
        }
-
-       # Convert from the nominative form of a noun to some other case
-       # Invoked with {{GRAMMAR:case|word}}
-       /**
-   * Cases: родны, вінавальны, месны
-   */
-       function convertGrammar( $word, $case ) {
-               switch ( $case ) {
-                       case 'родны': # genitive
-                               if ( $word == 'Вікіпэдыя' ) {
-                                       $word = 'Вікіпэдыі';
-                               } elseif ( $word == 'ВікіСлоўнік' ) {
-                                       $word = 'ВікіСлоўніка';
-                               } elseif ( $word == 'ВікіКнігі' ) {
-                                       $word = 'ВікіКніг';
-                               } elseif ( $word == 'ВікіКрыніца' ) {
-                                       $word = 'ВікіКрыніцы';
-                               } elseif ( $word == 'ВікіНавіны' ) {
-                                       $word = 'ВікіНавін';
-                               } elseif ( $word == 'ВікіВіды' ) {
-                                       $word = 'ВікіВідаў';
-                               }
-                       break;
-                       case 'вінавальны': # akusative
-                               if ( $word == 'Вікіпэдыя' ) {
-                                       $word = 'Вікіпэдыю';
-                               } elseif ( $word == 'ВікіСлоўнік' ) {
-                                       $word = 'ВікіСлоўнік';
-                               } elseif ( $word == 'ВікіКнігі' ) {
-                                       $word = 'ВікіКнігі';
-                               } elseif ( $word == 'ВікіКрыніца' ) {
-                                       $word = 'ВікіКрыніцу';
-                               } elseif ( $word == 'ВікіНавіны' ) {
-                                       $word = 'ВікіНавіны';
-                               } elseif ( $word == 'ВікіВіды' ) {
-                                       $word = 'ВікіВіды';
-                               }
-                       break;
-                       case 'месны': # prepositional
-                               if ( $word == 'Вікіпэдыя' ) {
-                                       $word = 'Вікіпэдыі';
-                               } elseif ( $word == 'ВікіСлоўнік' ) {
-                                       $word = 'ВікіСлоўніку';
-                               } elseif ( $word == 'ВікіКнігі' ) {
-                                       $word = 'ВікіКнігах';
-                               } elseif ( $word == 'ВікіКрыніца' ) {
-                                       $word = 'ВікіКрыніцы';
-                               } elseif ( $word == 'ВікіНавіны' ) {
-                                       $word = 'ВікіНавінах';
-                               } elseif ( $word == 'ВікіВіды' ) {
-                                       $word = 'ВікіВідах';
-                               }
-                       break;
-               }
-
-               return $word; # this will return the original value for 'назоўны' (nominative) and all undefined case values
-       }
 }
index ee2eb6a..24f6add 100644 (file)
@@ -34,99 +34,11 @@ class LanguageBs extends Language {
                        return $wgGrammarForms['bs'][$case][$word];
                }
                switch ( $case ) {
-                       case 'genitiv': # genitive
-                               if ( $word == 'Wikipedia' ) {
-                                       $word = 'Wikipedije';
-                               } elseif ( $word == 'Wikiknjige' ) {
-                                       $word = 'Wikiknjiga';
-                               } elseif ( $word == 'Wikivijesti' ) {
-                                       $word = 'Wikivijesti';
-                               } elseif ( $word == 'Wikicitati' ) {
-                                       $word = 'Wikicitata';
-                               } elseif ( $word == 'Wikiizvor' ) {
-                                       $word = 'Wikiizvora';
-                               } elseif ( $word == 'Vikirječnik' ) {
-                                       $word = 'Vikirječnika';
-                               }
-                       break;
-                       case 'dativ': # dative
-                               if ( $word == 'Wikipedia' ) {
-                                       $word = 'Wikipediji';
-                               } elseif ( $word == 'Wikiknjige' ) {
-                                       $word = 'Wikiknjigama';
-                               } elseif ( $word == 'Wikicitati' ) {
-                                       $word = 'Wikicitatima';
-                               } elseif ( $word == 'Wikivijesti' ) {
-                                       $word = 'Wikivijestima';
-                               } elseif ( $word == 'Wikiizvor' ) {
-                                       $word = 'Wikiizvoru';
-                               } elseif ( $word == 'Vikirječnik' ) {
-                                       $word = 'Vikirječniku';
-                               }
-                       break;
-                       case 'akuzativ': # akusative
-                               if ( $word == 'Wikipedia' ) {
-                                       $word = 'Wikipediju';
-                               } elseif ( $word == 'Wikiknjige' ) {
-                                       $word = 'Wikiknjige';
-                               } elseif ( $word == 'Wikicitati' ) {
-                                       $word = 'Wikicitate';
-                               } elseif ( $word == 'Wikivijesti' ) {
-                                       $word = 'Wikivijesti';
-                               } elseif ( $word == 'Wikiizvor' ) {
-                                       $word = 'Wikiizvora';
-                               } elseif ( $word == 'Vikirječnik' ) {
-                                       $word = 'Vikirječnika';
-                               }
-                       break;
-                       case 'vokativ': # vocative
-                               if ( $word == 'Wikipedia' ) {
-                                       $word = 'Wikipedijo';
-                               } elseif ( $word == 'Wikiknjige' ) {
-                                       $word = 'Wikiknjige';
-                               } elseif ( $word == 'Wikicitati' ) {
-                                       $word = 'Wikicitati';
-                               } elseif ( $word == 'Wikivijesti' ) {
-                                       $word = 'Wikivijesti';
-                               } elseif ( $word == 'Wikiizvor' ) {
-                                       $word = 'Wikizivoru';
-                               } elseif ( $word == 'Vikirječnik' ) {
-                                       $word = 'Vikirječniče';
-                               }
-                       break;
                        case 'instrumental': # instrumental
-                               if ( $word == 'Wikipedia' ) {
-                                       $word = 's Wikipediom';
-                               } elseif ( $word == 'Wikiknjige' ) {
-                                       $word = 's Wikiknjigama';
-                               } elseif ( $word == 'Wikicitati' ) {
-                                       $word = 's Wikicitatima';
-                               } elseif ( $word == 'Wikivijesti' ) {
-                                       $word = 's Wikivijestima';
-                               } elseif ( $word == 'Wikiizvor' ) {
-                                       $word = 's Wikiizvorom';
-                               } elseif ( $word == 'Vikirječnik' ) {
-                                       $word = 's Vikirječnikom';
-                               } else {
-                                       $word = 's ' . $word;
-                               }
+                               $word = 's ' . $word;
                        break;
                        case 'lokativ': # locative
-                               if ( $word == 'Wikipedia' ) {
-                                       $word = 'o Wikipediji';
-                               } elseif ( $word == 'Wikiknjige' ) {
-                                       $word = 'o Wikiknjigama';
-                               } elseif ( $word == 'Wikicitati' ) {
-                                       $word = 'o Wikicitatima';
-                               } elseif ( $word == 'Wikivijesti' ) {
-                                       $word = 'o Wikivijestima';
-                               } elseif ( $word == 'Wikiizvor' ) {
-                                       $word = 'o Wikiizvoru';
-                               } elseif ( $word == 'Vikirječnik' ) {
-                                       $word = 'o Vikirječniku';
-                               } else {
-                                       $word = 'o ' . $word;
-                               }
+                               $word = 'o ' . $word;
                        break;
                }
 
index 9c523d9..fe6da18 100644 (file)
@@ -5,115 +5,6 @@
  * @ingroup Language
  */
 class LanguageCs extends Language {
-       # Grammatical transformations, needed for inflected languages
-       # Invoked by putting {{grammar:case|word}} in a message
-       function convertGrammar( $word, $case ) {
-               global $wgGrammarForms;
-               if ( isset($wgGrammarForms['cs'][$case][$word]) ) {
-                       return $wgGrammarForms['cs'][$case][$word];
-               }
-               # allowed values for $case:
-               #       1sg, 2sg, ..., 7sg -- nominative, genitive, ... (in singular)
-               switch ( $word ) {
-                       case 'Wikibooks':
-                       case 'Wikiknihy':
-                               switch ( $case ) {
-                                       case '2sg':
-                                               return 'Wikiknih';
-                                       case '3sg':
-                                               return 'Wikiknihám';
-                                       case '6sg':
-                                               return 'Wikiknihách';
-                                       case '7sg':
-                                               return 'Wikiknihami';
-                                       default:
-                                               return 'Wikiknihy';
-                               }
-                       case 'Wikipedia':
-                       case 'Wikipedie':
-                               switch ( $case ) {
-                                       case '3sg':
-                                       case '4sg':
-                                       case '6sg':
-                                               return 'Wikipedii';
-                                       case '7sg':
-                                               return 'Wikipedií';
-                                       default:
-                                               return 'Wikipedie';
-                               }
-                       case 'Wiktionary':
-                       case 'Wikcionář':
-                       case 'Wikislovník':
-                               switch ( $case ) {
-                                       case '2sg':
-                                       case '3sg':
-                                       case '5sg':
-                                       case '6sg':
-                                               return 'Wikislovníku';
-                                       case '7sg':
-                                               return 'Wikislovníkem';
-                                       default:
-                                               return 'Wikislovník';
-                               }
-                       case 'Wikiquote':
-                       case 'Wikicitáty':
-                               switch ( $case ) {
-                                       case '2sg':
-                                               return 'Wikicitátů';
-                                       case '3sg':
-                                               return 'Wikicitátům';
-                                       case '6sg':
-                                               return 'Wikicitátech';
-                                       default:
-                                               return 'Wikicitáty';
-                               }
-                       case 'Wikinews':
-                       case 'Wikizprávy':
-                               switch ( $case ) {
-                                       case '2sg':
-                                               return 'Wikizpráv';
-                                       case '3sg':
-                                               return 'Wikizprávám';
-                                       case '6sg':
-                                               return 'Wikizprávách';
-                                       case '7sg':
-                                               return 'Wikizprávami';
-                                       default:
-                                               return 'Wikizprávy';
-                               }
-                       case 'Wikiversity':
-                       case 'Wikiverzita':
-                               switch ( $case ) {
-                                       case '2sg':
-                                               return 'Wikiverzity';
-                                       case '3sg':
-                                       case '6sg':
-                                               return 'Wikiverzitě';
-                                       case '4sg':
-                                               return 'Wikiverzitu';
-                                       case '5sg':
-                                               return 'Wikiverzito';
-                                       case '7sg':
-                                               return 'Wikiverzitou';
-                                       default:
-                                               return 'Wikiverzita';
-                               }
-                       case 'Wikispecies':
-                       case 'Wikidruhy':
-                               switch ( $case ) {
-                                       case '2sg':
-                                               return 'Wikidruhů';
-                                       case '3sg':
-                                               return 'Wikidruhům';
-                                       case '6sg':
-                                               return 'Wikidruzích';
-                                       default:
-                                               return 'Wikidruhy';
-                               }
-               }
-               # unknown
-               return $word;
-       }
 
        function convertPlural( $count, $forms ) {
                if ( !count($forms) ) { return ''; }
index 7d069a0..4ea1b89 100644 (file)
@@ -16,84 +16,10 @@ class LanguageDsb extends Language {
                }
 
                switch ( $case ) {
-                       case 'genitiw': # genitive
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipedije';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikiknih';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowin';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórła';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitatow';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłownika';
-                               }
-                               break;
-                       case 'datiw': # dativ
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipediji';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikikniham';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowinam';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórłu';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitatam';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłownikej';
-                               }
-                               break;
-                       case 'akuzativ': # akuzativ
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipediju';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikiknknihi';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowiny';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórło';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitaty';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłownik';
-                               }
-                               break;
                        case 'instrumental': # instrumental
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipediju';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikiknihami';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowinami';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórłom';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitatami';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłownikom';
-                               } else {
-                                       $word = 'z ' . $word;
-                               }
-                               break;
+                               $word = 'z ' . $word;
                        case 'lokatiw': # lokatiw
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipediji';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikiknihach';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowinach';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórłu';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitatach';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłowniku';
-                               } else {
-                                       $word = 'wo ' . $word;
-                               }
+                               $word = 'wo ' . $word;
                                break;
                        }
 
index fc1546a..2fdeed0 100644 (file)
@@ -14,17 +14,6 @@ class LanguageGa extends Language {
                }
 
                switch ( $case ) {
-               case 'genitive':
-                       switch ($word) {
-                       case 'Vicipéid':     $word = 'Vicipéide'; break;
-                       case 'Vicífhoclóir': $word = 'Vicífhoclóra'; break;
-                       case 'Vicíleabhair': $word = 'Vicíleabhar'; break;
-                       case 'Vicíshliocht': $word = 'Vicíshleachta'; break;
-                       case 'Vicífhoinse':  $word = 'Vicífhoinse'; break;
-                       case 'Vicíghnéithe': $word = 'Vicíghnéithe'; break;
-                       case 'Vicínuacht':   $word = 'Vicínuachta'; break;
-                       }
-
                case 'ainmlae':
                        switch ($word) {
                        case 'an Domhnach':
diff --git a/languages/classes/LanguageGsw.php b/languages/classes/LanguageGsw.php
deleted file mode 100644 (file)
index 3a1b413..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/** Alemannic (Alemannisch)
- *
- * @ingroup Language
- */
-class LanguageGsw extends Language {
-   # Convert from the nominative form of a noun to some other case
-   # Invoked with result
-
-   function convertGrammar( $word, $case ) {
-       global $wgGrammarForms;
-       if ( isset($wgGrammarForms['gsw'][$case][$word]) ) {
-           return $wgGrammarForms['gsw'][$case][$word];
-       }
-       switch ( $case ) {
-           case 'dativ':
-               if ( $word == 'Wikipedia' ) {
-                   $word = 'vo de Wikipedia';
-               } elseif ( $word == 'Wikinorchrichte' ) {
-                   $word = 'vo de Wikinochrichte';
-               } elseif ( $word == 'Wiktionaire' ) {
-                   $word = 'vom Wiktionaire';
-               } elseif ( $word == 'Wikibuecher' ) {
-                   $word = 'vo de Wikibuecher';
-               } elseif ( $word == 'Wikisprüch' ) {
-                   $word = 'vo de Wikisprüch';
-               } elseif ( $word == 'Wikiquälle' ) {
-                   $word = 'vo de Wikiquälle';
-               }
-               break;
-           case 'akkusativ':
-               if ( $word == 'Wikipedia' ) {
-                   $word = 'd Wikipedia';
-               } elseif ( $word == 'Wikinorchrichte' ) {
-                   $word = 'd Wikinochrichte';
-               } elseif ( $word == 'Wiktionaire' ) {
-                   $word = 's Wiktionaire';
-               } elseif ( $word == 'Wikibuecher' ) {
-                   $word = 'd Wikibuecher';
-               } elseif ( $word == 'Wikisprüch' ) {
-                   $word = 'd Wikisprüch';
-               } elseif ( $word == 'Wikiquälle' ) {
-                   $word = 'd Wikiquälle';
-               }
-               break;
-           case 'nominativ':
-               if ( $word == 'Wikipedia' ) {
-                   $word = 'd Wikipedia';
-               } elseif ( $word == 'Wikinorchrichte' ) {
-                   $word = 'd Wikinochrichte';
-               } elseif ( $word == 'Wiktionaire' ) {
-                   $word = 's Wiktionaire';
-               } elseif ( $word == 'Wikibuecher' ) {
-                   $word = 'd Wikibuecher';
-               } elseif ( $word == 'Wikisprüch' ) {
-                   $word = 'd Wikisprüch';
-               } elseif ( $word == 'Wikiquälle' ) {
-                   $word = 'd Wikiquälle';
-               }
-               break;
-       }
-       return $word;
-   }
-}
index efbaab3..f141878 100644 (file)
@@ -16,84 +16,11 @@ class LanguageHsb extends Language {
                }
 
                switch ( $case ) {
-                       case 'genitiw': # genitive
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipedije';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikiknih';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowin';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórła';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitatow';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłownika';
-                               }
-                               break;
-                       case 'datiw': # dativ
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipediji';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikikniham';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowinam';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórłu';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitatam';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłownikej';
-                               }
-                               break;
-                       case 'akuzativ': # akuzativ
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipediju';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikiknknihi';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowiny';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórło';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitaty';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłownik';
-                               }
-                               break;
                        case 'instrumental': # instrumental
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipediju';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikiknihami';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowinami';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórłom';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitatami';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłownikom';
-                               } else {
-                                       $word = 'z ' . $word;
-                               }
+                               $word = 'z ' . $word;
                                break;
                        case 'lokatiw': # lokatiw
-                               if ( $word == 'Wikipedija' ) {
-                                       $word = 'Wikipediji';
-                               } elseif ( $word == 'Wikiknihi' ) {
-                                       $word = 'Wikiknihach';
-                               } elseif ( $word == 'Wikinowiny' ) {
-                                       $word = 'Wikinowinach';
-                               } elseif ( $word == 'Wikižórło' ) {
-                                       $word = 'Wikižórłu';
-                               } elseif ( $word == 'Wikicitaty' ) {
-                                       $word = 'Wikicitatach';
-                               } elseif ( $word == 'Wikisłownik' ) {
-                                       $word = 'Wikisłowniku';
-                               } else {
-                                       $word = 'wo ' . $word;
-                               }
+                               $word = 'wo ' . $word;
                                break;
                        }
 
index d247b49..7845bdb 100644 (file)
@@ -11,31 +11,6 @@ class LanguageHu extends Language {
                        return $wgGrammarForms[$this->getCode()][$case][$word];
                }
 
-               static $localForms = array(
-                       'rol' => array(
-                               'Wikipédia'   => 'Wikipédiáról',
-                               'Wikidézet'   => 'Wikidézetről',
-                               'Wikiszótár'  => 'Wikiszótárról',
-                               'Wikikönyvek' => 'Wikikönyvekről',
-                       ),
-                       'ba' => array(
-                               'Wikipédia'   => 'Wikipédiába',
-                               'Wikidézet'   => 'Wikidézetbe',
-                               'Wikiszótár'  => 'Wikiszótárba',
-                               'Wikikönyvek' => 'Wikikönyvekbe',
-                       ),
-                       'k' => array(
-                               'Wikipédia'   => 'Wikipédiák',
-                               'Wikidézet'   => 'Wikidézetek',
-                               'Wikiszótár'  => 'Wikiszótárak',
-                               'Wikikönyvek' => 'Wikikönyvek',
-                       )
-               );
-
-               if ( isset( $localForms[$case][$word] ) ) {
-                       return $localForms[$case][$word];
-               }
-
                switch ( $case ) {
                        case 'rol':
                                return $word . 'ról';
@@ -46,5 +21,3 @@ class LanguageHu extends Language {
                }
        }
 }
-
-
index 1c82831..2c8d9f3 100644 (file)
@@ -27,31 +27,4 @@ class LanguageLv extends Language {
 
                return ( ( $count % 10 == 1 ) && ( $count % 100 != 11 ) ) ? $forms[0] : $forms[1];
        }
-
-       # Convert from the nominative form of a noun to some other case
-       # Invoked with {{GRAMMAR:case|word}}
-       # ģenitīvs - kā, datīvs - kam, akuzatīvs - ko, lokatīvs - kur.
-       /**
-        * Cases: ģenitīvs, datīvs, akuzatīvs, lokatīvs
-        */
-       function convertGrammar( $word, $case ) {
-               global $wgGrammarForms;
-
-               $wgGrammarForms['lv']['ģenitīvs' ]['Vikipēdija']   = 'Vikipēdijas';
-               $wgGrammarForms['lv']['ģenitīvs' ]['Vikivārdnīca'] = 'Vikivārdnīcas';
-               $wgGrammarForms['lv']['datīvs'   ]['Vikipēdija']   = 'Vikipēdijai';
-               $wgGrammarForms['lv']['datīvs'   ]['Vikivārdnīca'] = 'Vikivārdnīcai';
-               $wgGrammarForms['lv']['akuzatīvs']['Vikipēdija']   = 'Vikipēdiju';
-               $wgGrammarForms['lv']['akuzatīvs']['Vikivārdnīca'] = 'Vikivārdnīcu';
-               $wgGrammarForms['lv']['lokatīvs' ]['Vikipēdija']   = 'Vikipēdijā';
-               $wgGrammarForms['lv']['lokatīvs' ]['Vikivārdnīca'] = 'Vikivārdnīcā';
-
-               if ( isset($wgGrammarForms['lv'][$case][$word]) ) {
-                       return $wgGrammarForms['lv'][$case][$word];
-               }
-
-               return $word;
-       }
 }
-
-
diff --git a/languages/classes/LanguageRmy.php b/languages/classes/LanguageRmy.php
deleted file mode 100644 (file)
index e3cab8f..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @ingroup Language
- */
-class LanguageRmy extends Language {
-       /**
-        * Convert from the nominative form of a noun to some other case
-        * Invoked with {{GRAMMAR:case|word}}
-        *
-        * Cases: nominative, genitive-m-sg, genitive-f-sg, dative, locative, ablative, instrumental
-        */
-       public function convertGrammar( $word, $case ) {
-               global $wgGrammarForms;
-               if ( isset($wgGrammarForms['rmy'][$case][$word]) ) {
-                       return $wgGrammarForms['rmy'][$case][$word];
-               }
-
-               switch ( $case ) {
-                       case 'genitive-m-sg': # genitive (m.sg.)
-                               if ( $word == 'Vikipidiya' ) {
-                                       $word = 'Vikipidiyako';
-                               } elseif ( $word == 'Vikcyonaro' ) {
-                                       $word = 'Vikcyonaresko';
-                               }
-                       break;
-                       case 'genitive-f-sg': # genitive (f.sg.)
-                               if ( $word == 'Vikipidiya' ) {
-                                       $word = 'Vikipidiyaki';
-                               } elseif ( $word == 'Vikcyonaro' ) {
-                                       $word = 'Vikcyonareski';
-                               }
-                       break;
-                       case 'genitive-pl': # genitive (pl.)
-                               if ( $word == 'Vikipidiya' ) {
-                                       $word = 'Vikipidiyake';
-                               } elseif ( $word == 'Vikcyonaro' ) {
-                                       $word = 'Vikcyonareske';
-                               }
-                       break;
-                       case 'dativ':
-                               if ( $word == 'Vikipidiyake' ) {
-                                       $word = 'Wikipediji';
-                               } elseif ( $word == 'Vikcyonaro' ) {
-                                       $word = 'Vikcyonareske';
-                               }
-                       break;
-                       case 'locative':
-                               if ( $word == 'Vikipidiyate' ) {
-                                       $word = 'Wikipedijo';
-                               } elseif ( $word == 'Vikcyonaro' ) {
-                                       $word = 'Vikcyonareste';
-                               }
-                       break;
-                       case 'ablative':
-                               if ( $word == 'Vikipidiyatar' ) {
-                                       $word = 'o Wikipediji';
-                               } elseif ( $word == 'Vikcyonaro' ) {
-                                       $word = 'Vikcyonarestar';
-                               }
-                       break;
-                       case 'instrumental':
-                               if ( $word == 'Vikipidiyasa' ) {
-                                       $word = 'z Wikipedijo';
-                               } elseif ( $word == 'Vikcyonaro' ) {
-                                       $word = 'Vikcyonaresa';
-                               }
-                       break;
-               }
-
-               return $word; # this will return the original value for 'nominative' and all undefined case values
-       }
-}
index 19e66ba..7ddbcbd 100644 (file)
@@ -1,82 +1,10 @@
 <?php
-
 /**
  * Slovak (Slovenčina)
  *
  * @ingroup Language
  */
 class LanguageSk extends Language {
-       # Convert from the nominative form of a noun to some other case
-       # Invoked with {{GRAMMAR:case|word}}
-       /**
-        * Cases: genitív, datív, akuzatív, lokál, inštrumentál
-        */
-       function convertGrammar( $word, $case ) {
-               global $wgGrammarForms;
-               if ( isset($wgGrammarForms['sk'][$case][$word]) ) {
-                       return $wgGrammarForms['sk'][$case][$word];
-               }
-
-               switch ( $case ) {
-                       case 'genitív':
-                               if ( $word == 'Wikipédia' ) {
-                                       $word = 'Wikipédie';
-                               } elseif ( $word == 'Wikislovník' ) {
-                                       $word = 'Wikislovníku';
-                               } elseif ( $word == 'Wikicitáty' ) {
-                                       $word = 'Wikicitátov';
-                               } elseif ( $word == 'Wikiknihy' ) {
-                                       $word = 'Wikikníh';
-                               }
-                       break;
-                       case 'datív':
-                               if ( $word == 'Wikipédia' ) {
-                                       $word = 'Wikipédii';
-                               } elseif ( $word == 'Wikislovník' ) {
-                                       $word = 'Wikislovníku';
-                               } elseif ( $word == 'Wikicitáty' ) {
-                                       $word = 'Wikicitátom';
-                               } elseif ( $word == 'Wikiknihy' ) {
-                                       $word = 'Wikiknihám';
-                               }
-                       break;
-                       case 'akuzatív':
-                               if ( $word == 'Wikipédia' ) {
-                                       $word = 'Wikipédiu';
-                               } elseif ( $word == 'Wikislovník' ) {
-                                       $word = 'Wikislovník';
-                               } elseif ( $word == 'Wikicitáty' ) {
-                                       $word = 'Wikicitáty';
-                               } elseif ( $word == 'Wikiknihy' ) {
-                                       $word = 'Wikiknihy';
-                               }
-                       break;
-                       case 'lokál':
-                               if ( $word == 'Wikipédia' ) {
-                                       $word = 'Wikipédii';
-                               } elseif ( $word == 'Wikislovník' ) {
-                                       $word = 'Wikislovníku';
-                               } elseif ( $word == 'Wikicitáty' ) {
-                                       $word = 'Wikicitátoch';
-                               } elseif ( $word == 'Wikiknihy' ) {
-                                       $word = 'Wikiknihách';
-                               }
-                       break;
-                       case 'inštrumentál':
-                               if ( $word == 'Wikipédia' ) {
-                                       $word = 'Wikipédiou';
-                               } elseif ( $word == 'Wikislovník' ) {
-                                       $word = 'Wikislovníkom';
-                               } elseif ( $word == 'Wikicitáty' ) {
-                                       $word = 'Wikicitátmi';
-                               } elseif ( $word == 'Wikiknihy' ) {
-                                       $word = 'Wikiknihami';
-                               }
-                       break;
-               }
-               return $word;
-       }
-
        function convertPlural( $count, $forms ) {
                if ( !count($forms) ) { return ''; }
                $forms = $this->preConvertPlural( $forms, 3 );
index 8c1b503..13ddf15 100644 (file)
@@ -17,55 +17,10 @@ class LanguageSl extends Language {
                }
 
                switch ( $case ) {
-                       case 'rodilnik': # genitive
-                               switch ( $word ) {
-                                       case 'Wikipedija': $word = 'Wikipedije'; break 2;
-                                       case 'Wikiknjige': $word = 'Wikiknjig'; break 2;
-                                       case 'Wikinovice': $word = 'Wikinovic'; break 2;
-                                       case 'Wikinavedek': $word = 'Wikinavedka'; break 2;
-                                       case 'Wikivir': $word = 'Wikivira'; break 2;
-                                       case 'Wikislovar': $word = 'Wikislovarja'; break 2;
-                               }
-                       case 'dajalnik': # dativ
-                               switch ( $word ) {
-                                       case 'Wikipedija': $word = 'Wikipediji'; break 2;
-                                       case 'Wikiknjige': $word = 'Wikiknjigam'; break 2;
-                                       case 'Wikinovice': $word = 'Wikinovicam'; break 2;
-                                       case 'Wikinavedek': $word = 'Wikinavedku'; break 2;
-                                       case 'Wikivir': $word = 'Wikiviru'; break 2;
-                                       case 'Wikislovar': $word = 'Wikislovarju'; break 2;
-                               }
-                       case 'tožilnik': # akuzatív
-                               switch ( $word ) {
-                                       case 'Wikipedija': $word = 'Wikipedijo'; break 2;
-                                       case 'Wikiknjige':
-                                       case 'Wikinovice':
-                                       case 'Wikinavedek':
-                                       case 'Wikivir':
-                                       case 'Wikislovar':
-                                               // Don't change, just fall through
-                                               break 2;
-                               }
                        case 'mestnik': # locative
-                               switch ( $word ) {
-                                       case 'Wikipedija': $word = 'o Wikipediji'; break 2;
-                                       case 'Wikiknjige': $word = 'o Wikiknjigah'; break 2;
-                                       case 'Wikinovice': $word = 'o Wikinovicah'; break 2;
-                                       case 'Wikinavedek': $word = 'o Wikinavedku'; break 2;
-                                       case 'Wikivir': $word = 'o Wikiviru'; break 2;
-                                       case 'Wikislovar': $word = 'o Wikislovarju'; break 2;
-                                       default: $word = 'o ' . $word; break 2;
-                               }
+                               $word = 'o ' . $word; break 2;
                        case 'orodnik': # instrumental
-                               switch ( $word ) {
-                                       case 'Wikipedija': $word = 'z Wikipedijo'; break 2;
-                                       case 'Wikiknjige': $word = 'z Wikiknjigami'; break 2;
-                                       case 'Wikinovice': $word = 'z Wikinovicami'; break 2;
-                                       case 'Wikinavedek': $word = 'z Wikinavedkom'; break 2;
-                                       case 'Wikivir': $word = 'z Wikivirom'; break 2;
-                                       case 'Wikislovar': $word = 'z Wikislovarjem'; break 2;
-                                       default: $word = 'z ' . $word;
-                               }
+                               $word = 'z ' . $word;
                }
 
                return $word; # this will return the original value for 'imenovalnik' (nominativ) and all undefined case values