From 830fa40bb7d03ae1880db4dbb248dac4047530be Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Fri, 5 Feb 2021 15:19:47 +0200
Subject: [PATCH] Fixed `Flex Pages` using only default language in frontend

---
 CHANGELOG.md                          | 1 +
 system/src/Grav/Common/Page/Pages.php | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 073b9b3be..aa75e25ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 1. [](#bugfix)
     * Fixed CLI progressbar in `backup` and `security` commands to use styled output [#3198](https://github.com/getgrav/grav/issues/3198)
     * Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191)
+    * Fixed `Flex Pages` using only default language in frontend [#106](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/106)
 
 # v1.7.5
 ## 02/01/2021
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index 8b409d76d..dadaf7144 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -759,6 +759,12 @@ class Pages
 
         $instance = $this->index[$path] ?? null;
         if (is_string($instance)) {
+            /** @var Language $language */
+            $language = $this->grav['language'];
+            $lang = $language->getActive();
+            if ($lang) {
+                $instance .= ':' . $lang;
+            }
             $instance = $this->directory ? $this->directory->getObject($instance, 'flex_key') : null;
             if ($instance) {
                 if ($this->fire_events && method_exists($instance, 'initialize')) {