Skip to content

Commit 8b25786

Browse files
committed
fix: also fall back to system default language when configured fallbacks are empty
1 parent d4dbb9c commit 8b25786

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

src/Grid/Util/Trait/LocalizedValueTrait.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@ private function getLocalizedValue(Column $column, ElementInterface $element): m
2929
$value = $element->$getter($column->getLocale());
3030

3131
if ($column->getApplyFallbackLanguages() && $this->isEmptyValue($value)) {
32-
foreach (Tool::getFallbackLanguagesFor($column->getLocale()) as $fallbackLocale) {
32+
$fallbackLocales = Tool::getFallbackLanguagesFor($column->getLocale());
33+
34+
// Also try the system default language as a final fallback
35+
$defaultLanguage = Tool::getDefaultLanguage();
36+
if ($defaultLanguage !== null && $defaultLanguage !== $column->getLocale() && !in_array($defaultLanguage, $fallbackLocales, true)) {
37+
$fallbackLocales[] = $defaultLanguage;
38+
}
39+
40+
foreach ($fallbackLocales as $fallbackLocale) {
3341
$value = $element->$getter($fallbackLocale);
3442
if (!$this->isEmptyValue($value)) {
3543
break;

0 commit comments

Comments
 (0)