| @@ -39,8 +39,7 @@ | ||
| 39 | 39 | |
| 40 | 40 |  			$i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) ); | 
| 41 | 41 | $translation = $i18n[$locale]; | 
| 42 | - } | |
| 43 | - else | |
| 42 | + } else | |
| 44 | 43 |  		{ | 
| 45 | 44 | $translation = new \Aimeos\MW\Translation\None( 'en' ); | 
| 46 | 45 | } | 
| @@ -207,8 +207,7 @@ | ||
| 207 | 207 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); | 
| 208 | 208 | $localeItem->setLanguageId( null ); | 
| 209 | 209 | $localeItem->setCurrencyId( null ); | 
| 210 | - } | |
| 211 | - catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 210 | + } catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 212 | 211 |  		{ | 
| 213 | 212 | $localeItem = $localeManager->createItem(); | 
| 214 | 213 | } | 
| @@ -177,8 +177,7 @@ | ||
| 177 | 177 | try | 
| 178 | 178 |  		{ | 
| 179 | 179 | $item = $manager->getItem( $code ); | 
| 180 | - } | |
| 181 | - catch( \Aimeos\MShop\Exception $e ) | |
| 180 | + } catch( \Aimeos\MShop\Exception $e ) | |
| 182 | 181 |  		{ | 
| 183 | 182 | $item = $manager->createItem(); | 
| 184 | 183 | $item->setLabel( $code ); | 
| @@ -207,8 +207,7 @@ | ||
| 207 | 207 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); | 
| 208 | 208 | $localeItem->setLanguageId( null ); | 
| 209 | 209 | $localeItem->setCurrencyId( null ); | 
| 210 | - } | |
| 211 | - catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 210 | + } catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 212 | 211 |  		{ | 
| 213 | 212 | $localeItem = $localeManager->createItem(); | 
| 214 | 213 | } | 
| @@ -75,7 +75,7 @@ discard block | ||
| 75 | 75 | /** | 
| 76 | 76 | * Returns the HTML code for a copy of a resource object | 
| 77 | 77 | * | 
| 78 | - * @return string Generated output | |
| 78 | + * @return \Illuminate\Contracts\View\View Generated output | |
| 79 | 79 | */ | 
| 80 | 80 | public function copyAction() | 
| 81 | 81 |  	{ | 
| @@ -91,7 +91,7 @@ discard block | ||
| 91 | 91 | /** | 
| 92 | 92 | * Returns the HTML code for a new resource object | 
| 93 | 93 | * | 
| 94 | - * @return string Generated output | |
| 94 | + * @return \Illuminate\Contracts\View\View Generated output | |
| 95 | 95 | */ | 
| 96 | 96 | public function createAction() | 
| 97 | 97 |  	{ | 
| @@ -107,7 +107,7 @@ discard block | ||
| 107 | 107 | /** | 
| 108 | 108 | * Deletes the resource object or a list of resource objects | 
| 109 | 109 | * | 
| 110 | - * @return string Generated output | |
| 110 | + * @return \Illuminate\Contracts\View\View Generated output | |
| 111 | 111 | */ | 
| 112 | 112 | public function deleteAction() | 
| 113 | 113 |  	{ | 
| @@ -123,7 +123,7 @@ discard block | ||
| 123 | 123 | /** | 
| 124 | 124 | * Returns the HTML code for the requested resource object | 
| 125 | 125 | * | 
| 126 | - * @return string Generated output | |
| 126 | + * @return \Illuminate\Contracts\View\View Generated output | |
| 127 | 127 | */ | 
| 128 | 128 | public function getAction() | 
| 129 | 129 |  	{ | 
| @@ -139,7 +139,7 @@ discard block | ||
| 139 | 139 | /** | 
| 140 | 140 | * Saves a new resource object | 
| 141 | 141 | * | 
| 142 | - * @return string Generated output | |
| 142 | + * @return \Illuminate\Contracts\View\View Generated output | |
| 143 | 143 | */ | 
| 144 | 144 | public function saveAction() | 
| 145 | 145 |  	{ | 
| @@ -155,7 +155,7 @@ discard block | ||
| 155 | 155 | /** | 
| 156 | 156 | * Returns the HTML code for a list of resource objects | 
| 157 | 157 | * | 
| 158 | - * @return string Generated output | |
| 158 | + * @return \Illuminate\Contracts\View\View Generated output | |
| 159 | 159 | */ | 
| 160 | 160 | public function searchAction() | 
| 161 | 161 |  	{ | 
| @@ -135,7 +135,7 @@ | ||
| 135 | 135 | * Creates a list of all available translations. | 
| 136 | 136 | * | 
| 137 | 137 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object | 
| 138 | - * @return array List of language IDs with labels | |
| 138 | + * @return string List of language IDs with labels | |
| 139 | 139 | */ | 
| 140 | 140 | protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context ) | 
| 141 | 141 |  	{ | 
| @@ -207,8 +207,7 @@ | ||
| 207 | 207 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); | 
| 208 | 208 | $localeItem->setLanguageId( null ); | 
| 209 | 209 | $localeItem->setCurrencyId( null ); | 
| 210 | - } | |
| 211 | - catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 210 | + } catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 212 | 211 |  		{ | 
| 213 | 212 | $localeItem = $localeManager->createItem(); | 
| 214 | 213 | } | 
| @@ -207,8 +207,7 @@ | ||
| 207 | 207 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); | 
| 208 | 208 | $localeItem->setLanguageId( null ); | 
| 209 | 209 | $localeItem->setCurrencyId( null ); | 
| 210 | - } | |
| 211 | - catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 210 | + } catch( \Aimeos\MShop\Locale\Exception $e ) | |
| 212 | 211 |  		{ | 
| 213 | 212 | $localeItem = $localeManager->createItem(); | 
| 214 | 213 | } |