* (bug 11810) Localize displayed semicolons

Based on a patch of Roozbeh Pournader. Optimized for caching and more arabic script languages added.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 14a66cb..f9cb3f1 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -89,6 +89,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   does not exists
 * (bug 8396) Ignore out-of-date serialised message caches
 * (bug 12195) Undeleting pages now requires 'undelete' permission
+* (bug 11810) Localize displayed semicolons
 
 === Bug fixes in 1.12 ===
 

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 617e12e..507e88f 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -58,7 +58,7 @@ class ChangesList {
                // Precache various messages
                if( !isset( $this->message ) ) {
                        foreach( explode(' ', 'cur diff hist minoreditletter newpageletter last '.
-                               'blocklink history boteditletter' ) as $msg ) {
+                               'blocklink history boteditletter semicolon-separator' ) as $msg ) {
                                $this->message[$msg] = wfMsgExt( $msg, array( 'escape') );
                        }
                }
@@ -185,7 +185,7 @@ class ChangesList {
        function insertTimestamp(&$s, $rc) {
                global $wgLang;
                # Timestamp
-               $s .= '; ' . $wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ) . ' . . ';
+               $s .= $this->message['semicolon-separator'] . ' ' . $wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ) . ' . . ';
        }
 
        /** Insert links to user page, user talk page and eventually a blocking link */
@@ -456,7 +456,7 @@ class EnhancedChangesList extends ChangesList {
                        array_push( $users, $text );
                }
 
-               $users = ' <span class="changedby">['.implode('; ',$users).']</span>';
+               $users = ' <span class="changedby">[' . implode( $this->message['semicolon-separator'] . ' ', $users ) . ']</span>';
 
                # Arrow
                $rci = 'RCI'.$this->rcCacheIndex;
@@ -549,7 +549,7 @@ class EnhancedChangesList extends ChangesList {
                        $r .= $link;
                        $r .= ' (';
                        $r .= $rcObj->curlink;
-                       $r .= '; ';
+                       $r .= $this->message['semicolon-separator'] . ' ';
                        $r .= $rcObj->lastlink;
                        $r .= ') . . ';
 
@@ -654,7 +654,7 @@ class EnhancedChangesList extends ChangesList {
                $r .= $this->maybeWatchedLink( $rcObj->link, $rcObj->watched );
 
                # Diff
-               $r .= ' ('. $rcObj->difflink .'; ';
+               $r .= ' ('. $rcObj->difflink . $this->message['semicolon-separator'] . ' ';
 
                # Hist
                $r .= $this->skin->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history' ) . ') . . ';
@@ -707,4 +707,3 @@ class EnhancedChangesList extends ChangesList {
        }
 
 }
-

diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index 0558c5e..611fec1 100644 (file)
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -2513,6 +2513,9 @@ $1',
 'articletitles'    => "الصفحات التي تبدأ ب''$1''",
 'hideresults'      => 'إخفاء النتائج',
 
+# Separators for various lists
+'semicolon-separator' => '؛',
+
 # Multipage image navigation
 'imgmultipageprev'   => '← الصفحة السابقة',
 'imgmultipagenext'   => 'الصفحة التالية →',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 6fd29e4..541a012 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2950,8 +2950,9 @@ $1',
 'articletitles'    => "Pages starting with ''$1''",
 'hideresults'      => 'Hide results',
 
-# Separator for categories in page lists
-'catseparator' => '|', # don't translate or duplicate this message to other languages
+# 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
 
 # Multipage image navigation
 'imgmultipageprev'   => '← previous page',

diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php
index e333db0..7561637 100644 (file)
--- a/languages/messages/MessagesFa.php
+++ b/languages/messages/MessagesFa.php
@@ -2394,6 +2394,9 @@ $1',
 'articletitles'    => "مقاله‌هایی که با ''$1'' آغاز می‌شوند.",
 'hideresults'      => 'نهفتن نتایج',
 
+# Separators for various lists
+'semicolon-separator' => '؛',
+
 # Multipage image navigation
 'imgmultipageprev'   => '→ صفحهٔ پیشین',
 'imgmultipagenext'   => 'صفحهٔ بعد ←',

diff --git a/languages/messages/MessagesKk_cn.php b/languages/messages/MessagesKk_cn.php
index 0b2f9fd..e7a2b01 100644 (file)
--- a/languages/messages/MessagesKk_cn.php
+++ b/languages/messages/MessagesKk_cn.php
@@ -2639,6 +2639,9 @@ $1',
 'articletitles'    => "''$1'' دەپ باستالعان بەتتەردٸ",
 'hideresults'      => 'نٵتيجەلەردٸ جاسىر',
 
+# Separators for various lists
+'semicolon-separator' => '؛',
+
 # Multipage image navigation
 'imgmultipageprev'   => '← الدىڭعى بەتكە',
 'imgmultipagenext'   => 'كەلەسٸ بەتكە →',

diff --git a/languages/messages/MessagesKu_arab.php b/languages/messages/MessagesKu_arab.php
index b285294..2936fb1 100644 (file)
--- a/languages/messages/MessagesKu_arab.php
+++ b/languages/messages/MessagesKu_arab.php
@@ -31,4 +31,7 @@ $messages = array(
 'tog-editondblclick'  => 'په‌ڕه‌كان به‌ دوو كرته‌ بكه‌وه‌ بۆ كارتیاكردن (JavaScript)',
 'tog-editsection'     => 'به‌سته‌ر بۆ كۆپله‌كان بۆ ده‌ستكاریی كردن نیشانبده‌',
 
+# Separators for various lists
+'semicolon-separator' => '؛',
+
 );

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 938876e..eca5fa1 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -258,6 +258,7 @@ $wgOptionalMessages = array(
        'hebrew-calendar-m10-gen',
        'hebrew-calendar-m11-gen',
        'hebrew-calendar-m12-gen',
+       'semicolon-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 1018dfe..34a1388 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2187,8 +2187,9 @@ $wgMessageStructure = array(
                'articletitles',
                'hideresults',
        ),
-       'catseparator' => array(
+       'separators' => array(
                'catseparator',
+               'semicolon-separator',
        ),
        'imgmulti' => array(
                'imgmultipageprev',
@@ -2465,7 +2466,7 @@ Variants for Chinese language",
        'htmldump'            => 'HTML dump',
        'purge'               => 'action=purge',
        'search2'             => 'AJAX search',
-       'catseparator'        => 'Separator for categories in page lists',
+       'separators'          => 'Separators for various lists',
        'imgmulti'            => 'Multipage image navigation',
        'tablepager'          => 'Table pager',
        'autosumm'            => 'Auto-summaries',