| Index: trunk/extensions/SemanticMediaWiki/RELEASE-NOTES |
| — | — | @@ -10,6 +10,7 @@ |
| 11 | 11 | |
| 12 | 12 | * Fixed bug in "further results" links causing the main column to be displayed twice on Special:Ask (bug 33473). |
| 13 | 13 | * Fixed incorrect case-sensitivity of the format parameter (bug 31138). |
| | 14 | +* Fixed internationalization of magic words. |
| 14 | 15 | |
| 15 | 16 | == SMW 1.7 == |
| 16 | 17 | |
| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php |
| — | — | @@ -32,6 +32,7 @@ |
| 33 | 33 | $wgExtensionFunctions[] = 'smwfSetupExtension'; |
| 34 | 34 | $wgExtensionMessagesFiles['SemanticMediaWiki'] = $smwgIP . 'languages/SMW_Messages.php'; |
| 35 | 35 | $wgExtensionMessagesFiles['SemanticMediaWikiAlias'] = $smwgIP . 'languages/SMW_Aliases.php'; |
| | 36 | + $wgExtensionMessagesFiles['SemanticMediaWikiMagic'] = $smwgIP . 'languages/SMW_Magic.php'; |
| 36 | 37 | |
| 37 | 38 | smwfRegisterHooks(); |
| 38 | 39 | smwfRegisterResourceLoaderModules(); |
| — | — | @@ -74,10 +75,7 @@ |
| 75 | 76 | global $wgHooks, $wgVersion; |
| 76 | 77 | |
| 77 | 78 | $wgHooks['LoadExtensionSchemaUpdates'][] = 'SMWHooks::onSchemaUpdate'; |
| 78 | | - |
| 79 | | - // FIXME: The following can be removed when new style magic words are used (introduced in r52503) |
| 80 | | - $wgHooks['LanguageGetMagic'][] = 'smwfAddMagicWords'; // setup names for parser functions (needed here) |
| 81 | | - |
| | 79 | + |
| 82 | 80 | $wgHooks['ParserTestTables'][] = 'SMWHooks::onParserTestTables'; |
| 83 | 81 | $wgHooks['AdminLinks'][] = 'SMWHooks::addToAdminLinks'; |
| 84 | 82 | $wgHooks['PageSchemasRegisterHandlers'][] = 'SMWHooks::onPageSchemasRegistration'; |
| — | — | @@ -485,23 +483,6 @@ |
| 486 | 484 | /**********************************************/ |
| 487 | 485 | |
| 488 | 486 | /** |
| 489 | | - * Set up (possibly localised) names for SMW's parser functions. |
| 490 | | - * @todo Can be removed when new style magic words are used (introduced in r52503). |
| 491 | | - */ |
| 492 | | -function smwfAddMagicWords( &$magicWords, $langCode ) { |
| 493 | | - $magicWords['ask'] = array( 0, 'ask' ); |
| 494 | | - $magicWords['show'] = array( 0, 'show' ); |
| 495 | | - $magicWords['subobject'] = array( 0, 'subobject' ); |
| 496 | | - $magicWords['concept'] = array( 0, 'concept' ); |
| 497 | | - $magicWords['set'] = array( 0, 'set' ); |
| 498 | | - $magicWords['set_recurring_event'] = array( 0, 'set_recurring_event' ); |
| 499 | | - $magicWords['declare'] = array( 0, 'declare' ); |
| 500 | | - $magicWords['SMW_NOFACTBOX'] = array( 0, '__NOFACTBOX__' ); |
| 501 | | - $magicWords['SMW_SHOWFACTBOX'] = array( 0, '__SHOWFACTBOX__' ); |
| 502 | | - return true; |
| 503 | | -} |
| 504 | | - |
| 505 | | -/** |
| 506 | 487 | * Initialise a global language object for content language. This must happen |
| 507 | 488 | * early on, even before user language is known, to determine labels for |
| 508 | 489 | * additional namespaces. In contrast, messages can be initialised much later |
| Index: trunk/extensions/SemanticMediaWiki/languages/SMW_Magic.php |
| — | — | @@ -16,6 +16,8 @@ |
| 17 | 17 | 'show' => array( 0, 'show' ), |
| 18 | 18 | 'info' => array( 0, 'info' ), |
| 19 | 19 | 'concept' => array( 0, 'concept' ), |
| | 20 | + 'subobject' => array( 0, 'subobject' ), |
| | 21 | + 'smwdoc' => array( 0, 'smwdoc' ), |
| 20 | 22 | 'set' => array( 0, 'set' ), |
| 21 | 23 | 'set_recurring_event' => array( 0, 'set_recurring_event' ), |
| 22 | 24 | 'declare' => array( 0, 'declare' ), |