jenkins-bot has submitted this change and it was merged.
Change subject: Rename job classes to more specific names
......................................................................
Rename job classes to more specific names
RenderJob -> TranslateRenderJob
DeleteJob -> TranslateDeleteJob
MoveJob -> TranslateMoveJob
Change-Id: I23d0226545863960fb955f9d5498e6ad5ec13822
---
M TranslateHooks.php
M _autoload.php
M tag/PageTranslationHooks.php
M tag/SpecialPageTranslation.php
M tag/SpecialPageTranslationDeletePage.php
M tag/SpecialPageTranslationMovePage.php
R tag/TranslateDeleteJob.php
R tag/TranslateMoveJob.php
R tag/TranslateRenderJob.php
M tests/PageTranslationTaggingTest.php
10 files changed, 27 insertions(+), 24 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TranslateHooks.php b/TranslateHooks.php
index b476741..fee79d8 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -71,9 +71,12 @@
$wgLogActionsHandlers['pagetranslation/dissociate'] =
'PageTranslationLogFormatter';
global $wgJobClasses;
- $wgJobClasses['RenderJob'] = 'RenderJob';
- $wgJobClasses['MoveJob'] = 'MoveJob';
- $wgJobClasses['DeleteJob'] = 'DeleteJob';
+ $wgJobClasses['TranslateRenderJob'] =
'TranslateRenderJob';
+ $wgJobClasses['RenderJob'] = 'TranslateRenderJob';
+ $wgJobClasses['TranslateMoveJob'] = 'TranslateMoveJob';
+ $wgJobClasses['MoveJob'] = 'TranslateMoveJob';
+ $wgJobClasses['TranslateDeleteJob'] =
'TranslateDeleteJob';
+ $wgJobClasses['DeleteJob'] = 'TranslateDeleteJob';
// Namespaces
global $wgPageTranslationNamespace;
diff --git a/_autoload.php b/_autoload.php
index f40a03d..b8be167 100644
--- a/_autoload.php
+++ b/_autoload.php
@@ -132,11 +132,11 @@
* @ingroup PageTranslation
* @{
*/
-$wgAutoloadClasses['DeleteJob'] = "$dir/tag/DeleteJob.php";
-$wgAutoloadClasses['MoveJob'] = "$dir/tag/MoveJob.php";
+$wgAutoloadClasses['TranslateDeleteJob'] = "$dir/tag/TranslateDeleteJob.php";
+$wgAutoloadClasses['TranslateMoveJob'] = "$dir/tag/TranslateMoveJob.php";
$wgAutoloadClasses['PageTranslationHooks'] =
"$dir/tag/PageTranslationHooks.php";
$wgAutoloadClasses['PageTranslationLogFormatter'] =
"$dir/tag/PageTranslationLogFormatter.php";
-$wgAutoloadClasses['RenderJob'] = "$dir/tag/RenderJob.php";
+$wgAutoloadClasses['TranslateRenderJob'] = "$dir/tag/TranslateRenderJob.php";
$wgAutoloadClasses['SpecialPageTranslation'] =
"$dir/tag/SpecialPageTranslation.php";
$wgAutoloadClasses['SpecialPageTranslationDeletePage'] =
"$dir/tag/SpecialPageTranslationDeletePage.php";
$wgAutoloadClasses['SpecialPageTranslationMovePage'] =
"$dir/tag/SpecialPageTranslationMovePage.php";
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 5d008c9..283d57f 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -135,7 +135,7 @@
$flags &= ~EDIT_NEW & ~EDIT_UPDATE;
// Update the target page
- $job = RenderJob::newJob( $target );
+ $job = TranslateRenderJob::newJob( $target );
$job->setUser( $user );
$job->setSummary( $summary );
$job->setFlags( $flags );
diff --git a/tag/SpecialPageTranslation.php b/tag/SpecialPageTranslation.php
index c131734..2768c67 100644
--- a/tag/SpecialPageTranslation.php
+++ b/tag/SpecialPageTranslation.php
@@ -781,7 +781,7 @@
$titles = $page->getTranslationPages();
foreach ( $titles as $t ) {
- $jobs[] = RenderJob::newJob( $t );
+ $jobs[] = TranslateRenderJob::newJob( $t );
}
return $jobs;
diff --git a/tag/SpecialPageTranslationDeletePage.php
b/tag/SpecialPageTranslationDeletePage.php
index c6877f0..40086ba 100644
--- a/tag/SpecialPageTranslationDeletePage.php
+++ b/tag/SpecialPageTranslationDeletePage.php
@@ -281,12 +281,12 @@
$translationPages = $this->getTranslationPages();
$user = $this->getUser();
foreach ( $translationPages as $old ) {
- $jobs[$old->getPrefixedText()] = DeleteJob::newJob(
$old, $base, !$this->singleLanguage(), $user );
+ $jobs[$old->getPrefixedText()] =
TranslateDeleteJob::newJob( $old, $base, !$this->singleLanguage(), $user );
}
$sectionPages = $this->getSectionPages();
foreach ( $sectionPages as $old ) {
- $jobs[$old->getPrefixedText()] = DeleteJob::newJob(
$old, $base, !$this->singleLanguage(), $user );
+ $jobs[$old->getPrefixedText()] =
TranslateDeleteJob::newJob( $old, $base, !$this->singleLanguage(), $user );
}
if ( !$this->doSubpages ) {
@@ -296,7 +296,7 @@
continue;
}
- $jobs[$old->getPrefixedText()] =
DeleteJob::newJob( $old, $base, !$this->singleLanguage(), $user );
+ $jobs[$old->getPrefixedText()] =
TranslateDeleteJob::newJob( $old, $base, !$this->singleLanguage(), $user );
}
}
diff --git a/tag/SpecialPageTranslationMovePage.php
b/tag/SpecialPageTranslationMovePage.php
index 509ad9f..835b316 100644
--- a/tag/SpecialPageTranslationMovePage.php
+++ b/tag/SpecialPageTranslationMovePage.php
@@ -361,13 +361,13 @@
$translationPages = $this->getTranslationPages();
foreach ( $translationPages as $old ) {
$to = $this->newPageTitle( $base, $old, $target );
- $jobs[$old->getPrefixedText()] = MoveJob::newJob( $old,
$to, $params, $user );
+ $jobs[$old->getPrefixedText()] =
TranslateMoveJob::newJob( $old, $to, $params, $user );
}
$sectionPages = $this->getSectionPages();
foreach ( $sectionPages as $old ) {
$to = $this->newPageTitle( $base, $old, $target );
- $jobs[$old->getPrefixedText()] = MoveJob::newJob( $old,
$to, $params, $user );
+ $jobs[$old->getPrefixedText()] =
TranslateMoveJob::newJob( $old, $to, $params, $user );
}
if ( $this->moveSubpages ) {
@@ -378,22 +378,22 @@
}
$to = $this->newPageTitle( $base, $old, $target
);
- $jobs[$old->getPrefixedText()] =
MoveJob::newJob( $old, $to, $params, $user );
+ $jobs[$old->getPrefixedText()] =
TranslateMoveJob::newJob( $old, $to, $params, $user );
}
}
- // This is used by MoveJob
+ // This is used by TranslateMoveJob
wfGetCache( CACHE_ANYTHING )->set( wfMemcKey(
'translate-pt-move', $base ), count( $jobs ) );
Job::batchInsert( $jobs );
- MoveJob::forceRedirects( false );
+ TranslateMoveJob::forceRedirects( false );
$errors = $this->oldTitle->moveTo( $this->newTitle, true,
$this->reason, false );
if ( is_array( $errors ) ) {
$this->showErrors( $errors );
}
- MoveJob::forceRedirects( true );
+ TranslateMoveJob::forceRedirects( true );
$newTpage = TranslatablePage::newFromTitle( $this->newTitle );
$newTpage->addReadyTag( $this->newTitle->getLatestRevId(
Title::GAID_FOR_UPDATE ) );
diff --git a/tag/DeleteJob.php b/tag/TranslateDeleteJob.php
similarity index 98%
rename from tag/DeleteJob.php
rename to tag/TranslateDeleteJob.php
index 9718298..6c558de 100644
--- a/tag/DeleteJob.php
+++ b/tag/TranslateDeleteJob.php
@@ -13,14 +13,14 @@
*
* @ingroup PageTranslation JobQueue
*/
-class DeleteJob extends Job {
+class TranslateDeleteJob extends Job {
/**
* @static
* @param $target Title
* @param $base
* @param $full
* @param $performer
- * @return DeleteJob
+ * @return TranslateDeleteJob
*/
public static function newJob( Title $target, $base, $full, /*User*/
$performer ) {
$job = new self( $target );
diff --git a/tag/MoveJob.php b/tag/TranslateMoveJob.php
similarity index 98%
rename from tag/MoveJob.php
rename to tag/TranslateMoveJob.php
index 90bcebe..b087890 100644
--- a/tag/MoveJob.php
+++ b/tag/TranslateMoveJob.php
@@ -13,14 +13,14 @@
*
* @ingroup PageTranslation JobQueue
*/
-class MoveJob extends Job {
+class TranslateMoveJob extends Job {
/**
* @param $source Title
* @param $target Title
* @param $params array, should include base-source and base-target
* @param $performer
- * @return MoveJob
+ * @return TranslateMoveJob
*/
public static function newJob( Title $source, Title $target, array
$params, /*User*/ $performer ) {
$job = new self( $source );
diff --git a/tag/RenderJob.php b/tag/TranslateRenderJob.php
similarity index 97%
rename from tag/RenderJob.php
rename to tag/TranslateRenderJob.php
index d26cd99..5ad3cbf 100644
--- a/tag/RenderJob.php
+++ b/tag/TranslateRenderJob.php
@@ -13,11 +13,11 @@
*
* @ingroup PageTranslation JobQueue
*/
-class RenderJob extends Job {
+class TranslateRenderJob extends Job {
/**
* @param $target Title
- * @return RenderJob
+ * @return TranslateRenderJob
*/
public static function newJob( Title $target ) {
$job = new self( $target );
diff --git a/tests/PageTranslationTaggingTest.php
b/tests/PageTranslationTaggingTest.php
index c4c2f15..05d2b2a 100644
--- a/tests/PageTranslationTaggingTest.php
+++ b/tests/PageTranslationTaggingTest.php
@@ -82,7 +82,7 @@
MessageGroups::clearCache();
$translationPage = Title::newFromText( 'Translatable page/fi' );
- RenderJob::newJob( $translationPage )->run();
+ TranslateRenderJob::newJob( $translationPage )->run();
$this->assertTrue( $translationPage->userCan( 'read',
$superUser ),
'Users can read existing translation pages' );
$this->assertFalse( $translationPage->userCan( 'edit',
$superUser ),
--
To view, visit https://gerrit.wikimedia.org/r/52638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23d0226545863960fb955f9d5498e6ad5ec13822
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
