* (bug 7810) Update talk namespaces for Occitan

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8702e24..30274f7 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -142,6 +142,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Fix regression in streaming page dump generation
 * (bug 7801) Add support for parser function hooks in parser tests
 * checkUsernames.php now uses wfDebugLog instead of hardcoded path to log
+* (bug 7810) Update talk namespaces for Occitan
 
 
 == Languages updated ==

diff --git a/languages/messages/MessagesOc.php b/languages/messages/MessagesOc.php
index af63d98..7635037 100644 (file)
--- a/languages/messages/MessagesOc.php
+++ b/languages/messages/MessagesOc.php
@@ -23,19 +23,28 @@ $namespaceNames = array(
        NS_MAIN           => '',
        NS_TALK           => 'Discutir',
        NS_USER           => 'Utilisator',
-       NS_USER_TALK      => 'Discutida_Utilisator',
+       NS_USER_TALK      => 'Discussion_Utilisator',
        # NS_PROJECT set by $wgMetaNamespace
-       NS_PROJECT_TALK   => 'Discutida_$1',
+       NS_PROJECT_TALK   => 'Discussion_$1',
        NS_IMAGE          => 'Imatge',
-       NS_IMAGE_TALK     => 'Discutida_Imatge',
+       NS_IMAGE_TALK     => 'Discussion_Imatge',
        NS_MEDIAWIKI      => 'Mediaòiqui',
-       NS_MEDIAWIKI_TALK => 'Discutida_Mediaòiqui',
+       NS_MEDIAWIKI_TALK => 'Discussion_Mediaòiqui',
        NS_TEMPLATE       => 'Modèl',
-       NS_TEMPLATE_TALK  => 'Discutida_Modèl',
+       NS_TEMPLATE_TALK  => 'Discussion_Modèl',
        NS_HELP           => 'Ajuda',
-       NS_HELP_TALK      => 'Discutida_Ajuda',
+       NS_HELP_TALK      => 'Discussion_Ajuda',
        NS_CATEGORY       => 'Categoria',
-       NS_CATEGORY_TALK  => 'Discutida_Categoria',
+       NS_CATEGORY_TALK  => 'Discussion_Categoria',
+);
+$namespaceAliases = array(
+       'Discutida_Utilisator' => NS_USER_TALK,
+       //'Discutida_$1'         => NS_PROJECT_TALK, /// @fixme
+       'Discutida_Imatge'     => NS_IMAGE_TALK,
+       'Discutida_Mediaòiqui' => NS_MEDIAWIKI_TALK,
+       'Discutida_Modèl'      => NS_TEMPLATE_TALK,
+       'Discutida_Ajuda'      => NS_HELP_TALK,
+       'Discutida_Categoria'  => NS_CATEGORY_TALK,
 );
 $linkTrail = "/^([a-zàâçéèêîôû]+)(.*)\$/sDu";