http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97844
Revision: 97844
Author: nikerabbit
Date: 2011-09-22 20:02:07 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Backing out r85131 for now. See CR for the reasons.
Modified Paths:
--------------
trunk/extensions/Translate/MessageGroups.php
trunk/extensions/Translate/Translate.i18n.php
trunk/extensions/Translate/groups/MediaWiki/Checker.php
Modified: trunk/extensions/Translate/MessageGroups.php
===================================================================
--- trunk/extensions/Translate/MessageGroups.php 2011-09-22 19:48:56 UTC
(rev 97843)
+++ trunk/extensions/Translate/MessageGroups.php 2011-09-22 20:02:07 UTC
(rev 97844)
@@ -361,8 +361,7 @@
array( $checker, 'XhtmlCheck' ),
array( $checker, 'braceBalanceCheck' ),
array( $checker, 'pagenameMessagesCheck' ),
- array( $checker, 'miscMWChecks' ),
- array( $checker, 'prefMessagesCheck' ),
+ array( $checker, 'miscMWChecks' )
) );
return $checker;
Modified: trunk/extensions/Translate/Translate.i18n.php
===================================================================
--- trunk/extensions/Translate/Translate.i18n.php 2011-09-22 19:48:56 UTC
(rev 97843)
+++ trunk/extensions/Translate/Translate.i18n.php 2011-09-22 20:02:07 UTC
(rev 97844)
@@ -146,7 +146,6 @@
'translate-checks-format' => 'This translation does not
follow the definition or has invalid syntax: $1',
'translate-checks-escape' => 'The following escapes may be
accidental: <strong>$1</strong>',
'translate-checks-fudforum-syntax' => 'Use <nowiki>$1</nowiki>
instead of <nowiki>$2</nowiki> in this project.',
- 'translate-checks-prefs' => 'Message conflicts with $1.
These messages must not be the same.',
'translate-pref-nonewsletter' => 'Do not send me e-mail newsletters',
'translate-pref-editassistlang' => 'Assistant languages:',
Modified: trunk/extensions/Translate/groups/MediaWiki/Checker.php
===================================================================
--- trunk/extensions/Translate/groups/MediaWiki/Checker.php 2011-09-22
19:48:56 UTC (rev 97843)
+++ trunk/extensions/Translate/groups/MediaWiki/Checker.php 2011-09-22
20:02:07 UTC (rev 97844)
@@ -247,65 +247,4 @@
}
}
}
-
- /**
- * Checks that messages used for some preferences are not equal,
otherwise Special:Preferences may explode
- * (bug 28152).
- *
- * @param $messages \array Iterable list of TMessage objects.
- * @param $code \string Language code of the translations.
- * @param $warnings \array Array where warnings are appended to.
- */
- protected function prefMessagesCheck( $messages, $code, &$warnings ) {
- $prefs = self::getPrefMessages();
-
- foreach ( $messages as $message ) {
- foreach ( $prefs as $group ) {
- if ( !in_array( $message->key(), $group ) ) {
- continue;
- }
- $conflicts = array();
- foreach ( $group as $key ) {
- if ( $key == $message->key() ) {
- continue;
- }
- if ( $message->translation() ==
wfMessage( $key )->inLanguage( $code )->text() ) {
- $conflicts[] = $key;
- }
- }
- if ( count( $conflicts ) ) {
- $conflicts = preg_replace( '/^(.*)$/',
"[[MediaWiki:$1/$code|$1]]", $conflicts );
- global $wgLang;
- $warnings[$message->key()][] = array(
- array( 'prefmessages', 'match',
$message->key(), $code ),
- 'translate-checks-prefs',
- $wgLang->listToText( $conflicts
),
- );
- }
- }
- }
- }
-
- /**
- * Returns an array of message keys that may cause conflicts for
prefMessagesCheck()
- * @return \array
- */
- protected static function getPrefMessages() {
- // @todo: moar?
- return array(
- array(
- 'Mw_math_png',
- 'Mw_math_simple',
- 'Mw_math_html',
- 'Mw_math_source',
- 'Mw_math_modern',
- 'Mw_math_mathml',
- ),
- array(
- 'Gender-male',
- 'Gender-female',
- 'Gender-unknown',
- ),
- );
- }
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
