http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96138
Revision: 96138
Author: robin
Date: 2011-09-02 18:18:18 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
* Call core function Language::getTranslatedLanguageName() if found, instead of
CLDR extension. Exists since v1.18.
* Fix r95582 & r96122: only load code for ListUsers if higher than v1.17
(because it doesn't work in 1.17).
This keeps backwards-compatibility with 1.17, but loads more features in 1.18+.
Modified Paths:
--------------
trunk/extensions/WikimediaIncubator/IncubatorTest.php
trunk/extensions/WikimediaIncubator/WikimediaIncubator.php
Modified: trunk/extensions/WikimediaIncubator/IncubatorTest.php
===================================================================
--- trunk/extensions/WikimediaIncubator/IncubatorTest.php 2011-09-02
18:13:22 UTC (rev 96137)
+++ trunk/extensions/WikimediaIncubator/IncubatorTest.php 2011-09-02
18:18:18 UTC (rev 96138)
@@ -379,16 +379,13 @@
/**
* This loads language names. Also from CLDR if that extension is found.
- * @return Array with language names or empty array
+ * @return Array with language names
*/
- static public function getLanguageNames( $code = '' ) {
- if ( is_callable( array( 'LanguageNames', 'getNames' ) ) ) {
+ static public function getLanguageNames( $code = null ) {
+ if ( is_callable( array( 'Language',
'getTranslatedLanguageNames' ) ) ) {
global $wgLang;
$langcode = ( $code ? $code : $wgLang->getCode() );
- return LanguageNames::getNames( $langcode,
- LanguageNames::FALLBACK_NORMAL,
- LanguageNames::LIST_MW_AND_CLDR
- );
+ return Language::getTranslatedLanguageNames( $langcode
);
}
return Language::getLanguageNames( false );
}
Modified: trunk/extensions/WikimediaIncubator/WikimediaIncubator.php
===================================================================
--- trunk/extensions/WikimediaIncubator/WikimediaIncubator.php 2011-09-02
18:13:22 UTC (rev 96137)
+++ trunk/extensions/WikimediaIncubator/WikimediaIncubator.php 2011-09-02
18:18:18 UTC (rev 96138)
@@ -14,7 +14,7 @@
'path' => __FILE__,
'name' => 'Wikimedia Incubator',
'author' => 'SPQRobin',
- 'version' => '4.3.2',
+ 'version' => '4.4',
'url' => 'http://www.mediawiki.org/wiki/Extension:WikimediaIncubator',
'descriptionmsg' => 'wminc-desc',
);
@@ -143,7 +143,9 @@
$wgHooks['PageContentLanguage'][] = 'IncubatorTest::onPageContentLanguage';
/* List of users */
-$wgAutoloadClasses['ListUsersTestWiki'] = $dir . 'ListUsersTestWiki.php';
-$wgHooks['SpecialListusersHeaderForm'][] =
'ListUsersTestWiki::onSpecialListusersHeaderForm';
-$wgHooks['SpecialListusersQueryInfo'][] =
'ListUsersTestWiki::onSpecialListusersQueryInfo';
-$wgHooks['SpecialListusersHeader'][] =
'ListUsersTestWiki::onSpecialListusersHeader';
+if( version_compare( $wgVersion, '1.17', '>' ) ) { # doesn't work below 1.18
+ $wgAutoloadClasses['ListUsersTestWiki'] = $dir .
'ListUsersTestWiki.php';
+ $wgHooks['SpecialListusersHeaderForm'][] =
'ListUsersTestWiki::onSpecialListusersHeaderForm';
+ $wgHooks['SpecialListusersQueryInfo'][] =
'ListUsersTestWiki::onSpecialListusersQueryInfo';
+ $wgHooks['SpecialListusersHeader'][] =
'ListUsersTestWiki::onSpecialListusersHeader';
+}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
