Merge remote-tracking branch 'mainline/develop' into MAGETWO-36298

Susan Wright · Susan Wright · commit 475e7866a947 · 2015-04-22T13:10:11.000-07:00
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
@@ -22,7 +22,7 @@ public function execute()
         $service = $this->getRequest()->getParam('rate_services');
         $this->_getSession()->setCurrencyRateService($service);
         if (!$service) {
-            throw new \Exception(__('Please specify a correct Import Service.'));
+            throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a correct Import Service.'));
         }
         try {
             /** @var \Magento\Directory\Model\Currency\Import\ImportInterface $importModel */

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function execute()`
`22`	`22`	`$service = $this->getRequest()->getParam('rate_services');`
`23`	`23`	`$this->_getSession()->setCurrencyRateService($service);`
`24`	`24`	`if (!$service) {`
`25`		`- throw new \Exception(__('Please specify a correct Import Service.'));`
	`25`	`+ throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a correct Import Service.'));`
`26`	`26`	`}`
`27`	`27`	`try {`
`28`	`28`	`/** @var \Magento\Directory\Model\Currency\Import\ImportInterface $importModel */`