opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-09-24 15:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Override default number locale in Tables and Infolists

Browse Source
This commit is contained in:
dmason30
2024-07-12 20:26:21 +01:00
parent 6f89834126
commit e02fdf1cc5
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/infolists/src/Components/Concerns/CanFormatState.php
+4 -1
View File
@@ -163,6 +163,7 @@ trait CanFormatState
}
$currency = $component->evaluate($currency) ?? Infolist::$defaultCurrency;
$locale = $component->evaluate($locale) ?? Infolist::$defaultNumberLocale ?? config('app.locale');
if ($divideBy) {
$state /= $divideBy;
@@ -203,7 +204,9 @@ trait CanFormatState
);
}
return Number::format($state, $decimalPlaces, $component->evaluate($maxDecimalPlaces), $component->evaluate($locale) ?? config('app.locale'));
$locale = $component->evaluate($locale) ?? Infolist::$defaultNumberLocale ?? config('app.locale');
return Number::format($state, $decimalPlaces, $component->evaluate($maxDecimalPlaces), $locale);
});
return $this;
packages/infolists/src/Infolist.php
+2
View File
@@ -14,6 +14,8 @@ class Infolist extends ComponentContainer
public static string $defaultTimeDisplayFormat = 'H:i:s';
public static ?string $defaultNumberLocale = null;
public function name(string $name): static
{
$this->name = $name;
packages/tables/src/Columns/Concerns/CanFormatState.php
+5 -2
View File
@@ -163,12 +163,13 @@ trait CanFormatState
}
$currency = $column->evaluate($currency) ?? Table::$defaultCurrency;
$locale = $column->evaluate($locale) ?? Table::$defaultNumberLocale ?? config('app.locale');
if ($divideBy) {
$state /= $divideBy;
}
return Number::currency($state, $currency, $column->evaluate($locale) ?? config('app.locale'));
return Number::currency($state, $currency, $locale);
});
return $this;
@@ -203,7 +204,9 @@ trait CanFormatState
);
}
return Number::format($state, $decimalPlaces, $column->evaluate($maxDecimalPlaces), locale: $column->evaluate($locale) ?? config('app.locale'));
$locale = $column->evaluate($locale) ?? Table::$defaultNumberLocale ?? config('app.locale');
return Number::format($state, $decimalPlaces, $column->evaluate($maxDecimalPlaces), locale: $locale);
});
return $this;
packages/tables/src/Table.php
+2
View File
@@ -64,6 +64,8 @@ class Table extends ViewComponent
public static string $defaultDateTimeDisplayFormat = 'M j, Y H:i:s';
public static ?string $defaultNumberLocale = null;
public static string $defaultTimeDisplayFormat = 'H:i:s';
final public function __construct(HasTable $livewire)