Skip to content

Commit c83eab1

Browse files
committed
use locale_variant instead of alpha2
1 parent 8a792a8 commit c83eab1

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

packages/media/src/Resources/MediaCollectionResource/Pages/ListMediaCollections.php

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
namespace Moox\Media\Resources\MediaCollectionResource\Pages;
44

55
use Filament\Actions\CreateAction;
6+
use Moox\Media\Models\MediaCollection;
7+
use Illuminate\Database\Eloquent\Model;
68
use Filament\Resources\Pages\ListRecords;
79
use Illuminate\Database\Eloquent\Builder;
8-
use Illuminate\Database\Eloquent\Model;
9-
use Illuminate\Database\Eloquent\Relations\Relation;
1010
use Moox\Localization\Models\Localization;
11-
use Moox\Media\Models\MediaCollection;
1211
use Moox\Media\Resources\MediaCollectionResource;
12+
use Illuminate\Database\Eloquent\Relations\Relation;
1313

1414
class ListMediaCollections extends ListRecords
1515
{
@@ -25,9 +25,9 @@ public function mount(): void
2525
{
2626
parent::mount();
2727
$this->lang = request()->get('lang', $this->getDefaultLocale());
28-
28+
2929
app()->setLocale($this->lang);
30-
30+
3131
MediaCollection::ensureUncategorizedExists();
3232
}
3333

@@ -36,19 +36,17 @@ protected function getDefaultLocale(): string
3636
if (class_exists(Localization::class)) {
3737
$defaultLocale = Localization::where('is_default', true)
3838
->where('is_active_admin', true)
39-
->with('language')
4039
->first();
41-
42-
if ($defaultLocale && $defaultLocale->language) {
43-
return $defaultLocale->language->alpha2;
40+
41+
if ($defaultLocale) {
42+
return $defaultLocale->locale_variant ?: $defaultLocale->language->alpha2;
4443
}
4544

4645
$firstActiveLocale = Localization::where('is_active_admin', true)
47-
->with('language')
4846
->first();
49-
50-
if ($firstActiveLocale && $firstActiveLocale->language) {
51-
return $firstActiveLocale->language->alpha2;
47+
48+
if ($firstActiveLocale) {
49+
return $firstActiveLocale->locale_variant ?: $firstActiveLocale->language->alpha2;
5250
}
5351
}
5452

packages/media/src/Resources/MediaResource/Pages/ListMedia.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,13 @@ public function mount(): void
3535
parent::mount();
3636
$this->isGridView = session('media_grid_view', true);
3737

38-
$defaultLang = Localization::where('is_default', true)
39-
->first()?->language?->alpha2 ?? config('app.locale');
38+
$defaultLocale = Localization::where('is_default', true)
39+
->where('is_active_admin', true)
40+
->first();
41+
42+
$defaultLang = $defaultLocale
43+
? ($defaultLocale->locale_variant ?: $defaultLocale->language?->alpha2)
44+
: config('app.locale');
4045

4146
$this->lang = request()->query('lang', $defaultLang);
4247
}

0 commit comments

Comments
 (0)