* (bug 13273) Fix another hardcoded colon

* Fix a hardcoded hyphen while I'm there
* catseparator should be optionally translated, not never translated (although in practice it may be never)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c7598e9..146ec55 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -73,8 +73,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
+* (bug 13273) Un-hardcode some punctuation (add new messages colon-separator,
+  autocomment-prefix)
 * Parse MediaWiki message translations with a correct language setting on preview
 * (bug 13281) Treat X-Forwarded-For, Client-ip and User-Agent headers as
   case-insensitive names.

diff --git a/includes/Linker.php b/includes/Linker.php
index cc6d493..204561f 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1033,10 +1033,12 @@ class Linker {
                        }
                        $auto = $link . $auto;
                        if( $pre ) {
-                               $auto = '- ' . $auto; # written summary $presep autocomment (summary /* section */)
+                               # written summary $presep autocomment (summary /* section */)
+                               $auto = wfMsgExt( 'autocomment-prefix', array( 'escapenoentities', 'content' ) ) . $auto;
                        }
                        if( $post ) {
-                               $auto .= ': '; # autocomment $postsep written summary (/* section */ summary)
+                               # autocomment $postsep written summary (/* section */ summary)
+                               $auto .= wfMsgExt( 'colon-separator', array( 'escapenoentities', 'content' ) );
                        }
                        $auto = '<span class="autocomment">' . $auto . '</span>';
                        $comment = $pre . $auto . $post;

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index f489e23..6891c05 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2906,11 +2906,12 @@ $1',
 'hideresults'      => 'Hide results',
 'useajaxsearch'    => 'Use AJAX search',
 
-# Separators for various lists
-'catseparator'        => '|', # don't translate or duplicate this message to other languages
+# Separators for various lists, etc.
+'catseparator'        => '|', # only translate this message to other languages if you have to change it
 'semicolon-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
 'colon-separator'     => ': ', # only translate this message to other languages if you have to change it
+'autocomment-prefix'  => '- ', # 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 4ef887a..13e57e3 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -70,7 +70,6 @@ $wgIgnoredMessages = array(
        'addsection',
        'anonnotice',
        'autoblock_whitelist',
-       'catseparator',
        'googlesearch',
        'opensearch-desc',
        'exif-make-value',
@@ -275,9 +274,11 @@ $wgOptionalMessages = array(
        'hebrew-calendar-m10-gen',
        'hebrew-calendar-m11-gen',
        'hebrew-calendar-m12-gen',
+       'catseparator',
        'semicolon-separator',
        'comma-separator',
        'colon-separator',
+       'autocomment-prefix',
 );
 
 /** 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 186e5ca..52a18c1 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2246,6 +2246,7 @@ $wgMessageStructure = array(
                'semicolon-separator',
                'comma-separator',
                'colon-separator',
+               'autocomment-prefix',
        ),
        'imgmulti' => array(
                'imgmultipageprev',
@@ -2551,7 +2552,7 @@ Variants for Chinese language",
        'htmldump'              => 'HTML dump',
        'purge'                 => 'action=purge',
        'search2'               => 'AJAX search',
-       'separators'            => 'Separators for various lists',
+       'separators'            => 'Separators for various lists, etc.',
        'imgmulti'              => 'Multipage image navigation',
        'tablepager'            => 'Table pager',
        'autosumm'              => 'Auto-summaries',