* Entries in $wgGrammarForms should apply to one language only

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e2c59bf..a96a1d0 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -564,7 +564,7 @@ $wgLanguageCode     = 'en';
  * Used in Language::convertGrammar().
  */
 $wgGrammarForms = array();
-#$wgGrammarForms['genitive']['car'] = 'car\'s';
+#$wgGrammarForms['en']['genitive']['car'] = 'car\'s';
 
 /** Treat language links as magic connectors, not inline links */
 $wgInterwikiMagic = true;

diff --git a/languages/Language.php b/languages/Language.php
index eacf153..f2485bc 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1022,8 +1022,8 @@ class Language {
         */
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['en'][$case][$word]) ) {
+                       return $wgGrammarForms['en'][$case][$word];
                }
                return $word;
        }

diff --git a/languages/LanguageBs.php b/languages/LanguageBs.php
index 10313f1..05804d3 100644 (file)
--- a/languages/LanguageBs.php
+++ b/languages/LanguageBs.php
@@ -184,8 +184,8 @@ class LanguageBs extends LanguageUtf8 {
        # Invoked with {{GRAMMAR:case|word}}
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['bs'][$case][$word]) ) {
+                       return $wgGrammarForms['bs'][$case][$word];
                }
                switch ( $case ) {
                        case 'genitiv': # genitive

diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php
index 9e36d39..804c487 100644 (file)
--- a/languages/LanguageCs.php
+++ b/languages/LanguageCs.php
@@ -193,8 +193,8 @@ class LanguageCs extends LanguageUtf8 {
        # Invoked by putting {{grammar:case|word}} in a message
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['cs'][$case][$word]) ) {
+                       return $wgGrammarForms['cs'][$case][$word];
                }
                # allowed values for $case:
                #       1sg, 2sg, ..., 7sg -- nominative, genitive, ... (in singular)

diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php
index e183064..19de0eb 100644 (file)
--- a/languages/LanguageFi.php
+++ b/languages/LanguageFi.php
@@ -194,8 +194,8 @@ class LanguageFi extends LanguageUtf8 {
        # Invoked with {{GRAMMAR:case|word}}
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['fi'][$case][$word]) ) {
+                       return $wgGrammarForms['fi'][$case][$word];
                }
 
                # These rules are not perfect, but they are currently only used for site names so it doesn't

diff --git a/languages/LanguageGa.php b/languages/LanguageGa.php
index d25e8c2..8229527 100644 (file)
--- a/languages/LanguageGa.php
+++ b/languages/LanguageGa.php
@@ -176,8 +176,8 @@ class LanguageGa extends LanguageUtf8 {
        # Invoked with {{GRAMMAR:transformation|word}}
        function convertGrammar( $word, $what ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['ga'][$case][$word]) ) {
+                       return $wgGrammarForms['ga'][$case][$word];
                }
 
                switch ( $what ) {

diff --git a/languages/LanguageLa.php b/languages/LanguageLa.php
index b27a39c..43eb72e 100644 (file)
--- a/languages/LanguageLa.php
+++ b/languages/LanguageLa.php
@@ -95,8 +95,8 @@ class LanguageLa extends LanguageUtf8 {
         */
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['la'][$case][$word]) ) {
+                       return $wgGrammarForms['la'][$case][$word];
                }
 
                switch ( $case ) {

diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index a37bdd4..f0067ce 100644 (file)
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -163,8 +163,8 @@ class LanguageRu extends LanguageUtf8 {
        # Invoked with {{grammar:case|word}}
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['ru'][$case][$word]) ) {
+                       return $wgGrammarForms['ru'][$case][$word];
                }
 
                # These rules are not perfect, but they are currently only used for site names so it doesn't

diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php
index 6cf472c..0c17b0c 100644 (file)
--- a/languages/LanguageSk.php
+++ b/languages/LanguageSk.php
@@ -178,8 +178,8 @@ class LanguageSk extends LanguageUtf8 {
        # Invoked with {{GRAMMAR:case|word}}
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['sk'][$case][$word]) ) {
+                       return $wgGrammarForms['sk'][$case][$word];
                }
 
                switch ( $case ) {

diff --git a/languages/LanguageSl.php b/languages/LanguageSl.php
index 2adaac8..9795d69 100644 (file)
--- a/languages/LanguageSl.php
+++ b/languages/LanguageSl.php
@@ -101,8 +101,8 @@ class LanguageSl extends LanguageUtf8 {
        # Invoked with {{GRAMMAR:case|word}}
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['sl'][$case][$word]) ) {
+                       return $wgGrammarForms['sl'][$case][$word];
                }
 
                switch ( $case ) {

diff --git a/languages/LanguageTyv.php b/languages/LanguageTyv.php
index e6544d6..9ae23b0 100644 (file)
--- a/languages/LanguageTyv.php
+++ b/languages/LanguageTyv.php
@@ -100,8 +100,8 @@ class LanguageTyv extends LanguageUtf8 {
         */
        function convertGrammar( $word, $case ) {
                global $wgGrammarForms;
-               if ( isset($wgGrammarForms[$case][$word]) ) {
-                       return $wgGrammarForms[$case][$word];
+               if ( isset($wgGrammarForms['tyv'][$case][$word]) ) {
+                       return $wgGrammarForms['tyv'][$case][$word];
                }