dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Removed unmatched commits in Job class."
[lhc/web/wiklou.git]
/
tests
/
jasmine
/
spec_makers
/
makeJqueryMsgSpec.php
diff --git
a/tests/jasmine/spec_makers/makeJqueryMsgSpec.php
b/tests/jasmine/spec_makers/makeJqueryMsgSpec.php
index
1ac8dcb
..
4301587
100644
(file)
--- 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" );
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
foreach ( self::$keyToTestArgs as $key => $testArgs ) {
foreach ($testArgs as $args) {
// get the raw template, without any transformations
- $template = wfM
sgGetKey( $key, /* useDb */ true, $languageCode, /* transform */ false
);
+ $template = wfM
essage( $key )->inLanguage( $languageCode )->plain(
);
// get the magic-parsed version with args
$wfMsgExtArgs = array_merge( array( $key, $wfMsgExtOptions ), $args );
// 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
$result = call_user_func_array( 'wfMsgExt', $wfMsgExtArgs );
// record the template, args, language, and expected result