From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Mon, 17 Dec 2007 23:44:29 +0000 (+0000)
Subject: * Rename new message 'filetype-separator' (r28530) to the more generic message name... 
X-Git-Tag: 1.31.0-rc.0~50368
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=7b70ea70b1731a825cb7352f3aff955ebb57e349;p=lhc%2Fweb%2Fwiklou.git

* Rename new message 'filetype-separator' (r28530) to the more generic message name 'comma-separator'.
Can be useful for other still hardcoded comma separations.
---

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index b14156c32b..76f926fbf2 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -326,7 +326,7 @@ class UploadForm {
 						array( 'parseinline' ),
 						htmlspecialchars( $finalExt ),
 						implode(
-							wfMsgExt( 'filetype-separator', array( 'escapenoentities' ) ),
+							wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ),
 							$wgFileExtensions
 						)
 					)
@@ -508,7 +508,7 @@ class UploadForm {
 						array( 'parseinline' ),
 						htmlspecialchars( $finalExt ),
 						implode(
-							wfMsgExt( 'filetype-separator', array( 'escapenoentities' ) ),
+							wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ),
 							$wgFileExtensions
 						)
 					) . '</li>';
@@ -970,7 +970,7 @@ wgAjaxLicensePreview = {$alp};
 		global $wgCheckFileExtensions, $wgStrictFileExtensions,
 		$wgFileExtensions, $wgFileBlacklist;
 		if( $wgCheckFileExtensions ) {
-			$delim = wfMsgExt( 'filetype-separator', array( 'escapenoentities' ) );
+			$delim = wfMsgExt( 'comma-separator', array( 'escapenoentities' ) );
 			if( $wgStrictFileExtensions ) {
 				# Everything not permitted is banned
 				$wgOut->addHTML(
diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index e7e81a319f..d87c2f859a 100644
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -2522,7 +2522,7 @@ $1',
 
 # Separators for various lists
 'semicolon-separator' => '؛',
-'filetype-separator'  => '،',
+'comma-separator'     => '،',
 
 # Multipage image navigation
 'imgmultipageprev'   => '← الصفحة السابقة',
diff --git a/languages/messages/MessagesEl.php b/languages/messages/MessagesEl.php
index 6f17a76481..8f640f2cb1 100644
--- a/languages/messages/MessagesEl.php
+++ b/languages/messages/MessagesEl.php
@@ -2359,9 +2359,6 @@ $1',
 'articletitles'    => "Άρθρα που αρχίζουν από ''$1''",
 'hideresults'      => 'Απόκρυψη αποτελεσμάτων',
 
-# Separators for various lists
-'filetype-separator' => ',',
-
 # Multipage image navigation
 'imgmultipageprev'   => '← προηγούμενη σελίδα',
 'imgmultipagenext'   => 'επόμενη σελίδα →',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 635fcdebfe..597b99d223 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2970,7 +2970,7 @@ $1',
 # Separators for various lists
 '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
-'filetype-separator'    => ', ', # only translate this message to other languages if you have to change it 
+'comma-separator'       => ', ', # only translate this message to other languages if you have to change it 
 
 # Multipage image navigation
 'imgmultipageprev'   => '← previous page',
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index d277b3d702..ac893c845a 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -265,7 +265,7 @@ $wgOptionalMessages = array(
 	'hebrew-calendar-m11-gen',
 	'hebrew-calendar-m12-gen',
 	'semicolon-separator',
-	'filetype-separator',
+	'comma-separator',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index c5727abc3c..3587aca44a 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2203,7 +2203,7 @@ $wgMessageStructure = array(
 	'separators' => array(
 		'catseparator',
 		'semicolon-separator',
-		'filetype-separator',
+		'comma-separator',
 	),
 	'imgmulti' => array(
 		'imgmultipageprev',