http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73938
Revision: 73938
Author: nikerabbit
Date: 2010-09-29 08:17:10 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
More cleanup. Got rid of most references to page| prefix for translatable page
message groups in preparation for a switch
Modified Paths:
--------------
trunk/extensions/Translate/tag/RenderJob.php
trunk/extensions/Translate/tag/SpecialPageTranslation.php
Modified: trunk/extensions/Translate/tag/RenderJob.php
===================================================================
--- trunk/extensions/Translate/tag/RenderJob.php 2010-09-29 08:07:54 UTC
(rev 73937)
+++ trunk/extensions/Translate/tag/RenderJob.php 2010-09-29 08:17:10 UTC
(rev 73938)
@@ -34,7 +34,7 @@
function run() {
// Initialization
$title = $this->title;
- list( $key, $code ) = TranslateUtils::figureMessage(
$title->getPrefixedText() );
+ list( , $code ) = TranslateUtils::figureMessage(
$title->getPrefixedText() );
// Return the actual translation page...
$page = TranslatablePage::isTranslationPage( $title );
@@ -44,7 +44,7 @@
throw new MWException( "Oops, this should not happen!"
);
}
- $group = MessageGroups::getGroup( "page|$key" );
+ $group = $page->getMessageGroup();
$collection = $group->initCollection( $code );
$text = $page->getParse()->getTranslationPageText( $collection
);
@@ -59,19 +59,10 @@
// @todo Fuzzybot hack
PageTranslationHooks::$allowTargetEdit = true;
- // User hack
- global $wgUser;
-
- $oldUser = $wgUser;
- $wgUser = $user;
-
// Do the edit
- $status = $article->doEdit( $text, $summary, $flags );
+ $status = $article->doEdit( $text, $summary, $flags, false,
$user );
SpecialPageTranslation::superDebug( __METHOD__, 'edit', $user,
$title, $flags, $status );
- // User hack
- $wgUser = $oldUser;
-
PageTranslationHooks::$allowTargetEdit = false;
// purge cache
Modified: trunk/extensions/Translate/tag/SpecialPageTranslation.php
===================================================================
--- trunk/extensions/Translate/tag/SpecialPageTranslation.php 2010-09-29
08:07:54 UTC (rev 73937)
+++ trunk/extensions/Translate/tag/SpecialPageTranslation.php 2010-09-29
08:17:10 UTC (rev 73938)
@@ -131,7 +131,7 @@
$titleText = $page->getTitle()->getPrefixedText();
$num = $wgLang->formatNum( $page->getParse()->countSections() );
$link = SpecialPage::getTitleFor( 'Translate' )->getFullUrl(
- array( 'group' => 'page|' .
$page->getTitle()->getPrefixedText() ) );
+ array( 'group' => $page->getMessageGroupId() ) );
$wgOut->addWikiMsg( 'tpt-saveok', $titleText, $num, $link );
}
@@ -301,7 +301,7 @@
SpecialPage::getTitleFor( 'Translate' ),
wfMsgHtml( 'tpt-translate-this' ),
array(),
- array( 'group' => 'page|' .
$title->getPrefixedText() )
+ array( 'group' =>
TranslatablePage::getMessageGroupIdFromTitle( $title )
);
}
@@ -527,7 +527,7 @@
// Re-generate caches
$page->getTranslationPercentages( /*re-generate*/ true );
- ArrayMemoryCache::factory( 'groupstats' )->clearGroup( 'page|'
. $page->getTitle()->getPrefixedText() );
+ ArrayMemoryCache::factory( 'groupstats' )->clearGroup(
$page->getMessageGroupId() );
MessageIndexRebuilder::execute();
return false;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
