From 8ba7070b02b4941520a2afc9d4ebde34c6e4d85e Mon Sep 17 00:00:00 2001
From: Michael van Schaik <mic@restruct.nl>
Date: Tue, 27 Sep 2022 06:12:48 +0200
Subject: [PATCH 1/3] Switch to listing views of subsite-filtered sections

Fixes #489
---
 client/javascript/LeftAndMain_Subsites.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/javascript/LeftAndMain_Subsites.js b/client/javascript/LeftAndMain_Subsites.js
index 8dd2b24..4164129 100644
--- a/client/javascript/LeftAndMain_Subsites.js
+++ b/client/javascript/LeftAndMain_Subsites.js
@@ -7,7 +7,13 @@
 		$('#SubsitesSelect').entwine({
 			onadd:function(){
 				this.on('change', function(){
-					window.location.search=$.query.set('SubsiteID', $(this).val());
+                    // Switch to listing views of subsite-filtered sections (eg: pages/ & assets/)
+                    let newLocHref = window.location.href
+                        .split('edit/show/').shift() // remove [pages/]edit/etc
+                        .split('settings/show/').shift() // remove [pages/]settings/etc
+                        .split('history/show/').shift() // remove [pages/]history/etc
+                        .split('show/').shift(); // remove [assets/]show/102/edit/etc (last as 'show' is broad)
+                    window.location.href = newLocHref + $.query.set('SubsiteID', $(this).val()).toString();
 				});
 			}
 		});

From e02076609543732432aac88aba6564222980fdd6 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Wed, 6 Sep 2023 17:26:00 +1200
Subject: [PATCH 2/3] Revert "Switch to listing views of subsite-filtered
 sections"

This reverts commit 8ba7070b02b4941520a2afc9d4ebde34c6e4d85e.
---
 client/javascript/LeftAndMain_Subsites.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/client/javascript/LeftAndMain_Subsites.js b/client/javascript/LeftAndMain_Subsites.js
index 4164129..8dd2b24 100644
--- a/client/javascript/LeftAndMain_Subsites.js
+++ b/client/javascript/LeftAndMain_Subsites.js
@@ -7,13 +7,7 @@
 		$('#SubsitesSelect').entwine({
 			onadd:function(){
 				this.on('change', function(){
-                    // Switch to listing views of subsite-filtered sections (eg: pages/ & assets/)
-                    let newLocHref = window.location.href
-                        .split('edit/show/').shift() // remove [pages/]edit/etc
-                        .split('settings/show/').shift() // remove [pages/]settings/etc
-                        .split('history/show/').shift() // remove [pages/]history/etc
-                        .split('show/').shift(); // remove [assets/]show/102/edit/etc (last as 'show' is broad)
-                    window.location.href = newLocHref + $.query.set('SubsiteID', $(this).val()).toString();
+					window.location.search=$.query.set('SubsiteID', $(this).val());
 				});
 			}
 		});

From dd3073f41aa0d3d724ade8c3630ebd14eaefdad3 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 6 Nov 2023 16:29:35 +1300
Subject: [PATCH 3/3] TLN Update translations

---
 lang/fr.yml | 1 +
 lang/nl.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lang/fr.yml b/lang/fr.yml
index a8ebd03..a0862cc 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -1,5 +1,6 @@
 fr:
   SilverStripe\Subsites\Model\Subsite:
+    ConfigurationTab: Configuration
     CustomExtraMeta: 'Balises Méta personnalisées'
     CustomMetaDescription: Description
     CustomMetaTitle: Titre
diff --git a/lang/nl.yml b/lang/nl.yml
index 03eda2c..c38fc63 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -21,6 +21,7 @@ nl:
     MANAGE_SUBSITES: 'Beheer subsites voor groepen'
     MANAGE_SUBSITES_HELP: 'Bepaal de toegangsrechten voor groepen per subsite'
     SECURITYTABTITLE: Subsites
+    db_AccessAllSubsites: 'Toegang tot alle subsites'
     many_many_Subsites: Subsites
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
     SITECONTENTLEFT: 'Site inhoud'