* Rename new message 'filetype-separator' (r28530) to the more generic message name...

Can be useful for other still hardcoded comma separations.

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index b14156c..76f926f 100644 (file)
--- 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 e7e81a3..d87c2f8 100644 (file)
--- 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 6f17a76..8f640f2 100644 (file)
--- 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 635fcde..597b99d 100644 (file)
--- 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 d277b3d..ac893c8 100644 (file)
--- 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 c5727ab..3587aca 100644 (file)
--- 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',