From b1d4ca6835d7c63ef0349848b7e8fdf5edb119c4 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 9 Jul 2024 09:22:55 +0200 Subject: [PATCH] make userlanguage selectable in installer --- install/assets/install.sql | 3 +- install/includes/database_class.php | 1 + install/index.php | 284 +++++++++++++++------------- 3 files changed, 157 insertions(+), 131 deletions(-) diff --git a/install/assets/install.sql b/install/assets/install.sql index c5e8b5871..1cbcdfac8 100755 --- a/install/assets/install.sql +++ b/install/assets/install.sql @@ -474,6 +474,7 @@ CREATE TABLE `users` ( `user_eqsl_password` varchar(64) DEFAULT NULL, `user_eqsl_qth_nickname` varchar(32) DEFAULT NULL, `active_station_logbook` int(11) DEFAULT NULL, + `language` varchar(32) default 'english', PRIMARY KEY (`user_id`), UNIQUE KEY `user_name` (`user_name`), UNIQUE KEY `user_email` (`user_email`) @@ -482,7 +483,7 @@ CREATE TABLE `users` ( -- ---------------------------- -- Records of users -- ---------------------------- -INSERT INTO `users` VALUES ('1', '%%FIRSTUSER_NAME%%', '%%FIRSTUSER_PASS%%', '%%FIRSTUSER_MAIL%%', '99', '%%FIRSTUSER_CALL%%', '%%FIRSTUSER_LOCATOR%%', '%%FIRSTUSER_FIRSTNAME%%', '%%FIRSTUSER_LASTNAME%%', '%%FIRSTUSER_TIMEZONE%%', null, null, null, null, null, 1); +INSERT INTO `users` VALUES ('1', '%%FIRSTUSER_NAME%%', '%%FIRSTUSER_PASS%%', '%%FIRSTUSER_MAIL%%', '99', '%%FIRSTUSER_CALL%%', '%%FIRSTUSER_LOCATOR%%', '%%FIRSTUSER_FIRSTNAME%%', '%%FIRSTUSER_LASTNAME%%', '%%FIRSTUSER_TIMEZONE%%', null, null, null, null, null, 1, '%%FIRSTUSER_USERLANGUAGE%%'); -- ---------------------------- -- Records of station_logbooks diff --git a/install/includes/database_class.php b/install/includes/database_class.php index 6266108b1..35aa27ad2 100644 --- a/install/includes/database_class.php +++ b/install/includes/database_class.php @@ -46,6 +46,7 @@ class Database $newquery = str_replace("%%FIRSTUSER_TIMEZONE%%", $data['timezone'], $newquery); $newquery = str_replace("%%FIRSTUSER_DXCC%%", $data['dxcc'], $newquery); $newquery = str_replace("%%FIRSTUSER_CITY%%", $data['city'], $newquery); + $newquery = str_replace("%%FIRSTUSER_USERLANGUAGE%%", $data['userlanguage'], $newquery); mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT); diff --git a/install/index.php b/install/index.php index efc2dc891..f6e59cf12 100644 --- a/install/index.php +++ b/install/index.php @@ -565,46 +565,28 @@ global $wavelog_url;
-
-
- - -
-
- - -
-
+ +
-
-
- - -
-
+ +
-
- - + +
-
-
-
- - -
-
+ +
@@ -613,17 +595,124 @@ global $wavelog_url;
- - + +
- - + +
- + + +
+
+ + +
+
+
+
+
- - + + +
-
@@ -1553,4 +1550,31 @@ global $wavelog_url; + + + \ No newline at end of file