http://www.mediawiki.org/wiki/Special:Code/MediaWiki/58353
Revision: 58353
Author: juliano
Date: 2009-10-30 02:38:44 +0000 (Fri, 30 Oct 2009)
Log Message:
-----------
Update localisation for compatibility with Mw 1.16 LocalisationCache.
Modified Paths:
--------------
trunk/extensions/Wikilog/Wikilog.i18n.magic.php
trunk/extensions/Wikilog/Wikilog.i18n.php
trunk/extensions/Wikilog/Wikilog.php
trunk/extensions/Wikilog/WikilogHooks.php
Added Paths:
-----------
trunk/extensions/Wikilog/Wikilog.i18n.alias.php
Added: trunk/extensions/Wikilog/Wikilog.i18n.alias.php
===================================================================
--- trunk/extensions/Wikilog/Wikilog.i18n.alias.php
(rev 0)
+++ trunk/extensions/Wikilog/Wikilog.i18n.alias.php 2009-10-30 02:38:44 UTC
(rev 58353)
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Special page aliases used by Wikilog extension.
+ * @addtogroup Extensions
+ */
+
+$specialPageAliases = array();
+
+/**
+ * English.
+ * @author Juliano F. Ravasi
+ */
+$specialPageAliases['en'] = array(
+ 'Wikilog' => array( 'Wikilog', 'Wikilogs' ),
+);
+
+/**
+ * Portuguese (Português)
+ * @author Juliano F. Ravasi
+ */
+$specialPageAliases['pt'] = array(
+ 'Wikilog' => array( 'Wikilog', 'Wikilogs' ),
+);
Property changes on: trunk/extensions/Wikilog/Wikilog.i18n.alias.php
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/extensions/Wikilog/Wikilog.i18n.magic.php
===================================================================
--- trunk/extensions/Wikilog/Wikilog.i18n.magic.php 2009-10-30 02:23:58 UTC
(rev 58352)
+++ trunk/extensions/Wikilog/Wikilog.i18n.magic.php 2009-10-30 02:38:44 UTC
(rev 58353)
@@ -4,14 +4,13 @@
* @addtogroup Extensions
*/
-// FIXME: Use $wgExtensionMessagesFiles[] and $magicWords. See f.e. extension
ParserFunctions.
-$words = array();
+$magicWords = array();
/**
* English.
* @author Juliano F. Ravasi
*/
-$words['en'] = array(
+$magicWords['en'] = array(
'wl-settings' => array( 0, 'wl-settings' ),
'wl-publish' => array( 0, 'wl-publish' ),
'wl-author' => array( 0, 'wl-author' ),
@@ -28,7 +27,7 @@
* Portuguese.
* @author Juliano F. Ravasi
*/
-$words['pt'] = array(
+$magicWords['pt'] = array(
'wl-settings' => array( 0, 'wl-configs', 'wl-settings' ),
'wl-publish' => array( 0, 'wl-publicar', 'wl-publish' ),
'wl-author' => array( 0, 'wl-autor', 'wl-author' ),
@@ -45,7 +44,7 @@
* Brazilian Portuguese.
* @author Juliano F. Ravasi
*/
-$words['pt-br'] = array(
+$magicWords['pt-br'] = array(
'wl-settings' => array( 0, 'wl-configs', 'wl-settings' ),
'wl-publish' => array( 0, 'wl-publicar', 'wl-publish' ),
'wl-author' => array( 0, 'wl-autor', 'wl-author' ),
Modified: trunk/extensions/Wikilog/Wikilog.i18n.php
===================================================================
--- trunk/extensions/Wikilog/Wikilog.i18n.php 2009-10-30 02:23:58 UTC (rev
58352)
+++ trunk/extensions/Wikilog/Wikilog.i18n.php 2009-10-30 02:38:44 UTC (rev
58353)
@@ -19,7 +19,7 @@
# Special:Wikilog
'wikilog' => 'Wikilogs', # Page title
- 'wikilog-specialwikilog' => 'Wikilog', # Special page name
+ 'wikilog-specialwikilog' => 'Wikilog', # Special page name (DEPRECATED
AFTER MW1.16)
# Logs
'wikilog-log-pagename' => 'Wikilog actions log',
@@ -103,8 +103,8 @@
'wikilog-feed-description' => 'Read the most recent posts in this
feed.',
# Item and comments page titles
- 'wikilog-title-item-full' => '$1 - $2', # 1 = article title, $2 wikilog
title
- 'wikilog-title-comments' => 'Comments - $1', # 1 = article title
+ 'wikilog-title-item-full' => '$1 - $2', # $1 = article title, $2
wikilog title
+ 'wikilog-title-comments' => 'Comments - $1', # $1 = article title
# Warning and error messages
'wikilog-error-msg' => 'Wikilog: $1',
@@ -182,7 +182,6 @@
'right-wl-postcomment' => 'Poste Kommentare zu Wikilog-Beiträgen',
'right-wl-moderation' => 'Moderation von Kommentaren zu
wikilog-Beiträgen',
'wikilog' => 'Wikilogs', # Page
title
- 'wikilog-specialwikilog' => 'Wikilog', # Special page name
'wikilog-tab' => 'Wikilog',
'wikilog-tab-title' => 'Wikilog Aktionen',
'wikilog-information' => 'Wikilog Information',
@@ -235,7 +234,7 @@
'wikilog-newtalk-summary' => 'automatisch erzeugt durch Wikilog',
'wikilog-feed-title' => '{{SITENAME}} - $1 [$2]', # $1 = title, $2 =
content language
'wikilog-feed-description' => 'Lese die neuesten Beiträge in diesem
Feed.',
- 'wikilog-title-item-full' => '$1 - $2', # 1 = article title, $2 wikilog
title
+ 'wikilog-title-item-full' => '$1 - $2', # $1 = article title, $2
wikilog title
'wikilog-error-msg' => 'Wikilog: $1',
'wikilog-error-title' => 'Wikilog Fehler',
'wikilog-invalid-param' => 'Ungültiger Parameter: $1.',
@@ -294,7 +293,6 @@
'right-wl-postcomment' => 'Postar comentários em artigos wikilog',
'right-wl-moderation' => 'Moderação de comentários de artigos wikilog',
'wikilog' => 'Wikilogs',
- 'wikilog-specialwikilog' => 'Wikilog',
'wikilog-log-pagename' => 'Registro de ações wikilog',
'wikilog-log-pagetext' => 'Abaixo está uma lista das ações wikilog.',
'wikilog-log-cmt-approve' => 'aprovou o comentário [[$1]]',
@@ -357,8 +355,8 @@
'wikilog-newtalk-summary' => 'criado automaticamente pelo wikilog',
'wikilog-feed-title' => '{{SITENAME}} - $1 [$2]', # $1 = title, $2 =
content language
'wikilog-feed-description' => 'Leia as postagens mais recentes neste
feed.',
- 'wikilog-title-item-full' => '$1 - $2', # 1 = article title, $2 wikilog
title
- 'wikilog-title-comments' => 'Comentários - $1', # 1 = article title
+ 'wikilog-title-item-full' => '$1 - $2', # $1 = article title, $2
wikilog title
+ 'wikilog-title-comments' => 'Comentários - $1', # $1 = article title
'wikilog-error-msg' => 'Wikilog: $1',
'wikilog-invalid-param' => 'Parâmetro inválido: $1.',
'wikilog-invalid-author' => 'Autor inválido: $1.',
Modified: trunk/extensions/Wikilog/Wikilog.php
===================================================================
--- trunk/extensions/Wikilog/Wikilog.php 2009-10-30 02:23:58 UTC (rev
58352)
+++ trunk/extensions/Wikilog/Wikilog.php 2009-10-30 02:38:44 UTC (rev
58353)
@@ -50,6 +50,8 @@
*/
$dir = dirname( __FILE__ ) . '/';
$wgExtensionMessagesFiles['Wikilog'] = $dir . 'Wikilog.i18n.php';
+$wgExtensionMessagesFiles['WikilogMagic'] = $dir . 'Wikilog.i18n.magic.php';
+$wgExtensionMessagesFiles['WikilogAlias'] = $dir . 'Wikilog.i18n.alias.php';
/*
* Autoloaded classes.
@@ -111,9 +113,6 @@
$wgHooks['ArticleEditUpdates'][] =
'WikilogHooks::ArticleEditUpdates';
$wgHooks['ArticleDeleteComplete'][] =
'WikilogHooks::ArticleDeleteComplete';
$wgHooks['TitleMoveComplete'][] =
'WikilogHooks::TitleMoveComplete';
-$wgHooks['LanguageGetSpecialPageAliases'][]
-
= 'WikilogHooks::LanguageGetSpecialPageAliases';
-$wgHooks['LanguageGetMagic'][] =
'WikilogHooks::LanguageGetMagic';
$wgHooks['LoadExtensionSchemaUpdates'][] =
'WikilogHooks::ExtensionSchemaUpdates';
$wgHooks['UnknownAction'][] =
'WikilogHooks::UnknownAction';
@@ -128,6 +127,12 @@
$wgHooks['GetLocalURL'][] =
'WikilogParser::GetLocalURL';
$wgHooks['GetFullURL'][] =
'WikilogParser::GetFullURL';
+if ( !defined( 'MW_SUPPORTS_LOCALISATIONCACHE' ) ) {
+ /* pre Mw1.16 compatibility */
+ $wgHooks['LanguageGetMagic'][] = 'WikilogHooks::LanguageGetMagic';
+ $wgHooks['LanguageGetSpecialPageAliases'][] =
'WikilogHooks::LanguageGetSpecialPageAliases';
+}
+
/*
* Added rights.
*/
Modified: trunk/extensions/Wikilog/WikilogHooks.php
===================================================================
--- trunk/extensions/Wikilog/WikilogHooks.php 2009-10-30 02:23:58 UTC (rev
58352)
+++ trunk/extensions/Wikilog/WikilogHooks.php 2009-10-30 02:38:44 UTC (rev
58353)
@@ -232,6 +232,8 @@
/**
* LanguageGetSpecialPageAliases hook handler function.
* Adds language aliases for special pages.
+ * @note Deprecated in MediaWiki 1.16.
+ * @todo Remove this in Wikilog 1.1.0, along with support for Mw < 1.16.
*/
static function LanguageGetSpecialPageAliases( &$specialPageAliases,
$lang ) {
wfLoadExtensionMessages( 'Wikilog' );
@@ -243,13 +245,15 @@
/**
* LanguageGetMagic hook handler function.
* Adds language aliases for magic words.
+ * @note Deprecated in MediaWiki 1.16.
+ * @todo Remove this in Wikilog 1.1.0, along with support for Mw < 1.16.
*/
- static function LanguageGetMagic( &$magicWords, $lang ) {
+ static function LanguageGetMagic( &$words, $lang ) {
require( 'Wikilog.i18n.magic.php' );
- if ( $lang == 'en' || !isset( $words[$lang] ) ) {
- $magicWords += $words['en'];
+ if ( $lang == 'en' || !isset( $magicWords[$lang] ) ) {
+ $words += $magicWords['en'];
} else {
- $magicWords += array_merge( $words['en'], $words[$lang]
);
+ $words += array_merge( $magicWords['en'],
$magicWords[$lang] );
}
return true;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
