Merge pull request #101 from wikimedia/undefined-T220618

Handle non-existing target languages in upload check
wikimedia · Apr 12, 2019 · 993ae35 · 993ae35
2 parents 0b6d0e9 + df4e29a
commit 993ae35
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/assets/translate.js b/assets/translate.js
@@ -117,7 +117,7 @@ $( window ).on( 'load', function () {
 	$( '.translation-fields .oo-ui-fieldLayout .oo-ui-inputWidget' ).each( function () {
 		var inputWiget = OO.ui.infuse( $( this ) ),
 			$imgElement = $( '#translation-image img' ),
-			targetLangWidget = OO.ui.infuse( $( '.target-lang-widget' ) ),
+			targetLang = OO.ui.infuse( $( '.target-lang-widget' ) ).getValue(),
 			updatePreviewImage = function () {
 				var requestParams = {},
 					canUpload = false,
@@ -132,17 +132,22 @@ $( window ).on( 'load', function () {
 				$( '.image-column' ).addClass( 'loading' );
 				// Go through all fields and construct the request parameters.
 				$( '.translation-fields .oo-ui-fieldLayout' ).each( function () {
-					var fieldLayout = OO.ui.infuse( $( this ) ),
+					var textChanged,
+						originalText = '',
+						fieldLayout = OO.ui.infuse( $( this ) ),
 						tspanId = fieldLayout.getField().data[ 'tspan-id' ],
-						text = fieldLayout.getField().getValue(),
-						textChanged = text !== '' && text !== appConfig.translations[ tspanId ][ targetLangWidget.getValue() ].text;
+						text = fieldLayout.getField().getValue();
+					if ( appConfig.translations[ tspanId ][ targetLang ] !== undefined ) {
+						originalText = appConfig.translations[ tspanId ][ targetLang ].text;
+					}
+					textChanged = text !== '' && text !== originalText;
 					requestParams[ tspanId ] = text;
 					canUpload = canUpload || ( textChanged && appConfig.loggedIn );
 				} );
 				// Update the image.
 				$.ajax( {
 					type: 'POST',
-					url: appConfig.baseUrl + 'api/translate/' + $imgElement.data( 'filename' ) + '/' + targetLangWidget.getValue(),
+					url: appConfig.baseUrl + 'api/translate/' + $imgElement.data( 'filename' ) + '/' + targetLang,
 					data: requestParams,
 					success: function ( result ) {
 						// Remove the loading class after the image layer has re-loaded.

diff --git a/public/assets/app.2ff9235f.js → public/assets/app.bde6b676.js b/public/assets/app.2ff9235f.js → public/assets/app.bde6b676.js
diff --git a/public/assets/entrypoints.json b/public/assets/entrypoints.json
@@ -5,7 +5,7 @@
         "assets/app.3876858b.css"
       ],
       "js": [
-        "assets/app.2ff9235f.js"
+        "assets/app.bde6b676.js"
       ]
     }
   }

diff --git a/public/assets/manifest.json b/public/assets/manifest.json
@@ -1,6 +1,6 @@
 {
   "assets/app.css": "assets/app.3876858b.css",
-  "assets/app.js": "assets/app.2ff9235f.js",
+  "assets/app.js": "assets/app.bde6b676.js",
   "assets/grabbing.cur": "assets/a8c874b93b3d848f39a71260c57e3863.cur",
   "assets/grab.cur": "assets/b06c243f534d9c5461d16528156cd5a8.cur",
   "assets/i18n/app/af.json": "assets/i18n/app/af.json",