Merge pull request #4 from biologist79/master

Add support for i18next localisation library (biologist79#194)
fschrempf · Feb 7, 2023 · 33c09ce · 33c09ce
2 parents d97ac88 + 3826e16
commit 33c09ce
Show file tree

Hide file tree

Showing 24 changed files with 1,920 additions and 1,652 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ cmake-build-debug/
 platformio-override.ini
 src/settings-override.h
 src/settings-custom-override.h
+node_modules/
diff --git a/dist/accesspoint.html b/dist/accesspoint.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><title data-i18n="wifi.title"></title><meta charset="utf-8"><script src="/js/i18next.min.js"></script><script src="/js/i18nextHttpBackend.min.js"></script><script src="/js/loc_i18next.min.js"></script><style>input{width:90%;height:44px;border-radius:4px;margin:10px auto;font-size:15px;background:#f1f1f1;border:0;padding:0 15px}body{background:#007bff;font-family:sans-serif;font-size:14px;color:#777}.box{background:#fff;max-width:258px;margin:75px auto;padding:30px;border-radius:5px;text-align:center}.btn{background:#3498db;color:#fff;cursor:pointer;width:90%;height:44px;border-radius:4px;margin:10px auto;font-size:15px}.rebootmsg{display:none}.fas{padding-right:.25em}</style></head><body><form id="settings" action="/init" class="box" method="POST"><h1 data-i18n="wifi.title">WiFi-configuration</h1><label for="ssid" data-i18n="[prepend]wifi.ssid.title">SSID:</label><br><input type="text" id="ssid" name="ssid" placeholder="SSID" required><br><label for="pwd" data-i18n="[prepend]wifi.password.title">Password:</label><br><input type="password" id="pwd" name="pwd" autocomplete="off" required><br><label for="hostname" data-i18n="[prepend]wifi.hostname.title">ESPuino's name (hostname):</label><br><input type="text" id="hostname" name="hostname" placeholder="espuino" required><br><br><button type="submit" id="save-button" data-i18n="submit"></button></form><form action="/restart" class="box"><h1 data-i18n="wifi.restartPrompt">Ready to go?</h1><button type="submit" id="restart-button" data-i18n="restart" value="Reboot"></button></form><script>i18next.use(i18nextHttpBackend).init({backend:{loadPath:"/locales/{{lng}}.json"},debug:!0,fallbackLng:"en"},((e,n)=>{localize=locI18next.init(i18next),localize("body")}));</script></body></html>
diff --git a/dist/js/i18next.min.js.gz b/dist/js/i18next.min.js.gz
diff --git a/dist/js/i18nextHttpBackend.min.js.gz b/dist/js/i18nextHttpBackend.min.js.gz
diff --git a/dist/js/loc_i18next.min.js.gz b/dist/js/loc_i18next.min.js.gz
diff --git a/dist/locales/de.json.gz b/dist/locales/de.json.gz
diff --git a/dist/locales/en.json.gz b/dist/locales/en.json.gz
diff --git a/dist/management.html b/dist/management.html
diff --git a/gitVersion.py b/gitVersion.py
@@ -22,6 +22,7 @@
 #ifndef __GIT_REVISION_H__
     #define __GIT_REVISION_H__
     constexpr const char gitRevision[] PROGMEM = "Git-revision: {git_revision}";
+    constexpr const char gitRevShort[] PROGMEM = "\\"{git_revision}\\"";
 #endif
 """
 

diff --git a/html/accesspoint.html b/html/accesspoint.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title data-i18n="wifi.title"></title>
+		<meta charset="utf-8">
+        <script src="/js/i18next.min.js"></script>
+        <script src="/js/i18nextHttpBackend.min.js"></script>
+        <script src="/js/loc_i18next.min.js"></script>
+		<style>
+			input {
+				width: 90%;
+				height: 44px;
+				border-radius: 4px;
+				margin: 10px auto;
+				font-size: 15px;
+				background: #f1f1f1;
+				border: 0;
+				padding: 0 15px
+			}
+			body {
+				background: #007bff;
+				font-family: sans-serif;
+				font-size: 14px;
+				color: #777
+			}
+			.box {
+				background: #fff;
+				max-width: 258px;
+				margin: 75px auto;
+				padding: 30px;
+				border-radius: 5px;
+				text-align: center
+			}
+			.btn {
+				background: #3498db;
+				color: #fff;
+				cursor: pointer;
+				width: 90%;
+				height: 44px;
+				border-radius: 4px;
+				margin: 10px auto;
+				font-size: 15px;
+			}
+			.rebootmsg {
+				display: none;
+			}
+			.fas{
+				padding-right: 0.25em;
+			}
+		</style>
+	</head>
+	<body>
+		<form id="settings" action="/init" class="box" method="POST">
+			<h1 data-i18n="wifi.title">WiFi-configuration</h1>
+			<label for="ssid" data-i18n="[prepend]wifi.ssid.title">SSID:</label><br>
+			<input type="text" id="ssid" name="ssid" placeholder="SSID" required><br>
+			<label for="pwd" data-i18n="[prepend]wifi.password.title">Password:</label><br>
+			<input type="password" id="pwd" name="pwd" autocomplete="off" required><br>
+			<label for="hostname" data-i18n="[prepend]wifi.hostname.title">ESPuino's name (hostname):</label><br>
+			<input type="text" id="hostname" name="hostname" placeholder="espuino" required><br><br>
+			<button type="submit" id="save-button" data-i18n="submit"></button>
+		</form>
+		<form action="/restart" class="box">
+			<h1 data-i18n="wifi.restartPrompt">Ready to go?</h1>
+			<button type="submit" id="restart-button" data-i18n="restart" value="Reboot"></button>
+		</form>
+
+        <script>
+        i18next.use(i18nextHttpBackend).init({
+            backend: {
+                loadPath: "/locales/{{lng}}.json"
+            },
+            debug: true,
+            fallbackLng: 'en',
+        }, (err, t) => {
+            localize = locI18next.init(i18next);
+            localize('body');
+        });
+        </script>
+	</body>
+</html>
diff --git a/html/accesspoint_DE.html b/html/accesspoint_DE.html
diff --git a/html/accesspoint_EN.html b/html/accesspoint_EN.html
diff --git a/html/js/i18next.min.js b/html/js/i18next.min.js
diff --git a/html/js/i18nextHttpBackend.min.js b/html/js/i18nextHttpBackend.min.js
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!DOCTYPE html><html><head><title data-i18n="wifi.title"></title><meta charset="utf-8"><script src="/js/i18next.min.js"></script><script src="/js/i18nextHttpBackend.min.js"></script><script src="/js/loc_i18next.min.js"></script><style>input{width:90%;height:44px;border-radius:4px;margin:10px auto;font-size:15px;background:#f1f1f1;border:0;padding:0 15px}body{background:#007bff;font-family:sans-serif;font-size:14px;color:#777}.box{background:#fff;max-width:258px;margin:75px auto;padding:30px;border-radius:5px;text-align:center}.btn{background:#3498db;color:#fff;cursor:pointer;width:90%;height:44px;border-radius:4px;margin:10px auto;font-size:15px}.rebootmsg{display:none}.fas{padding-right:.25em}</style></head><body><form id="settings" action="/init" class="box" method="POST"><h1 data-i18n="wifi.title">WiFi-configuration</h1><label for="ssid" data-i18n="[prepend]wifi.ssid.title">SSID:</label><br><input type="text" id="ssid" name="ssid" placeholder="SSID" required><br><label for="pwd" data-i18n="[prepend]wifi.password.title">Password:</label><br><input type="password" id="pwd" name="pwd" autocomplete="off" required><br><label for="hostname" data-i18n="[prepend]wifi.hostname.title">ESPuino's name (hostname):</label><br><input type="text" id="hostname" name="hostname" placeholder="espuino" required><br><br><button type="submit" id="save-button" data-i18n="submit"></button></form><form action="/restart" class="box"><h1 data-i18n="wifi.restartPrompt">Ready to go?</h1><button type="submit" id="restart-button" data-i18n="restart" value="Reboot"></button></form><script>i18next.use(i18nextHttpBackend).init({backend:{loadPath:"/locales/{{lng}}.json"},debug:!0,fallbackLng:"en"},((e,n)=>{localize=locI18next.init(i18next),localize("body")}));</script></body></html>