@@ -123,25 +123,25 @@ |
||
123 | 123 | $source = $app['config']->get('translator.source'); |
124 | 124 | |
125 | 125 | switch ($source) { |
126 | - case 'mixed': |
|
127 | - $laravelFileLoader = new LaravelFileLoader($app['files'], $app->basePath() . '/resources/lang'); |
|
128 | - $fileLoader = new FileLoader($defaultLocale, $laravelFileLoader); |
|
129 | - $databaseLoader = new DatabaseLoader($defaultLocale, $app->make(TranslationRepository::class)); |
|
130 | - $loader = new MixedLoader($defaultLocale, $fileLoader, $databaseLoader); |
|
131 | -break; |
|
132 | - case 'mixed_db': |
|
133 | - $laravelFileLoader = new LaravelFileLoader($app['files'], $app->basePath() . '/resources/lang'); |
|
134 | - $fileLoader = new FileLoader($defaultLocale, $laravelFileLoader); |
|
135 | - $databaseLoader = new DatabaseLoader($defaultLocale, $app->make(TranslationRepository::class)); |
|
136 | - $loader = new MixedLoader($defaultLocale, $databaseLoader, $fileLoader); |
|
137 | -break; |
|
138 | - case 'database': |
|
139 | - $loader = new DatabaseLoader($defaultLocale, $app->make(TranslationRepository::class)); |
|
140 | -break; |
|
141 | - default:case 'files': |
|
126 | + case 'mixed': |
|
142 | 127 | $laravelFileLoader = new LaravelFileLoader($app['files'], $app->basePath() . '/resources/lang'); |
143 | - $loader = new FileLoader($defaultLocale, $laravelFileLoader); |
|
144 | -break; |
|
128 | + $fileLoader = new FileLoader($defaultLocale, $laravelFileLoader); |
|
129 | + $databaseLoader = new DatabaseLoader($defaultLocale, $app->make(TranslationRepository::class)); |
|
130 | + $loader = new MixedLoader($defaultLocale, $fileLoader, $databaseLoader); |
|
131 | + break; |
|
132 | + case 'mixed_db': |
|
133 | + $laravelFileLoader = new LaravelFileLoader($app['files'], $app->basePath() . '/resources/lang'); |
|
134 | + $fileLoader = new FileLoader($defaultLocale, $laravelFileLoader); |
|
135 | + $databaseLoader = new DatabaseLoader($defaultLocale, $app->make(TranslationRepository::class)); |
|
136 | + $loader = new MixedLoader($defaultLocale, $databaseLoader, $fileLoader); |
|
137 | + break; |
|
138 | + case 'database': |
|
139 | + $loader = new DatabaseLoader($defaultLocale, $app->make(TranslationRepository::class)); |
|
140 | + break; |
|
141 | + default:case 'files': |
|
142 | + $laravelFileLoader = new LaravelFileLoader($app['files'], $app->basePath() . '/resources/lang'); |
|
143 | + $loader = new FileLoader($defaultLocale, $laravelFileLoader); |
|
144 | + break; |
|
145 | 145 | } |
146 | 146 | if ($app['config']->get('translator.cache.enabled')) { |
147 | 147 | $loader = new CacheLoader($defaultLocale, $app['translation.cache.repository'], $loader, $app['config']->get('translator.cache.timeout')); |