From 33e1f2591ddbbbdeaabbc7a6af0a278a2a66589b Mon Sep 17 00:00:00 2001 From: megadesk3000 Date: Tue, 30 Mar 2021 11:19:44 +0200 Subject: [PATCH] Update GraphQLLanguageContext.php Change this->languageManager->getDefaultLanguage()->getId() to this->languageManager->getCurrentLanguage()->getId() --- src/GraphQLLanguageContext.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GraphQLLanguageContext.php b/src/GraphQLLanguageContext.php index 0b5e1900d..b7494d495 100644 --- a/src/GraphQLLanguageContext.php +++ b/src/GraphQLLanguageContext.php @@ -64,7 +64,7 @@ public function __construct(LanguageManagerInterface $languageManager, Translati */ public function getCurrentLanguage() { return $this->isActive - ? ($this->currentLanguage ?: $this->languageManager->getDefaultLanguage()->getId()) + ? ($this->currentLanguage ?: $this->languageManager->getCurrentLanguage()->getId()) : NULL; } @@ -112,7 +112,7 @@ public function executeInLanguageContext(callable $callable, $language) { // Restore the languages for the translation and language managers. $defaultLangcode = !empty($this->currentLanguage) ? $this->currentLanguage - : $this->languageManager->getDefaultLanguage()->getId(); + : $this->languageManager->getCurrentLanguage()->getId(); $this->translationManager->setDefaultLangcode($defaultLangcode); $this->languageManager->setConfigOverrideLanguage($currentConfigLanguage); }