From 659517001be973ce60b88a749835f25654b92688 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 11 Aug 2015 10:14:08 +0200 Subject: [PATCH 1/2] Revert "Force english in admin" This reverts commit 8962d2b1e4d70696ce0e9366a028d262b47e8e48. --- system/src/Grav/Common/Language/Language.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php index ea644e8af..6c890b1bc 100644 --- a/system/src/Grav/Common/Language/Language.php +++ b/system/src/Grav/Common/Language/Language.php @@ -295,10 +295,7 @@ class Language if ($this->config->get('system.languages.translations', true)) { - - if (isset($this->grav['admin'])) { - $languages = ['en']; - } elseif ($this->enabled() && $lookup) { + if ($this->enabled() && $lookup) { if (empty($languages)) { if ($this->config->get('system.languages.translations_fallback', true)) { $languages = $this->getFallbackLanguages(); From 06b5a93fe98887a51000184016cc3400f08647cc Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Thu, 13 Aug 2015 18:30:17 +0200 Subject: [PATCH 2/2] Add language to user blueprint --- system/blueprints/user/account.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml index cc03b8062..da141fe4c 100644 --- a/system/blueprints/user/account.yaml +++ b/system/blueprints/user/account.yaml @@ -44,3 +44,10 @@ form: type: text size: large label: Title + + language: + type: text + size: large + label: Language + help: "Set the favorite language. E.g. 'it' or 'de'. Defaults to english" +