diff --git a/CHANGELOG.md b/CHANGELOG.md index 17831d6e..51feea2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ 1. [](#bugfix) * Fixed issue with custom logo text overlapping the sidebar toggle [#1334](https://github.com/getgrav/grav-plugin-admin/issues/1334) * Fixed issues with minimum PHP versions in resource upgrades + * Fixed issue with default lang translation in admin [#1361](https://github.com/getgrav/grav-plugin-admin/issues/1361) * Typos in `Tools` -> `Direct Install` page [#1345](https://github.com/getgrav/grav-plugin-admin/issues/1345) # v1.7.0-rc.3 diff --git a/classes/admin.php b/classes/admin.php index f0a3963c..fe3bf1ac 100644 --- a/classes/admin.php +++ b/classes/admin.php @@ -464,21 +464,16 @@ class Admin } if (!$languages) { - $languages = [$grav['user']->authenticated ? $grav['user']->language : 'en']; + if ($grav['config']->get('system.languages.translations_fallback', true)) { + $languages = $grav['language']->getFallbackLanguages(); + } else { + $languages = (array)$grav['language']->getDefault(); + } + $languages = $grav['user']->authenticated ? [ $grav['user']->language ] : $languages; } else { $languages = (array)$languages; } - if ($lookup) { - if (empty($languages) || reset($languages) == null) { - if ($grav['config']->get('system.languages.translations_fallback', true)) { - $languages = $grav['language']->getFallbackLanguages(); - } else { - $languages = (array)$grav['language']->getDefault(); - } - } - } - foreach ((array)$languages as $lang) { $translation = $grav['language']->getTranslation($lang, $lookup);