@@ -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 | { |
@@ -27,7 +27,6 @@ discard block |
||
| 27 | 27 | * |
| 28 | 28 | * @param \Illuminate\Http\Request $request Request object |
| 29 | 29 | * @param string Resource location, e.g. "product/stock/wareshouse" |
| 30 | - * @param string $sitecode Unique site code |
|
| 31 | 30 | * @param integer|null $id Unique resource ID |
| 32 | 31 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 33 | 32 | */ |
@@ -48,7 +47,6 @@ discard block |
||
| 48 | 47 | * |
| 49 | 48 | * @param \Illuminate\Http\Request $request Request object |
| 50 | 49 | * @param string Resource location, e.g. "product/stock/wareshouse" |
| 51 | - * @param string $sitecode Unique site code |
|
| 52 | 50 | * @param integer|null $id Unique resource ID |
| 53 | 51 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 54 | 52 | */ |
@@ -69,7 +67,6 @@ discard block |
||
| 69 | 67 | * |
| 70 | 68 | * @param \Illuminate\Http\Request $request Request object |
| 71 | 69 | * @param string Resource location, e.g. "product/stock/wareshouse" |
| 72 | - * @param string $sitecode Unique site code |
|
| 73 | 70 | * @param integer|null $id Unique resource ID |
| 74 | 71 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 75 | 72 | */ |
@@ -90,7 +87,6 @@ discard block |
||
| 90 | 87 | * |
| 91 | 88 | * @param \Illuminate\Http\Request $request Request object |
| 92 | 89 | * @param string Resource location, e.g. "product/stock/wareshouse" |
| 93 | - * @param string $sitecode Unique site code |
|
| 94 | 90 | * @param integer $id Unique ID of the resource |
| 95 | 91 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 96 | 92 | */ |
@@ -111,7 +107,6 @@ discard block |
||
| 111 | 107 | * |
| 112 | 108 | * @param \Illuminate\Http\Request $request Request object |
| 113 | 109 | * @param string Resource location, e.g. "product/stock/wareshouse" |
| 114 | - * @param string $sitecode Unique site code |
|
| 115 | 110 | * @param integer|null $id Unique resource ID |
| 116 | 111 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 117 | 112 | */ |
@@ -132,7 +127,6 @@ discard block |
||
| 132 | 127 | * |
| 133 | 128 | * @param \Illuminate\Http\Request $request Request object |
| 134 | 129 | * @param string Resource location, e.g. "product/stock/wareshouse" |
| 135 | - * @param string $sitecode Unique site code |
|
| 136 | 130 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 137 | 131 | */ |
| 138 | 132 | public function optionsAction( Request $request, $site = 'default', $resource = '' ) |
@@ -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 | } |
@@ -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 | } |
@@ -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 ); |
@@ -163,8 +163,7 @@ |
||
| 163 | 163 | $site = \Route::input( 'site', 'default' ); |
| 164 | 164 | $lang = \Route::input( 'locale', '' ); |
| 165 | 165 | $currency = \Route::input( 'currency', '' ); |
| 166 | - } |
|
| 167 | - else |
|
| 166 | + } else |
|
| 168 | 167 | { |
| 169 | 168 | $site = 'default'; |
| 170 | 169 | $lang = $currency = ''; |