@@ -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 ); |
@@ -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 | } |
@@ -9,57 +9,57 @@ |
||
9 | 9 | |
10 | 10 | if( !function_exists( 'aiconfig' ) ) |
11 | 11 | { |
12 | - /** |
|
13 | - * Returns the configuration setting for the given key |
|
14 | - * |
|
15 | - * @param string $key Configuration key |
|
16 | - * @param mixed $default Default value if the configuration key isn't found |
|
17 | - * @return mixed Configuration value |
|
18 | - */ |
|
19 | - function aiconfig( $key, $default = null ) |
|
20 | - { |
|
21 | - return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
22 | - } |
|
12 | + /** |
|
13 | + * Returns the configuration setting for the given key |
|
14 | + * |
|
15 | + * @param string $key Configuration key |
|
16 | + * @param mixed $default Default value if the configuration key isn't found |
|
17 | + * @return mixed Configuration value |
|
18 | + */ |
|
19 | + function aiconfig( $key, $default = null ) |
|
20 | + { |
|
21 | + return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default ); |
|
22 | + } |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | if( !function_exists( 'aitrans' ) ) |
27 | 27 | { |
28 | - /** |
|
29 | - * Translates the given message |
|
30 | - * |
|
31 | - * @param string $singular Message to translate |
|
32 | - * @param array $params List of paramters for replacing the placeholders in that order |
|
33 | - * @param string $domain Translation domain |
|
34 | - * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
35 | - * @return string Translated string |
|
36 | - */ |
|
37 | - function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
38 | - { |
|
39 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
28 | + /** |
|
29 | + * Translates the given message |
|
30 | + * |
|
31 | + * @param string $singular Message to translate |
|
32 | + * @param array $params List of paramters for replacing the placeholders in that order |
|
33 | + * @param string $domain Translation domain |
|
34 | + * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
35 | + * @return string Translated string |
|
36 | + */ |
|
37 | + function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null ) |
|
38 | + { |
|
39 | + $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
40 | 40 | |
41 | - return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
42 | - } |
|
41 | + return vsprintf( $i18n->dt( $domain, $singular ), $params ); |
|
42 | + } |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
46 | 46 | if( !function_exists( 'aitransplural' ) ) |
47 | 47 | { |
48 | - /** |
|
49 | - * Translates the given messages based on the number |
|
50 | - * |
|
51 | - * @param string $singular Message to translate |
|
52 | - * @param string $plural Message for plural translations |
|
53 | - * @param integer $number Count of items to chose the correct plural translation |
|
54 | - * @param array $params List of paramters for replacing the placeholders in that order |
|
55 | - * @param string $domain Translation domain |
|
56 | - * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
57 | - * @return string Translated string |
|
58 | - */ |
|
59 | - function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
60 | - { |
|
61 | - $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
48 | + /** |
|
49 | + * Translates the given messages based on the number |
|
50 | + * |
|
51 | + * @param string $singular Message to translate |
|
52 | + * @param string $plural Message for plural translations |
|
53 | + * @param integer $number Count of items to chose the correct plural translation |
|
54 | + * @param array $params List of paramters for replacing the placeholders in that order |
|
55 | + * @param string $domain Translation domain |
|
56 | + * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US" |
|
57 | + * @return string Translated string |
|
58 | + */ |
|
59 | + function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null ) |
|
60 | + { |
|
61 | + $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale ); |
|
62 | 62 | |
63 | - return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
64 | - } |
|
63 | + return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params ); |
|
64 | + } |
|
65 | 65 | } |