(bug 5709) Allow customisation of separator for categories

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 82a34f9..6963dd9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -116,6 +116,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Remove useless whitespace from Special:Brokenredirects header
 * Treat "allmessagesnotsupporteddb" as wikitext when echoing; change default text
 * (bug 5497) regeression in HTML normalization in 1.6 (unclosed <li>,<dd>,<dt>)
+* (bug 5709) Allow customisation of separator for categories
 
 == Compatibility ==
 

diff --git a/includes/Skin.php b/includes/Skin.php
index 783bf7c..6bc2935 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -504,12 +504,15 @@ END;
 
                if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
 
+               # Separator
+               $sep = wfMsgHtml( 'catseparator' );
+
                // Use Unicode bidi embedding override characters,
                // to make sure links don't smash each other up in ugly ways.
                $dir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
                $embed = "<span dir='$dir'>";
                $pop = '</span>';
-               $t = $embed . implode ( "$pop | $embed" , $wgOut->mCategoryLinks ) . $pop;
+               $t = $embed . implode ( "{$pop} {$sep} {$embed}" , $wgOut->mCategoryLinks ) . $pop;
 
                $msg = count( $wgOut->mCategoryLinks ) === 1 ? 'categories1' : 'categories';
                $s = $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Categories' ),

diff --git a/languages/Messages.php b/languages/Messages.php
index 7b4796c..5526c98 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -2024,6 +2024,9 @@ Please confirm that really want to recreate this article.',
 # DISPLAYTITLE
 'displaytitle' => '(Link to this page as [[$1]])',
 
+# Separator for categories in page lists
+'catseparator' => '|',
+
 );