d434bfcf3b
The core function behind wfMessage() (MessageCache->get()) did not
apply the language fallback chain to on-wiki messages.
This patch has changed the behavior to iterate over all possible
on-wiki fallbacks (starting with the user's language) before
using the built-in language cache (CDB files). Previously we only looked
for the existence of an on-wiki message in the users's language.
Performance wise, using the 'ab' language ('ru', 'en' fallbacks)
MessageCache::get (Averaged over runs and calls)
New Code: ~8.5% TET (110us/call)
Old Code: ~6.5% TET ( 90us/call)
TET: Total Execution Time
Change-Id: Iaaf6ccebd8c40c9602748c58c3a5c73c29e7aa4d
88 lines
2.7 KiB
PHP
88 lines
2.7 KiB
PHP
<?php
|
|
|
|
/**
|
|
* @group Database
|
|
* @group Cache
|
|
*/
|
|
class MessageCacheTest extends MediaWikiLangTestCase {
|
|
|
|
protected function setUp() {
|
|
parent::setUp();
|
|
MessageCache::singleton()->enable();
|
|
}
|
|
|
|
function addDBData() {
|
|
// Set up messages and fallbacks ab -> ru -> en
|
|
$this->makePage( 'FallbackLanguageTest-Full', 'ab' );
|
|
$this->makePage( 'FallbackLanguageTest-Full', 'ru' );
|
|
$this->makePage( 'FallbackLanguageTest-Full', 'en' );
|
|
|
|
// Fallbacks where ab does not exist
|
|
$this->makePage( 'FallbackLanguageTest-Partial', 'ru' );
|
|
$this->makePage( 'FallbackLanguageTest-Partial', 'en' );
|
|
|
|
// Fallback to english
|
|
$this->makePage( 'FallbackLanguageTest-English', 'en' );
|
|
|
|
// Full key tests -- always want russian
|
|
$this->makePage( 'MessageCacheTest-FullKeyTest', 'ab' );
|
|
$this->makePage( 'MessageCacheTest-FullKeyTest', 'ru' );
|
|
}
|
|
|
|
/**
|
|
* Helper function for addDBData -- adds a simple page to the database
|
|
*
|
|
* @param string $title Title of page to be created
|
|
* @param string $lang Language and content of the created page
|
|
*/
|
|
protected function makePage( $title, $lang ) {
|
|
global $wgContLang;
|
|
|
|
$title = Title::newFromText(
|
|
($lang == $wgContLang->getCode()) ? $title : "$title/$lang",
|
|
NS_MEDIAWIKI
|
|
);
|
|
$wikiPage = new WikiPage( $title );
|
|
$content = ContentHandler::makeContent( $lang, $title );
|
|
$wikiPage->doEditContent( $content, "$lang translation test case" );
|
|
}
|
|
|
|
/**
|
|
* Test message fallbacks, bug #1495
|
|
*
|
|
* @dataProvider provideMessagesForFallback
|
|
*/
|
|
function testMessageFallbacks( $message, $lang, $expectedContent ) {
|
|
$result = MessageCache::singleton()->get( $message, true, $lang );
|
|
$this->assertEquals( $expectedContent, $result, "Message fallback failed." );
|
|
}
|
|
|
|
function provideMessagesForFallback() {
|
|
return array(
|
|
array( 'FallbackLanguageTest-Full', 'ab', 'ab' ),
|
|
array( 'FallbackLanguageTest-Partial', 'ab', 'ru' ),
|
|
array( 'FallbackLanguageTest-English', 'ab', 'en' ),
|
|
array( 'FallbackLanguageTest-None', 'ab', false ),
|
|
);
|
|
}
|
|
|
|
/**
|
|
* There's a fallback case where the message key is given as fully qualified -- this
|
|
* should ignore the passed $lang and use the language from the key
|
|
*
|
|
* @dataProvider provideMessagesForFullKeys
|
|
*/
|
|
function testFullKeyBehaviour( $message, $lang, $expectedContent ) {
|
|
$result = MessageCache::singleton()->get( $message, true, $lang, true );
|
|
$this->assertEquals( $expectedContent, $result, "Full key message fallback failed." );
|
|
}
|
|
|
|
function provideMessagesForFullKeys() {
|
|
return array(
|
|
array( 'MessageCacheTest-FullKeyTest/ru', 'ru', 'ru' ),
|
|
array( 'MessageCacheTest-FullKeyTest/ru', 'ab', 'ru' ),
|
|
array( 'MessageCacheTest-FullKeyTest/ru/foo', 'ru', false ),
|
|
);
|
|
}
|
|
|
|
}
|