Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-03 20:05:53 +01:00
Code Issues Packages Projects Releases Activity

Fixed default lang translation #1361

Browse Source
This commit is contained in:
Andy Miller
2018-03-01 16:52:06 -06:00
parent b88cafd334
commit e2c7a005cb
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -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

17
classes/admin.php
View File

@@ -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);