1 files changed, 36 insertions, 19 deletions

diff --git a/www/wiki/extensions/Translate/translationaids/MachineTranslationAid.php b/www/wiki/extensions/Translate/translationaids/MachineTranslationAid.php
index f8b9aeca..fa14a13b 100644
--- a/www/wiki/extensions/Translate/translationaids/MachineTranslationAid.php
+++ b/www/wiki/extensions/Translate/translationaids/MachineTranslationAid.php
@@ -5,7 +5,7 @@
  * @file
  * @author Niklas Laxström
  * @copyright Copyright © 2012-2013, Niklas Laxström
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  */
 
 /**
@@ -16,55 +16,72 @@
  */
 class MachineTranslationAid extends QueryAggregatorAwareTranslationAid {
 	public function populateQueries() {
-		$definition = $this->getDefinition();
-		$translations = $this->getTranslations();
+		$definition = $this->dataProvider->getDefinition();
+		$translations = $this->dataProvider->getGoodTranslations();
 		$from = $this->group->getSourceLanguage();
 		$to = $this->handle->getCode();
 
+		if ( trim( $definition ) === '' ) {
+			return;
+		}
+
 		foreach ( $this->getWebServices( 'mt' ) as $service ) {
 			if ( $service->checkTranslationServiceFailure() ) {
 				continue;
 			}
 
-			if ( $service->isSupportedLanguagePair( $from, $to ) ) {
-				$this->storeQuery( $service, $from, $to, $definition );
-				continue;
-			}
-
-			// Loop of the the translations we have to see which can be used as source
-			// @todo: Support setting priority of languages like Yandex used to have
-			foreach ( $translations as $from => $text ) {
-				if ( !$service->isSupportedLanguagePair( $from, $to ) ) {
+			try {
+				if ( $service->isSupportedLanguagePair( $from, $to ) ) {
+					$this->storeQuery( $service, $from, $to, $definition );
 					continue;
 				}
 
-				$this->storeQuery( $service, $from, $to, $text );
-				break;
+				// Search for translations which we can use as a source for MT
+				// @todo: Support setting priority of languages like Yandex used to have
+				foreach ( $translations as $from => $text ) {
+					if ( !$service->isSupportedLanguagePair( $from, $to ) ) {
+						continue;
+					}
+
+					$this->storeQuery( $service, $from, $to, $text );
+					break;
+				}
+			} catch ( TranslationWebServiceConfigurationException $e ) {
+				throw new TranslationHelperException( $service->getName() . ': ' . $e->getMessage() );
 			}
 		}
 	}
 
 	public function getData() {
-		$suggestions = array( '**' => 'suggestion' );
+		$suggestions = [ '**' => 'suggestion' ];
 
 		foreach ( $this->getQueryData() as $queryData ) {
 			$suggestions[] = $this->formatSuggestion( $queryData );
 		}
 
-		return $suggestions;
+		return array_filter( $suggestions );
 	}
 
+	/**
+	 * @param array $queryData
+	 * @return array|null
+	 */
 	protected function formatSuggestion( array $queryData ) {
 		$service = $queryData['service'];
 		$response = $queryData['response'];
 		$sourceLanguage = $queryData['language'];
 		$sourceText = $queryData['text'];
 
-		return array(
-			'target' => $service->getResultData( $response ),
+		$result = $service->getResultData( $response );
+		if ( $result === null ) {
+			return null;
+		}
+
+		return [
+			'target' => $result,
 			'service' => $service->getName(),
 			'source_language' => $sourceLanguage,
 			'source' => $sourceText,
-		);
+		];
 	}
 }