fix(localization): boolean display columns and single default locale

Author: AzGasim

packages/data/src/Models/StaticLanguage.php

@@ -190,13 +190,7 @@ public function getFlagIconAttribute(): string
      */
     public function getDisplayNameAttribute(): string
     {
-        $useNativeNames = config('localization.language_selector.use_native_names', true);
-
-        if (! $useNativeNames) {
-            return $this->common_name;
-        }
-
-        if (is_string($this->native_name) && ! empty($this->native_name)) {
+        if (is_string($this->native_name) && $this->native_name !== '') {
             return $this->native_name;
         }
 

packages/localization/README.md

@@ -67,10 +67,10 @@ display_flag  ←  use_country_icon
 | Column | Type | Default | Role |
 |--------|------|---------|------|
 | `locale_variant` | string | required | e.g. `de_CH`, `en_US`, `fr_CH` |
-| `language_settings` | JSON | `null` | Per-row overrides for name settings |
-| `use_country_icon` | boolean | `false` | Per-row: country vs language icon |
-
-Global defaults for `language_settings` keys: `config/localization.php` → `language_selector`.
+| `use_native_names` | boolean | `true` | Native vs English language name |
+| `show_regional_variants` | boolean | `true` | Append country from locale in name |
+| `use_country_translations` | boolean | `true` | Translated country name in parentheses |
+| `use_country_icon` | boolean | `false` | Country vs language flag icon |
 
 ### Display name (`display_name`)
 
@@ -83,8 +83,6 @@ Built by `Localization::getDisplayNameAttribute()`.
 | `StaticLanguage::native_name` | `StaticLanguage::common_name` (usually English) |
 | Deutsch | German |
 
-Config: `language_selector.use_native_names` (default: `true`).
-
 #### Regional (`show_regional_variants`)
 
 When **on** and `locale_variant` contains `_` (e.g. `de_CH`), appends the country in parentheses:
@@ -94,7 +92,7 @@ When **on** and `locale_variant` contains `_` (e.g. `de_CH`), appends the countr
 | Deutsch (Schweiz) | Deutsch |
 | English (United States) | English |
 
-No effect when the locale has no region suffix (`de` only). Config: `language_selector.show_regional_variants` (default: `true`).
+No effect when the locale has no region suffix (`de` only).
 
 #### Country names (`use_country_translations`)
 
@@ -105,8 +103,6 @@ Only when **Regional** is on. Turning Regional off also turns Country names off.
 | Translated name from `static_countries.translations` | `StaticCountry::common_name` |
 | Deutsch (Schweiz) | Deutsch (Switzerland) |
 
-Config: `language_selector.use_country_translations` (default: `true`).
-
 #### Name examples for `de_CH`
 
 | Native | Regional | Country names | Result |
@@ -147,29 +143,12 @@ With `use_country_icon` on all three, all show CH—usually not desired for a mu
 
 ### Filament resource toggles
 
-| Column label | Setting | Affects |
-|--------------|---------|---------|
-| Native | `language_settings.use_native_names` | Name |
-| Regional | `language_settings.show_regional_variants` | Name |
-| Country names | `language_settings.use_country_translations` | Name (parentheses) |
-| Country flag | `use_country_icon` (DB column) | Flag icon |
-
-Per-row `language_settings` override global config when a key is set on that record.
-
-### Global configuration
-
-```php
-// config/localization.php
-'language_selector' => [
-    'use_native_names' => true,
-    'show_regional_variants' => true,
-    'use_country_translations' => true,
-],
-```
-
-Publish: `php artisan vendor:publish --tag=localization-config`
-
-`use_country_icon` is only per localization row (migration default: `false`).
+| Column label | Database column | Affects |
+|--------------|-----------------|---------|
+| Native | `use_native_names` | Name |
+| Regional | `show_regional_variants` | Name |
+| Country names | `use_country_translations` | Name (parentheses) |
+| Country flag | `use_country_icon` | Flag icon |
 
 ### Programmatic access
 
@@ -182,7 +161,8 @@ $localization->display_name; // e.g. "Deutsch (Schweiz)"
 $localization->display_flag; // e.g. "flag-de"
 $localization->table_flag;    // same as display_flag
 
-$localization->getLanguageSetting('show_regional_variants'); // row or config fallback
+$localization->show_regional_variants;
+$localization->use_country_icon;
 ```
 
 ### Recommended defaults
@@ -200,7 +180,7 @@ $localization->getLanguageSetting('show_regional_variants'); // row or config fa
 | `src/Models/Localization.php` | Names + flag resolution |
 | `resources/views/lang-selector.blade.php` | Admin dropdown |
 | `src/Filament/Resources/LocalizationResource.php` | Form and table toggles |
-| `config/localization.php` | Global name defaults |
+| `config/localization.php` | Filament labels, navigation, panel |
 | `database/migrations/create_localizations_table.php.stub` | Schema |
 
 ## Localization panel

packages/localization/config/localization.php

@@ -36,33 +36,7 @@
     |
     */
     'tabs' => [
-        'all' => [
-            'label' => 'trans//core::core.all',
-            'icon' => 'gmdi-filter-list',
-            'query' => [],
-        ],
-        '0' => [
-            'label' => 'LTR',
-            'icon' => 'gmdi-filter-list',
-            'query' => [
-                [
-                    'field' => 'type',
-                    'operator' => '=',
-                    'value' => 'LTR',
-                ],
-            ],
-        ],
-        '1' => [
-            'label' => 'RTL',
-            'icon' => 'gmdi-filter-list',
-            'query' => [
-                [
-                    'field' => 'type',
-                    'operator' => '=',
-                    'value' => 'RTL',
-                ],
-            ],
-        ],
+        
     ],
 
     /*
@@ -77,27 +51,4 @@
     'navigation_group' => 'trans//core::core.system',
     'enable-panel' => false,
 
-    /*
-    |--------------------------------------------------------------------------
-    | Language Selector
-    |--------------------------------------------------------------------------
-    |
-    | Configuration for the language selector component.
-    |
-    */
-    /*
-    | Defaults for display_name (language selector labels). Can be overridden per
-    | localization row in language_settings. Does NOT control flags — see use_country_icon.
-    |
-    | See README: Language selector section
-    */
-    'language_selector' => [
-        // Native name (Deutsch) vs English name (German)
-        'use_native_names' => true,
-        // Append country from locale_variant: Deutsch (Schweiz) for de_CH
-        'show_regional_variants' => true,
-        // Translated country in parentheses: Schweiz vs Switzerland
-        'use_country_translations' => true,
-    ],
-
 ];

packages/localization/database/migrations/create_localizations_table.php.stub

@@ -44,7 +44,10 @@ return new class extends Migration {
             $table->string('routing_domain')->nullable()->unique();
 
             $table->unsignedInteger('translation_status')->nullable();
-            $table->json('language_settings')->nullable();
+
+            $table->boolean('use_native_names')->default(true);
+            $table->boolean('show_regional_variants')->default(true);
+            $table->boolean('use_country_translations')->default(true);
             $table->boolean('use_country_icon')->default(false);
 
             $table->unique(['language_id', 'locale_variant'], 'unique_language_locale');

packages/localization/database/seeders/LocalizationSeeder.php

@@ -38,7 +38,10 @@ public function run(): void
                 'routing_subdomain' => null,
                 'routing_domain' => null,
                 'translation_status' => 100,
-                'language_settings' => json_encode(['locale' => 'en_US']),
+                'use_native_names' => true,
+                'show_regional_variants' => true,
+                'use_country_translations' => true,
+                'use_country_icon' => false,
                 'created_at' => now(),
                 'updated_at' => now(),
             ],
@@ -57,7 +60,10 @@ public function run(): void
                 'routing_subdomain' => null,
                 'routing_domain' => null,
                 'translation_status' => 80,
-                'language_settings' => json_encode(['locale' => 'es_ES']),
+                'use_native_names' => true,
+                'show_regional_variants' => true,
+                'use_country_translations' => true,
+                'use_country_icon' => false,
                 'created_at' => now(),
                 'updated_at' => now(),
             ],
@@ -76,7 +82,10 @@ public function run(): void
                 'routing_subdomain' => null,
                 'routing_domain' => null,
                 'translation_status' => 90,
-                'language_settings' => json_encode(['locale' => 'de_DE']),
+                'use_native_names' => true,
+                'show_regional_variants' => true,
+                'use_country_translations' => true,
+                'use_country_icon' => false,
                 'created_at' => now(),
                 'updated_at' => now(),
             ],

packages/localization/src/Filament/Resources/LocalizationResource.php

@@ -5,11 +5,11 @@
 namespace Moox\Localization\Filament\Resources;
 
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Schemas\Components\Grid;
 use Filament\Schemas\Components\Section;
+use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
 use Filament\Tables\Columns\IconColumn;
@@ -142,7 +142,6 @@ public static function form(Schema $schema): Schema
                                     ->label(__('localization::fields.is_activ_admin'))
                                     ->default(true)
                                     ->disabled(function ($get, $livewire) {
-                                        // Disabled when this localization is set as default
                                         $record = $livewire->record;
                                         $isDefault = $get('is_default') ?? ($record !== null ? $record->is_default : false);
 
@@ -151,47 +150,59 @@ public static function form(Schema $schema): Schema
                                 Toggle::make('is_active_frontend')
                                     ->label(__('localization::fields.is_activ_frontend'))
                                     ->default(false),
-                                Toggle::make('use_country_icon')
-                                    ->label(__('localization::fields.use_country_icon'))
-                                    ->default(false)
-                                    ->helperText(__('localization::fields.use_country_icon_help')),
                                 Toggle::make('is_default')
                                     ->label(__('localization::fields.is_default'))
                                     ->default(false)
                                     ->disabled(function ($get, $livewire) {
-                                        // Disabled when English is selected as default
                                         $record = $livewire->record;
                                         $localeVariant = $get('locale_variant') ?? ($record !== null ? $record->locale_variant : '');
                                         $isDefault = $get('is_default') ?? ($record !== null ? $record->is_default : false);
 
-                                        // If it is an English localization AND already set as default
                                         if (strpos($localeVariant, 'en_') === 0 && $isDefault) {
                                             return true;
                                         }
 
                                         return false;
                                     })
-                                    ->afterStateUpdated(function ($state, $set, $get, $livewire) {
+                                    ->afterStateUpdated(function ($state, $set, $livewire) {
                                         if ($state) {
-                                            // When activated as default, automatically set is_active_admin to true
                                             $set('is_active_admin', true);
 
                                             $currentRecordId = $livewire->record?->id;
-                                            $languageId = $get('language_id');
 
-                                            Localization::where('language_id', $languageId)
-                                                ->when($currentRecordId, function ($query) use ($currentRecordId) {
-                                                    $query->where('id', '!=', $currentRecordId);
-                                                })
+                                            Localization::query()
+                                                ->when($currentRecordId, fn ($query) => $query->where('id', '!=', $currentRecordId))
                                                 ->update(['is_default' => false]);
                                         } else {
-                                            // When default is deactivated, always set en_US as default
                                             $enUsLocale = Localization::where('locale_variant', 'en_US')->first();
-                                            if ($enUsLocale) {
+                                            if ($enUsLocale && $enUsLocale->id !== $livewire->record?->id) {
                                                 $enUsLocale->update(['is_default' => true, 'is_active_admin' => true]);
                                             }
                                         }
                                     }),
+                                Toggle::make('use_native_names')
+                                    ->label(__('localization::fields.use_native_names'))
+                                    ->default(true),
+                                Toggle::make('show_regional_variants')
+                                    ->label(__('localization::fields.show_regional_variants'))
+                                    ->default(true)
+                                    ->live()
+                                    ->afterStateUpdated(function (bool $state, Set $set): void {
+                                        if (! $state) {
+                                            $set('use_country_translations', false);
+                                        }
+                                    }),
+                                Toggle::make('use_country_translations')
+                                    ->label(__('localization::fields.use_country_translations'))
+                                    ->default(true)
+                                    ->disabled(fn (Get $get): bool => ! $get('show_regional_variants'))
+                                    ->helperText(fn (Get $get): ?string => $get('show_regional_variants')
+                                        ? null
+                                        : __('localization::fields.country_names_requires_regional')),
+                                Toggle::make('use_country_icon')
+                                    ->label(__('localization::fields.use_country_icon'))
+                                    ->default(false)
+                                    ->helperText(__('localization::fields.use_country_icon_help')),
                                 TextInput::make('routing_path')
                                     ->label(__('localization::fields.routing_path'))
                                     ->nullable(),
@@ -205,9 +216,6 @@ public static function form(Schema $schema): Schema
                                     ->label(__('localization::fields.translation_status'))
                                     ->numeric()
                                     ->nullable(),
-                                Textarea::make('language_settings')
-                                    ->label(__('localization::fields.language_settings'))
-                                    ->json(),
                             ])
                             ->columnSpan(2),
                         Grid::make()
@@ -301,25 +309,24 @@ public static function table(Table $table): Table
                         }
                     }),
                 // Display name & flag toggles (order: Native → Regional → Country names → Country flag)
-                ToggleColumn::make('use_native_names_setting')
+                ToggleColumn::make('use_native_names')
                     ->label(__('localization::fields.native'))
-                    ->width(80)
-                    ->getStateUsing(fn (Localization $record): bool => $record->getLanguageSetting('use_native_names'))
-                    ->updateStateUsing(fn (Localization $record, bool $state): bool => static::persistLanguageSetting($record, 'use_native_names', $state)),
-                ToggleColumn::make('show_regional_variants_setting')
+                    ->width(80),
+                ToggleColumn::make('show_regional_variants')
                     ->label(__('localization::fields.regional'))
                     ->width(80)
-                    ->getStateUsing(fn (Localization $record): bool => $record->getLanguageSetting('show_regional_variants'))
-                    ->updateStateUsing(fn (Localization $record, bool $state): bool => static::persistLanguageSetting($record, 'show_regional_variants', $state)),
-                ToggleColumn::make('use_country_translations_setting')
+                    ->afterStateUpdated(function (bool $state, Localization $record): void {
+                        if (! $state) {
+                            $record->update(['use_country_translations' => false]);
+                        }
+                    }),
+                ToggleColumn::make('use_country_translations')
                     ->label(__('localization::fields.country_names'))
                     ->width(95)
-                    ->tooltip(fn (Localization $record): ?string => $record->getLanguageSetting('show_regional_variants')
+                    ->tooltip(fn (Localization $record): ?string => $record->show_regional_variants
                         ? null
                         : __('localization::fields.country_names_requires_regional'))
-                    ->disabled(fn (Localization $record): bool => ! $record->getLanguageSetting('show_regional_variants'))
-                    ->getStateUsing(fn (Localization $record): bool => $record->getLanguageSetting('use_country_translations'))
-                    ->updateStateUsing(fn (Localization $record, bool $state): bool => static::persistLanguageSetting($record, 'use_country_translations', $state)),
+                    ->disabled(fn (Localization $record): bool => ! $record->show_regional_variants),
                 ToggleColumn::make('use_country_icon')
                     ->label(__('localization::fields.country_flag'))
                     ->width(95),
@@ -352,17 +359,4 @@ public static function getPages(): array
         ];
     }
 
-    protected static function persistLanguageSetting(Localization $record, string $key, bool $state): bool
-    {
-        $settings = $record->language_settings ?? [];
-        $settings[$key] = $state;
-
-        if ($key === 'show_regional_variants' && ! $state) {
-            $settings['use_country_translations'] = false;
-        }
-
-        $record->update(['language_settings' => $settings]);
-
-        return $state;
-    }
 }

packages/localization/src/Installers/DefaultEnglishLocalizationInstaller.php

@@ -126,9 +126,10 @@ public function install(array $assets): bool
                 'routing_subdomain' => null,
                 'routing_domain' => null,
                 'translation_status' => 100,
-                'language_settings' => [
-                    'locale' => 'en_US',
-                ],
+                'use_native_names' => true,
+                'show_regional_variants' => true,
+                'use_country_translations' => true,
+                'use_country_icon' => false,
             ]);
 
             note('✅ Default English localization created ('.$localization->locale.').');