Skip to content

Commit a2daae9

Browse files
jackbaronnhat.ta
and
nhat.ta
authored
Fix locale null with Filament v3 (#32)
Co-authored-by: nhat.ta <[email protected]>
1 parent 0ce43fc commit a2daae9

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/UniqueTranslationValidator.php

+11-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Illuminate\Support\Facades\Config;
77
use Illuminate\Support\Facades\DB;
88
use Illuminate\Support\Str;
9+
use Illuminate\Support\Arr;
910

1011
class UniqueTranslationValidator
1112
{
@@ -25,7 +26,7 @@ public function validate($attribute, $value, $parameters, $validator)
2526
? $this->getNovaAttributeNameAndLocale($attribute)
2627
: (
2728
$this->isFilamentTranslation($attribute)
28-
? $this->getFilamentAttributeNameAndLocale($attribute)
29+
? $this->getFilamentAttributeNameAndLocale($attribute, $validator)
2930
: $this->getArrayAttributeNameAndLocale($attribute)
3031
);
3132

@@ -110,10 +111,18 @@ protected function isFilamentTranslation($attribute)
110111
*
111112
* @return array
112113
*/
113-
protected function getFilamentAttributeNameAndLocale($attribute)
114+
protected function getFilamentAttributeNameAndLocale($attribute, $validator)
114115
{
115116
$attribute = str_replace('data.', '', $attribute);
117+
118+
$dataValidator = $validator->getData();
119+
116120
@list($name, $locale) = @explode('.', $attribute);
121+
122+
if ($locale === null && Arr::exists($dataValidator, 'activeLocale')) {
123+
$locale = $dataValidator['activeLocale'];
124+
}
125+
117126
return [$name, $locale];
118127
}
119128

0 commit comments

Comments
 (0)