From b50dbf3ff078ef320bb31477da2189e43671dcc5 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Mon, 9 Nov 2020 20:44:37 +0200
Subject: [PATCH] Fixed sorting by groups in `Flex Users`

---
 CHANGELOG.md                                               | 1 +
 .../Framework/Flex/Pages/Traits/PageTranslateTrait.php     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21fd92789..cda367a8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
     * Fixed bug in collections where filter `type: false` did not work
     * Fixed `print_r()` in twig
     * Fixed sorting by groups in `Flex Users`
+    * Changing `Flex Page` template causes the other language versions of that page to lose their content [admin#1958](https://github.com/getgrav/grav-plugin-admin/issues/1958)
 
 # v1.7.0-rc.17
 ## 10/07/2020
diff --git a/system/src/Grav/Framework/Flex/Pages/Traits/PageTranslateTrait.php b/system/src/Grav/Framework/Flex/Pages/Traits/PageTranslateTrait.php
index 9b219baf6..dcb0db98e 100644
--- a/system/src/Grav/Framework/Flex/Pages/Traits/PageTranslateTrait.php
+++ b/system/src/Grav/Framework/Flex/Pages/Traits/PageTranslateTrait.php
@@ -55,8 +55,11 @@ trait PageTranslateTrait
         } elseif ('' === $code) {
             $object = $this->getLanguage() ? $this->getFlexDirectory()->getObject($this->getMasterKey(), 'storage_key') : $this;
         } else {
-            $key = $this->getStorageKey() . '|.' . $code;
-            $meta = ['storage_key' => $key, 'lang' => $code] + $this->getMetaData();
+            $meta = $this->getMetaData();
+            $meta['template'] = $this->getLanguageTemplates()[$code] ?? $meta['template'];
+            $key = $this->getStorageKey() . '|' . $meta['template'] . '.' . $code;
+            $meta['storage_key'] = $key;
+            $meta['lang'] = $code;
             $object = $this->getFlexDirectory()->loadObjects([$key => $meta])[$key] ?? null;
         }