MAGETWO-50289: Merge branch 'shipping-i18n' of github.com:mamzellejuu/magento2 into github_pr

ishakhsuvarov · ishakhsuvarov · commit 2477c5ca5fda · 2016-06-15T10:30:51.000+03:00
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -242,7 +242,7 @@ define(
                     emailValidationResult = customer.isLoggedIn();
 
                 if (!quote.shippingMethod()) {
-                    this.errorValidationMessage('Please specify a shipping method.');
+                    this.errorValidationMessage($.mage.__('Please specify a shipping method.'));
 
                     return false;
                 }

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ define(`
`242`	`242`	`emailValidationResult = customer.isLoggedIn();`
`243`	`243`
`244`	`244`	`if (!quote.shippingMethod()) {`
`245`		`- this.errorValidationMessage('Please specify a shipping method.');`
	`245`	`+ this.errorValidationMessage($.mage.__('Please specify a shipping method.'));`
`246`	`246`
`247`	`247`	`return false;`
`248`	`248`	`}`