From b473a3179af5fbd65450f585639dc577a5e47f16 Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Thu, 1 Jun 2023 16:46:19 +0100
Subject: [PATCH 1/2] Fix: Retain location before language change

---
 js/languagePickerModel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/languagePickerModel.js b/js/languagePickerModel.js
index 08c51ac..94a269e 100644
--- a/js/languagePickerModel.js
+++ b/js/languagePickerModel.js
@@ -38,6 +38,7 @@ export default class LanguagePickerModel extends Backbone.Model {
   }
 
   setLanguage(language, { canReset = true } = {}) {
+    this.locationId = offlineStorage.get('location') || null;
     Adapt.config.set({
       _activeLanguage: language,
       _defaultDirection: this.getLanguageDetails(language)._direction

From fc4ca287466b96e05d2d264c2cfe02e32f627e4e Mon Sep 17 00:00:00 2001
From: Oliver Foster <oliver.foster@kineo.com>
Date: Thu, 1 Jun 2023 16:47:47 +0100
Subject: [PATCH 2/2] Clear location on reset

---
 js/languagePickerModel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/languagePickerModel.js b/js/languagePickerModel.js
index 94a269e..a6a08df 100644
--- a/js/languagePickerModel.js
+++ b/js/languagePickerModel.js
@@ -52,6 +52,7 @@ export default class LanguagePickerModel extends Backbone.Model {
     if (!shouldReset || !hasOfflineStorageClear) return;
     // New reset functionality
     offlineStorage.clear();
+    this.locationId = null;
   }
 
   markLanguageAsSelected(model, language) {