Merge branch 'develop' into feature/integrate-with-admin-pro

This commit is contained in:
Flavio Copes
2015-12-01 18:09:52 +01:00
12 changed files with 46 additions and 9 deletions

View File

@@ -838,6 +838,11 @@ class Admin
$translation = $this->grav['language']->getTranslation($language, $lookup, $array_support);
}
if (!$translation) {
$language = 'en';
$translation = $this->grav['language']->getTranslation($language, $lookup, $array_support);
}
if ($translation) {
if (count($args) >= 1) {
return vsprintf($translation, $args);