Merge remote-tracking branch 'remotes/api/MAGETWO-44459-Check-javascript-function-calls-and-labels-are-translatable' into API-Bug-PR

Cari Spruiell · Cari Spruiell · commit 9abdcf5ed3ae · 2015-11-02T11:08:58.000-06:00
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
@@ -403,7 +403,8 @@ require([
                             errorsMessage.push(tmpError.message);
                         }
 
-                        return $.mage.__('Video cant be shown due to the following reason: ') + $.unique(errorsMessage).join(', ');
+                        return $.mage.__('Video cant be shown due to the following reason: ') +
+                            $.unique(errorsMessage).join(', ');
                     };
 
                     if (data.error && data.error.code === 400) {

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,8 @@ require([`
`403`	`403`	`errorsMessage.push(tmpError.message);`
`404`	`404`	`}`
`405`	`405`
`406`		`- return $.mage.__('Video cant be shown due to the following reason: ') + $.unique(errorsMessage).join(', ');`
	`406`	`+ return $.mage.__('Video cant be shown due to the following reason: ') +`
	`407`	`+ $.unique(errorsMessage).join(', ');`
`407`	`408`	`};`
`408`	`409`
`409`	`410`	`if (data.error && data.error.code === 400) {`