Skip to content

Commit 6fa61f6

Browse files
committed
Support Mediawiki 1.33+
Cherry-picked from the DF Wiki repo
1 parent 151969c commit 6fa61f6

2 files changed

Lines changed: 25 additions & 18 deletions

File tree

DFRawFunctions.i18n.magic.php

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
/*
3+
* DFRawFunctions extension by Quietust
4+
* Dwarf Fortress Raw parser functions
5+
*/
6+
7+
$magicWords = array();
8+
9+
# English
10+
$magicWords['en'] = array(
11+
'df_raw' => array(0, 'df_raw'),
12+
'df_tag' => array(0, 'df_tag'),
13+
'df_tagentry' => array(0, 'df_tagentry'),
14+
'df_tagvalue' => array(0, 'df_tagvalue'),
15+
'df_foreachtag' => array(0, 'df_foreachtag'),
16+
'df_foreachtoken' => array(0, 'df_foreachtoken'),
17+
'df_makelist' => array(0, 'df_makelist'),
18+
'df_statedesc' => array(0, 'df_statedesc'),
19+
'df_cvariation' => array(0, 'df_cvariation'),
20+
'mreplace' => array(0, 'mreplace'),
21+
'delay' => array(0, 'delay'),
22+
'eval' => array(0, 'eval'),
23+
);

DFRawFunctions.php

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
$wgAutoloadClasses['DFRawFunctions'] = dirname(__FILE__) . '/DFRawFunctions.body.php';
3838

3939
$wgHooks['ParserFirstCallInit'][] = 'efDFRawFunctions_Initialize';
40-
$wgHooks['LanguageGetMagic'][] = 'efDFRawFunctions_RegisterMagicWords';
40+
41+
$wgExtensionMessagesFiles['DFRawFunctions'] = dirname(__FILE__) . '/DFRawFunctions.i18n.magic.php';
4142

4243
function efDFRawFunctions_Initialize (&$parser)
4344
{
@@ -55,20 +56,3 @@ function efDFRawFunctions_Initialize (&$parser)
5556
$parser->setFunctionHook('eval', 'DFRawFunctions::evaluate');
5657
return true;
5758
}
58-
59-
function efDFRawFunctions_RegisterMagicWords (&$magicWords, $langCode)
60-
{
61-
$magicWords['df_raw'] = array(0, 'df_raw');
62-
$magicWords['df_tag'] = array(0, 'df_tag');
63-
$magicWords['df_tagentry'] = array(0, 'df_tagentry');
64-
$magicWords['df_tagvalue'] = array(0, 'df_tagvalue');
65-
$magicWords['df_foreachtag'] = array(0, 'df_foreachtag');
66-
$magicWords['df_foreachtoken'] = array(0, 'df_foreachtoken');
67-
$magicWords['df_makelist'] = array(0, 'df_makelist');
68-
$magicWords['df_statedesc'] = array(0, 'df_statedesc');
69-
$magicWords['df_cvariation'] = array(0, 'df_cvariation');
70-
$magicWords['mreplace'] = array(0, 'mreplace');
71-
$magicWords['delay'] = array(0, 'delay');
72-
$magicWords['eval'] = array(0, 'eval');
73-
return true;
74-
}

0 commit comments

Comments
 (0)