From 70341a6fa2f9d30cfc403dcb11ac458f4591c4e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Thu, 25 May 2006 20:52:45 +0000 Subject: [PATCH] * Entries in $wgGrammarForms should apply to one language only --- includes/DefaultSettings.php | 2 +- languages/Language.php | 4 ++-- languages/LanguageBs.php | 4 ++-- languages/LanguageCs.php | 4 ++-- languages/LanguageFi.php | 4 ++-- languages/LanguageGa.php | 4 ++-- languages/LanguageLa.php | 4 ++-- languages/LanguageRu.php | 4 ++-- languages/LanguageSk.php | 4 ++-- languages/LanguageSl.php | 4 ++-- languages/LanguageTyv.php | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index e2c59bfe8b..a96a1d0671 100644 --- 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 eacf1535e8..f2485bce61 100644 --- 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 10313f1d8a..05804d343f 100644 --- 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 9e36d39109..804c4879b4 100644 --- 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 e18306403d..19de0eb8d2 100644 --- 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 d25e8c2fee..8229527633 100644 --- 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 b27a39c3f8..43eb72e682 100644 --- 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 a37bdd48f1..f0067ce0db 100644 --- 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 6cf472cc4e..0c17b0c944 100644 --- 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 2adaac85b6..9795d69f8f 100644 --- 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 e6544d62ab..9ae23b0458 100644 --- 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]; } -- 2.20.1