Skip to content

Commit 8ea4464

Browse files
committed
feat: Merge locale and country configurations and streamline core setup dependencies.
1 parent f84eadb commit 8ea4464

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

src/Http/Controllers/Admin/SetupController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,9 @@ function () use ($request) {
117117
if (!setting('language')) {
118118
setting()?->set('language', 'en');
119119
}
120+
120121
if (!setting('theme')) {
121-
setting()?->set('theme', $website->theme ?? 'itech');
122+
setting()?->set('theme', 'itech');
122123
}
123124

124125
if (!setting('sitename')) {

src/Providers/CoreServiceProvider.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,16 @@ protected function registerConfigs(): void
153153
'translator'
154154
);
155155

156+
$this->mergeConfigFrom(
157+
__DIR__ . '/../../config/locales.php',
158+
'locales'
159+
);
160+
161+
$this->mergeConfigFrom(
162+
__DIR__ . '/../../config/countries.php',
163+
'countries'
164+
);
165+
156166
$this->publishes([
157167
__DIR__ . '/../../config/core.php' => config_path('core.php'),
158168
__DIR__ . '/../../config/media.php' => config_path('media.php'),

src/Translations/Jobs/ModelTranslateJob.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class ModelTranslateJob implements ShouldQueue
2727
public bool $failOnTimeout = true;
2828

2929
public function __construct(
30-
protected Website $website,
3130
protected Translatable $model,
3231
protected string $sourceLocale,
3332
protected string $targetLocale

0 commit comments

Comments
 (0)