X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=blobdiff_plain;f=tests%2Fjasmine%2Fspec_makers%2FmakeJqueryMsgSpec.php;h=43015878af1c57945583298eead5d533ffdb1a33;hb=ee3f8ee9fc98574803e69f3479e209f5b80536de;hp=1ac8dcba56756201f8bf92ee8a9d7d719d3dd6d0;hpb=a24487ca4df531b80e15eda7dfb7b91b80e49d48;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/jasmine/spec_makers/makeJqueryMsgSpec.php b/tests/jasmine/spec_makers/makeJqueryMsgSpec.php index 1ac8dcba56..43015878af 100644 --- a/tests/jasmine/spec_makers/makeJqueryMsgSpec.php +++ b/tests/jasmine/spec_makers/makeJqueryMsgSpec.php @@ -14,7 +14,7 @@ * */ -$maintenanceDir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ) . '/maintenance'; +$maintenanceDir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . '/maintenance'; require( "$maintenanceDir/Maintenance.php" ); @@ -57,10 +57,11 @@ class MakeLanguageSpec extends Maintenance { foreach ( self::$keyToTestArgs as $key => $testArgs ) { foreach ($testArgs as $args) { // get the raw template, without any transformations - $template = wfMsgGetKey( $key, /* useDb */ true, $languageCode, /* transform */ false ); + $template = wfMessage( $key )->inLanguage( $languageCode )->plain(); // get the magic-parsed version with args $wfMsgExtArgs = array_merge( array( $key, $wfMsgExtOptions ), $args ); + // @todo FIXME: Use Message class. $result = call_user_func_array( 'wfMsgExt', $wfMsgExtArgs ); // record the template, args, language, and expected result