From 82427e18cad97fe4bad67489d38161a8b3115f26 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 1 Mar 2026 07:56:01 +0000
Subject: [PATCH] Restructure language files - move .sys.ini and .ini to same
 folders

Co-authored-by: jmiller-moko <230051081+jmiller-moko@users.noreply.github.com>
---
 src/administrator/language/en-GB/index.html   | 95 -------------------
 src/administrator/language/en-US/index.html   | 95 -------------------
 src/administrator/language/index.html         | 95 -------------------
 .../language/en-GB/tpl_mokocassiopeia.sys.ini |  0
 .../language/en-US/tpl_mokocassiopeia.sys.ini |  0
 src/templateDetails.xml                       | 12 +--
 6 files changed, 4 insertions(+), 293 deletions(-)
 delete mode 100644 src/administrator/language/en-GB/index.html
 delete mode 100644 src/administrator/language/en-US/index.html
 delete mode 100644 src/administrator/language/index.html
 rename src/{administrator => }/language/en-GB/tpl_mokocassiopeia.sys.ini (100%)
 rename src/{administrator => }/language/en-US/tpl_mokocassiopeia.sys.ini (100%)
diff --git a/src/administrator/language/en-GB/index.html b/src/administrator/language/en-GB/index.html
deleted file mode 100644
index 480348d..0000000
--- a/src/administrator/language/en-GB/index.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- Copyright (C) 2025 Moko Consulting <jmiller@mokoconsulting.tech>
-
- This file is part of a Moko Consulting project.
-
- SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-
- # FILE INFORMATION
- DEFGROUP: Joomla.Site
- INGROUP: Templates.MokoCassiopeia
- FILE: index.html
- BRIEF: Security redirect page to block folder access and forward to site root.
--->
-
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Redirecting…</title>
-
-	<!-- Search engines: do not index this placeholder redirect page -->
-	<meta name="robots" content="noindex, nofollow, noarchive" />
-
-	<!-- Instant redirect fallback even if JavaScript is disabled -->
-	<meta http-equiv="refresh" content="0; url=/" />
-
-	<!-- Canonical root reference -->
-	<link rel="canonical" href="/" />
-
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-
-	<script>
-
-	(function redirectToRoot() {
-		// Configuration object with safe defaults.
-		var opts = {
-			fallbackPath: "/",   // string: fallback destination if origin is unavailable
-			delayMs: 0,           // number: delay before redirect in ms (0 = immediate)
-			behavior: "replace"   // enum: "replace" | "assign"
-		};
-
-		// Determine absolute origin in all mainstream browsers.
-		var origin = (typeof location.origin === "string" && location.origin)
-									|| (location.protocol + "//" + location.host);
-
-		// Final destination: absolute root of the current site, or fallback path.
-		var destination = origin ? origin + "/" : opts.fallbackPath;
-
-		function go() {
-			if (opts.behavior === "assign") {
-				location.assign(destination);
-			} else {
-				location.replace(destination);
-			}
-		}
-
-		// Execute redirect, optionally after a short delay.
-		if (opts.delayMs > 0) {
-			setTimeout(go, opts.delayMs);
-		} else {
-			go();
-		}
-	})();
-	</script>
-
-	<!--
-		Secondary meta-refresh for no-JS environments is already set above.
-		Some very old crawlers may ignore JS; the meta refresh ensures coverage.
-	-->
-
-	<noscript>
-		<!-- Extra defense-in-depth: if JS is disabled, meta refresh (above) handles redirect. -->
-		<style>
-			html, body { height:100%; }
-			body { display:flex; align-items:center; justify-content:center; margin:0; font: 16px/1.4 system-ui, -apple-system, Segoe UI, Roboto, Arial, sans-serif; }
-			.msg { opacity: .75; text-align: center; }
-		</style>
-	</noscript>
-</head>
-<body>
-	<div class="msg">Redirecting to the site root… If you are not redirected, <a href="/">click here</a>.</div>
-</body>
-</html>
diff --git a/src/administrator/language/en-US/index.html b/src/administrator/language/en-US/index.html
deleted file mode 100644
index 480348d..0000000
--- a/src/administrator/language/en-US/index.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- Copyright (C) 2025 Moko Consulting <jmiller@mokoconsulting.tech>
-
- This file is part of a Moko Consulting project.
-
- SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-
- # FILE INFORMATION
- DEFGROUP: Joomla.Site
- INGROUP: Templates.MokoCassiopeia
- FILE: index.html
- BRIEF: Security redirect page to block folder access and forward to site root.
--->
-
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Redirecting…</title>
-
-	<!-- Search engines: do not index this placeholder redirect page -->
-	<meta name="robots" content="noindex, nofollow, noarchive" />
-
-	<!-- Instant redirect fallback even if JavaScript is disabled -->
-	<meta http-equiv="refresh" content="0; url=/" />
-
-	<!-- Canonical root reference -->
-	<link rel="canonical" href="/" />
-
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-
-	<script>
-
-	(function redirectToRoot() {
-		// Configuration object with safe defaults.
-		var opts = {
-			fallbackPath: "/",   // string: fallback destination if origin is unavailable
-			delayMs: 0,           // number: delay before redirect in ms (0 = immediate)
-			behavior: "replace"   // enum: "replace" | "assign"
-		};
-
-		// Determine absolute origin in all mainstream browsers.
-		var origin = (typeof location.origin === "string" && location.origin)
-									|| (location.protocol + "//" + location.host);
-
-		// Final destination: absolute root of the current site, or fallback path.
-		var destination = origin ? origin + "/" : opts.fallbackPath;
-
-		function go() {
-			if (opts.behavior === "assign") {
-				location.assign(destination);
-			} else {
-				location.replace(destination);
-			}
-		}
-
-		// Execute redirect, optionally after a short delay.
-		if (opts.delayMs > 0) {
-			setTimeout(go, opts.delayMs);
-		} else {
-			go();
-		}
-	})();
-	</script>
-
-	<!--
-		Secondary meta-refresh for no-JS environments is already set above.
-		Some very old crawlers may ignore JS; the meta refresh ensures coverage.
-	-->
-
-	<noscript>
-		<!-- Extra defense-in-depth: if JS is disabled, meta refresh (above) handles redirect. -->
-		<style>
-			html, body { height:100%; }
-			body { display:flex; align-items:center; justify-content:center; margin:0; font: 16px/1.4 system-ui, -apple-system, Segoe UI, Roboto, Arial, sans-serif; }
-			.msg { opacity: .75; text-align: center; }
-		</style>
-	</noscript>
-</head>
-<body>
-	<div class="msg">Redirecting to the site root… If you are not redirected, <a href="/">click here</a>.</div>
-</body>
-</html>
diff --git a/src/administrator/language/index.html b/src/administrator/language/index.html
deleted file mode 100644
index 480348d..0000000
--- a/src/administrator/language/index.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- Copyright (C) 2025 Moko Consulting <jmiller@mokoconsulting.tech>
-
- This file is part of a Moko Consulting project.
-
- SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-
- # FILE INFORMATION
- DEFGROUP: Joomla.Site
- INGROUP: Templates.MokoCassiopeia
- FILE: index.html
- BRIEF: Security redirect page to block folder access and forward to site root.
--->
-
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Redirecting…</title>
-
-	<!-- Search engines: do not index this placeholder redirect page -->
-	<meta name="robots" content="noindex, nofollow, noarchive" />
-
-	<!-- Instant redirect fallback even if JavaScript is disabled -->
-	<meta http-equiv="refresh" content="0; url=/" />
-
-	<!-- Canonical root reference -->
-	<link rel="canonical" href="/" />
-
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-
-	<script>
-
-	(function redirectToRoot() {
-		// Configuration object with safe defaults.
-		var opts = {
-			fallbackPath: "/",   // string: fallback destination if origin is unavailable
-			delayMs: 0,           // number: delay before redirect in ms (0 = immediate)
-			behavior: "replace"   // enum: "replace" | "assign"
-		};
-
-		// Determine absolute origin in all mainstream browsers.
-		var origin = (typeof location.origin === "string" && location.origin)
-									|| (location.protocol + "//" + location.host);
-
-		// Final destination: absolute root of the current site, or fallback path.
-		var destination = origin ? origin + "/" : opts.fallbackPath;
-
-		function go() {
-			if (opts.behavior === "assign") {
-				location.assign(destination);
-			} else {
-				location.replace(destination);
-			}
-		}
-
-		// Execute redirect, optionally after a short delay.
-		if (opts.delayMs > 0) {
-			setTimeout(go, opts.delayMs);
-		} else {
-			go();
-		}
-	})();
-	</script>
-
-	<!--
-		Secondary meta-refresh for no-JS environments is already set above.
-		Some very old crawlers may ignore JS; the meta refresh ensures coverage.
-	-->
-
-	<noscript>
-		<!-- Extra defense-in-depth: if JS is disabled, meta refresh (above) handles redirect. -->
-		<style>
-			html, body { height:100%; }
-			body { display:flex; align-items:center; justify-content:center; margin:0; font: 16px/1.4 system-ui, -apple-system, Segoe UI, Roboto, Arial, sans-serif; }
-			.msg { opacity: .75; text-align: center; }
-		</style>
-	</noscript>
-</head>
-<body>
-	<div class="msg">Redirecting to the site root… If you are not redirected, <a href="/">click here</a>.</div>
-</body>
-</html>
diff --git a/src/administrator/language/en-GB/tpl_mokocassiopeia.sys.ini b/src/language/en-GB/tpl_mokocassiopeia.sys.ini
similarity index 100%
rename from src/administrator/language/en-GB/tpl_mokocassiopeia.sys.ini
rename to src/language/en-GB/tpl_mokocassiopeia.sys.ini
diff --git a/src/administrator/language/en-US/tpl_mokocassiopeia.sys.ini b/src/language/en-US/tpl_mokocassiopeia.sys.ini
similarity index 100%
rename from src/administrator/language/en-US/tpl_mokocassiopeia.sys.ini
rename to src/language/en-US/tpl_mokocassiopeia.sys.ini
diff --git a/src/templateDetails.xml b/src/templateDetails.xml
index 9fab4b4..9878c3c 100644
--- a/src/templateDetails.xml
+++ b/src/templateDetails.xml
@@ -52,7 +52,6 @@
 		<filename>templateDetails.xml</filename>
 		<folder>html</folder>
 		<folder>language</folder>
-		<folder>administrator</folder>
 	</files>
 	<stylesheets>
 		<stylesheet>media/templates/site/mokocassiopeia/css/editor.css</stylesheet>
@@ -89,13 +88,10 @@
 		<position>drawer-right</position>
 	</positions>
 	<languages folder="language">
-		<language tag="en-GB">language/en-GB/tpl_mokocassiopeia.ini</language>
-		<language tag="en-US">language/en-US/tpl_mokocassiopeia.ini</language>
-	</languages>
-
-	<languages folder="administrator">
-		<language tag="en-GB">administrator/language/en-GB/tpl_mokocassiopeia.sys.ini</language>
-		<language tag="en-US">administrator/language/en-US/tpl_mokocassiopeia.sys.ini</language>
+		<language tag="en-GB">en-GB/tpl_mokocassiopeia.ini</language>
+		<language tag="en-GB">en-GB/tpl_mokocassiopeia.sys.ini</language>
+		<language tag="en-US">en-US/tpl_mokocassiopeia.ini</language>
+		<language tag="en-US">en-US/tpl_mokocassiopeia.sys.ini</language>
 	</languages>
 
 	<config>
