http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73937
Revision: 73937
Author: nikerabbit
Date: 2010-09-29 08:07:54 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Code simplification and bug fix (parameter for Special:Translate is language
and not code)
Modified Paths:
--------------
trunk/extensions/Translate/TranslatePage.php
trunk/extensions/Translate/tag/TranslatablePage.php
Modified: trunk/extensions/Translate/TranslatePage.php
===================================================================
--- trunk/extensions/Translate/TranslatePage.php 2010-09-29 07:56:17 UTC
(rev 73936)
+++ trunk/extensions/Translate/TranslatePage.php 2010-09-29 08:07:54 UTC
(rev 73937)
@@ -253,16 +253,9 @@
protected function taskSelector( $pageTranslation = false ) {
$selector = new HTMLSelector( 'task', 'task',
$this->options['task'] );
- /**
- * Check if this is a page translation group to return only
appropriate tasks.
- */
- $isPageTranslation = false;
- if ( $this->group ) {
- $isPageTranslation = strpos( $this->group->getId(),
'page|' ) === 0;
- }
-
+ $isPageTranslation = $this->group instanceof
WikiPageMessageGroup;
foreach ( TranslateTasks::getTasks( $isPageTranslation ) as $id
) {
- $label = call_user_func( array( 'TranslateTask',
'labelForTask' ), $id );
+ $label = TranslateTask::labelForTask( $id );
$selector->addOption( $label, $id );
}
Modified: trunk/extensions/Translate/tag/TranslatablePage.php
===================================================================
--- trunk/extensions/Translate/tag/TranslatablePage.php 2010-09-29 07:56:17 UTC
(rev 73936)
+++ trunk/extensions/Translate/tag/TranslatablePage.php 2010-09-29 08:07:54 UTC
(rev 73937)
@@ -471,14 +471,11 @@
public function getTranslationUrl( $code = false ) {
$translate = SpecialPage::getTitleFor( 'Translate' );
$params = array(
- 'group' => 'page|' .
$this->getTitle()->getPrefixedText(),
- 'task' => 'view'
+ 'group' => $this->getMessageGroupId(),
+ 'task' => 'view',
+ 'language' => $code,
);
- if ( $code ) {
- $params['language'] = $code;
- }
-
return $translate->getFullURL( $params );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
