http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66825
Revision: 66825
Author: nikerabbit
Date: 2010-05-24 13:16:36 +0000 (Mon, 24 May 2010)
Log Message:
-----------
Fixed few bugs in page translation
* At some point we started getting integer revisions numbers from Title class
* Always load diff styles on message table because it might be needed
Modified Paths:
--------------
trunk/extensions/Translate/PageTranslation.i18n.php
trunk/extensions/Translate/tag/SpecialPageTranslation.php
trunk/extensions/Translate/tag/TPParse.php
Modified: trunk/extensions/Translate/PageTranslation.i18n.php
===================================================================
--- trunk/extensions/Translate/PageTranslation.i18n.php 2010-05-24 12:52:26 UTC
(rev 66824)
+++ trunk/extensions/Translate/PageTranslation.i18n.php 2010-05-24 13:16:36 UTC
(rev 66825)
@@ -31,6 +31,7 @@
# Specific page on the special page
'tpt-badtitle' => 'Page name given ($1) is not a valid title',
+ 'tpt-nosuchpage' => 'Page $1 does not exist',
'tpt-oldrevision' => '$2 is not the latest version of the page [[$1]].
Only latest versions can be marked for translation.',
'tpt-notsuitable' => 'Page $1 is not suitable for translation.
@@ -2458,9 +2459,6 @@
'tpt-install' => 'Запустите php-скрипт maintenance/update.php или
веб-установку, чтобы включить возможность перевода страниц.',
'tpt-render-summary' => 'Обновление для соответствия новой версии
исходной страницы.',
'tpt-download-page' => 'Экспортировать страницу с переводами',
- 'pt-shake-multiple' => 'Несколько маркеров раздела в одном разделе.
-Текст раздела:
-$1',
);
/** Rusyn (русиньскый язык)
Modified: trunk/extensions/Translate/tag/SpecialPageTranslation.php
===================================================================
--- trunk/extensions/Translate/tag/SpecialPageTranslation.php 2010-05-24
12:52:26 UTC (rev 66824)
+++ trunk/extensions/Translate/tag/SpecialPageTranslation.php 2010-05-24
13:16:36 UTC (rev 66825)
@@ -15,14 +15,13 @@
}
public function execute( $parameters ) {
- wfLoadExtensionMessages( 'PageTranslation' );
$this->setHeaders();
global $wgRequest, $wgOut, $wgUser;
$this->user = $wgUser;
$target = $wgRequest->getText( 'target', $parameters );
- $revision = $wgRequest->getText( 'revision', 0 );
+ $revision = $wgRequest->getInt( 'revision', 0 );
// No specific page or invalid input
$title = Title::newFromText( $target );
@@ -42,24 +41,27 @@
}
// We are processing some specific page
- if ( $revision === '0' ) {
+ if ( !$title->exists() ) {
+ $wgOut->addWikiMsg( 'tpt-nosuchpage',
$title->getPrefixedText() );
+ return;
+ }
+
+ if ( $revision === 0 ) {
// Get the latest revision
$revision = $title->getLatestRevID();
- } elseif ( $revision !== $title->getLatestRevID() ) {
- // We do want to notify the reviewer if the underlying
page changes during review
- $wgOut->addWikiMsg( 'tpt-oldrevision',
$title->getPrefixedText(), $revision );
- $this->listPages();
- return;
}
-
$page = TranslatablePage::newFromRevision( $title, $revision );
-
if ( !$page instanceof TranslatablePage ) {
$wgOut->addWikiMsg( 'tpt-notsuitable',
$title->getPrefixedText(), $revision );
- $this->listPages();
return;
}
+ if ( $revision !== $title->getLatestRevID() ) {
+ // We do want to notify the reviewer if the underlying
page changes during review
+ $wgOut->addWikiMsg( 'tpt-oldrevision',
$title->getPrefixedText(), $revision );
+ return;
+ }
+
$lastrev = $page->getMarkedTag();
if ( $lastrev !== false && $lastrev === $revision ) {
$wgOut->addWikiMsg( 'tpt-already-marked' );
Modified: trunk/extensions/Translate/tag/TPParse.php
===================================================================
--- trunk/extensions/Translate/tag/TPParse.php 2010-05-24 12:52:26 UTC (rev
66824)
+++ trunk/extensions/Translate/tag/TPParse.php 2010-05-24 13:16:36 UTC (rev
66825)
@@ -89,7 +89,7 @@
$res = $db->select( $tables, $vars, $conds, __METHOD__ );
foreach ( $res as $r ) {
- $section = new TPsection;
+ $section = new TPSection;
$section->id = $r->trs_key;
$section->text = $r->trs_text;
$section->type = 'db';
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
