From 130cb3bbd87fdebde302ebcf215dd33c163a0a83 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Thu, 6 Mar 2008 18:54:22 +0000
Subject: [PATCH] Replace last two check-ins, which were reverted (somehow I
 couldn't get svn diff -c or svn merge to work, kept asking for my passphrase
 repeatedly and did nothing).  They made the colon and space part of the
 category link.  Instead, use a colon-separator message.  Really I'd like to
 have per-use messages for punctuation like this, since colons are used in
 lots of different contexts, but others don't seem to like that.

---
 RELEASE-NOTES                     |  2 ++
 includes/Skin.php                 | 11 ++++++-----
 languages/messages/MessagesEn.php |  1 +
 languages/messages/MessagesFr.php |  3 +++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 34a5ffa757..07610f5be7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -72,6 +72,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13012) Use content messages for block options when generating the
   recentchanges entry
 * (bug 13274) Change links for messages to ucfirst
+* (bug 13273) "Categories:" message at the bottom of the page shouldn't have
+  hardcoded colon, use new 'colon-separator' message instead
 
 === API changes in 1.13 ===
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 2cc12a524c..5b03953f60 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -626,7 +626,7 @@ END;
 	}
 
 
-	function getCategoryLinks () {
+	function getCategoryLinks() {
 		global $wgOut, $wgTitle, $wgUseCategoryBrowser;
 		global $wgContLang, $wgUser;
 
@@ -643,13 +643,14 @@ END;
 
 		$allCats = $wgOut->getCategoryLinks();
 		$s = '';
+		$colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
 		if ( !empty( $allCats['normal'] ) ) {
 			$t = $embed . implode ( "{$pop} {$sep} {$embed}" , $allCats['normal'] ) . $pop;
 	
-			$msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escape' ), count( $allCats['normal'] ) );
+			$msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escapenoentities' ), count( $allCats['normal'] ) );
 			$s .= '<div id="mw-normal-catlinks">' .
 				$this->makeLinkObj( Title::newFromText( wfMsgForContent('pagecategorieslink') ), $msg )
-				. ': ' . $t . '</div>';
+				. $colon . $t . '</div>';
 		}
 
 		# Hidden categories
@@ -662,8 +663,8 @@ END;
 				$class = 'mw-hidden-cats-hidden';
 			}
 			$s .= "<div id=\"mw-hidden-catlinks\" class=\"$class\">" . 
-				wfMsgExt( 'hidden-categories', array( 'parsemag', 'escape' ), count( $allCats['hidden'] ) ) . 
-				': ' . $embed . implode( "$pop $sep $embed", $allCats['hidden'] ) . $pop .
+				wfMsgExt( 'hidden-categories', array( 'parsemag', 'escapenoentities' ), count( $allCats['hidden'] ) ) . 
+				$colon . $embed . implode( "$pop $sep $embed", $allCats['hidden'] ) . $pop .
 				"</div>";
 		}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d6f2516432..9fd4cecf29 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2905,6 +2905,7 @@ $1',
 'catseparator'        => '|', # don't translate or duplicate this message to other languages
 'semicolon-separator' => ';', # only translate this message to other languages if you have to change it
 'comma-separator'     => ',&#32;', # only translate this message to other languages if you have to change it
+'colon-separator'     => ':&#32;', # only translate this message to other languages if you have to change it
 
 # Multipage image navigation
 'imgmultipageprev' => '← previous page',
diff --git a/languages/messages/MessagesFr.php b/languages/messages/MessagesFr.php
index 229fa76059..697dfbabcc 100644
--- a/languages/messages/MessagesFr.php
+++ b/languages/messages/MessagesFr.php
@@ -2378,6 +2378,9 @@ Veuillez confirmer que vous désirez recréer cet article.",
 'confirm_purge'        => 'Voulez-vous rafraîchir cette page (purger le cache) ? $1',
 'confirm_purge_button' => 'Confirmer',
 
+# Separators for various lists
+'colon-separator' => '&nbsp;:&#32;',
+
 # AJAX search
 'searchcontaining' => 'Chercher les articles contenant « $1 ».',
 'searchnamed'      => 'Chercher les articles nommés « $1 ».',
-- 
2.20.1