jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399362 )
Change subject: Added switch language support
......................................................................
Added switch language support
Change-Id: I28a9ab75c82cefdb260d2b49c77eab79818a6cf8
---
M src/Helper.php
M src/MultiLanguageTranslation.php
2 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Helper.php b/src/Helper.php
index ca05836..9af559a 100644
--- a/src/Helper.php
+++ b/src/Helper.php
@@ -92,18 +92,24 @@
$aNew = array_filter(
$oNew->getTranslations(),
function( $e ) use ( $oOld ){
- if( $oOld->isTranslation( \Title::newFromID(
$e->id ) ) ) {
- return false;
+ if( !$oOld->isTranslation( \Title::newFromID(
$e->id ) ) ) {
+ return true;
}
- return true;
+ if( !$oOld->isTranslatedLang( $e->lang ) ) {
+ return true;
+ }
+ return false;
});
$aDeleted = array_filter(
$oOld->getTranslations(),
function( $e ) use ( $oNew ){
- if( $oNew->isTranslation( \Title::newFromID(
$e->id ) ) ) {
- return false;
+ if( !$oNew->isTranslation( \Title::newFromID(
$e->id ) ) ) {
+ return true;
}
- return true;
+ if( !$oNew->isTranslatedLang( $e->lang ) ) {
+ return true;
+ }
+ return false;
});
return [
diff --git a/src/MultiLanguageTranslation.php b/src/MultiLanguageTranslation.php
index a69535e..8e97060 100644
--- a/src/MultiLanguageTranslation.php
+++ b/src/MultiLanguageTranslation.php
@@ -185,15 +185,9 @@
//Something unexpected!
return \Status::newFatal( 'mlm-error-title-invalid' );
}
- if( $oTranslation->isSourceTitle( $oTitle ) ) {
+ if( $this->isTranslation( $oTitle ) &&
!$this->isTranslatedLang( $sLang ) ) {
return \Status::newFatal(
- 'mlm-error-title-isalreadysource',
- $oTitle->getFullText()
- );
- }
- if( $this->isTranslation( $oTitle ) ) {
- return \Status::newFatal(
- 'mlm-error-title-isalreadysource',
+ 'mlm-error-lang-alreadytraslated',
$oTitle->getFullText()
);
}
--
To view, visit https://gerrit.wikimedia.org/r/399362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28a9ab75c82cefdb260d2b49c77eab79818a6cf8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultiLanguageManager
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
