* (bug 6497) Use $wgMetaNamespaceTalk for Esperanto if set

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 936c561..86b41ab 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -612,6 +612,7 @@ Some default configuration options have changed:
   "dumb" byte replacement can be actively dangerous; UTF-8 is always safe
   in this regard due to the bit patterns which make head and tail bytes
   distinct.
+* (bug 6497) Use $wgMetaNamespaceTalk for Esperanto if set
 
 
 == Compatibility ==

diff --git a/languages/LanguageEo.php b/languages/LanguageEo.php
index 464ef09..bfb5b27 100644 (file)
--- a/languages/LanguageEo.php
+++ b/languages/LanguageEo.php
@@ -32,16 +32,16 @@ class LanguageEo extends LanguageUtf8 {
                global $wgAllMessagesEo;
                $this->mMessagesEo =& $wgAllMessagesEo;
 
-               global $wgMetaNamespace;
+               global $wgMetaNamespace, $wgMetaNamespaceTalk;
                $this->mNamespaceNamesEo = array(
                        NS_MEDIA          => 'Media',
                        NS_SPECIAL        => 'Speciala',
                        NS_MAIN           => '',
                        NS_TALK           => 'Diskuto',
-                       NS_USER           => 'Vikipediisto',
+                       NS_USER           => 'Vikipediisto', # FIXME: Generalize v-isto kaj v-io
                        NS_USER_TALK      => 'Vikipediista_diskuto',
-                       NS_PROJECT        => $wgMetaNamespace, # FIXME: Generalize v-isto kaj v-io
-                       NS_PROJECT_TALK   => $wgMetaNamespace.'_diskuto', # FIXME
+                       NS_PROJECT        => $wgMetaNamespace,
+                       NS_PROJECT_TALK   => ( $wgMetaNamespaceTalk ? $wgMetaNamespaceTalk : $wgMetaNamespace.'_diskuto' ),
                        NS_IMAGE          => 'Dosiero', #FIXME: Check the magic for Image: and Media:
                        NS_IMAGE_TALK     => 'Dosiera_diskuto',
                        NS_MEDIAWIKI      => 'MediaWiki',