* (bug 4685) More fixes for Slovenian project namespace

- have convertGrammar() return the preposition with all forms instead of just the predefined ones
- don't double the preposition in NS_PROJECT_TALK for predefined forms
- include the proper underscores in the internal namespace names

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c53d6b7..6c74289 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -642,6 +642,7 @@ fully support the editing toolbar, but was found to be too confusing.
   page titles. (Odd hex title bug on 64-bit.)
 * Fix explicit s-maxage=0 on raw pages; should help with proxy issues in
   generated stylesheets... hopefully...
+* (bug 4685) More fixes for Slovenian project namespace
 
 
 === Caveats ===

diff --git a/languages/LanguageSl.php b/languages/LanguageSl.php
index e8aaf90..8cecf5d 100644 (file)
--- a/languages/LanguageSl.php
+++ b/languages/LanguageSl.php
@@ -61,7 +61,9 @@ class LanguageSl extends LanguageUtf8 {
        function LanguageSl() {
                global $wgNamespaceNamesSl, $wgMetaNamespace;
                LanguageUtf8::LanguageUtf8();
-               $wgNamespaceNamesSl[NS_PROJECT_TALK] = 'Pogovor_o_' . $this->convertGrammar( $wgMetaNamespace, 'orodnik' );
+               $wgNamespaceNamesSl[NS_PROJECT_TALK] = 'Pogovor_' .
+                       str_replace( ' ', '_',
+                               $this->convertGrammar( $wgMetaNamespace, 'orodnik' ) );
        }
 
        function getNamespaces() {
@@ -157,6 +159,8 @@ class LanguageSl extends LanguageUtf8 {
                                        $word = 'z Wikivirom';
                                } elseif ( $word == 'Wikislovar' ) {
                                        $word = 'z Wikislovarjem';
+                               } else {
+                                       $word = 'z ' . $word;
                                }
                        break;
                        case 'orodnik': # instrumental
@@ -172,6 +176,8 @@ class LanguageSl extends LanguageUtf8 {
                                        $word = 'o Wikiviru';
                                } elseif ( $word == 'Wikislovar' ) {
                                        $word = 'o Wikislovarju';
+                               } else {
+                                       $word = 'o ' . $word;
                                }
                        break;
                }