diff --git a/assets/lang_src/messages.pot b/assets/lang_src/messages.pot index 791cb97b8..b0fec2cc0 100644 --- a/assets/lang_src/messages.pot +++ b/assets/lang_src/messages.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-30 08:08+0000\n" +"POT-Creation-Date: 2024-07-30 10:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/install/includes/gettext/lang_src/installer.pot b/install/includes/gettext/lang_src/installer.pot index ce3410d0f..eb403c0d1 100644 --- a/install/includes/gettext/lang_src/installer.pot +++ b/install/includes/gettext/lang_src/installer.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-30 08:08+0000\n" +"POT-Creation-Date: 2024-07-30 10:38+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -616,8 +616,7 @@ msgid "PHP Module missing" msgstr "" #: install/index.php:1900 -#, php-format -msgid "The PHP module %s is missing." +msgid "The following PHP modules are missing:" msgstr "" #: install/index.php:1901 @@ -625,8 +624,7 @@ msgid "Without this module the Wavelog Installer does not work!" msgstr "" #: install/index.php:1902 -#, php-format -msgid "Install %s and restart the webserver." +msgid "Please install the required modules and restart the webserver." msgstr "" #: install/run.php:10 diff --git a/install/includes/gettext/locale/bg_BG/LC_MESSAGES/installer.po b/install/includes/gettext/locale/bg_BG/LC_MESSAGES/installer.po index 5b025bd2d..f728e3b16 100644 --- a/install/includes/gettext/locale/bg_BG/LC_MESSAGES/installer.po +++ b/install/includes/gettext/locale/bg_BG/LC_MESSAGES/installer.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-29 12:05+0000\n" +"POT-Creation-Date: 2024-07-30 10:38+0000\n" "PO-Revision-Date: 2024-06-05 15:15+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -617,8 +617,7 @@ msgid "PHP Module missing" msgstr "" #: install/index.php:1900 -#, php-format -msgid "The PHP module %s is missing." +msgid "The following PHP modules are missing:" msgstr "" #: install/index.php:1901 @@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!" msgstr "" #: install/index.php:1902 -#, php-format -msgid "Install %s and restart the webserver." +msgid "Please install the required modules and restart the webserver." msgstr "" #: install/run.php:10 diff --git a/install/includes/gettext/locale/cs_CZ/LC_MESSAGES/installer.po b/install/includes/gettext/locale/cs_CZ/LC_MESSAGES/installer.po index 087822ee0..bd8cbf422 100644 --- a/install/includes/gettext/locale/cs_CZ/LC_MESSAGES/installer.po +++ b/install/includes/gettext/locale/cs_CZ/LC_MESSAGES/installer.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-29 12:05+0000\n" +"POT-Creation-Date: 2024-07-30 10:38+0000\n" "PO-Revision-Date: 2024-06-05 15:15+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -617,8 +617,7 @@ msgid "PHP Module missing" msgstr "" #: install/index.php:1900 -#, php-format -msgid "The PHP module %s is missing." +msgid "The following PHP modules are missing:" msgstr "" #: install/index.php:1901 @@ -626,8 +625,7 @@ msgid "Without this module the Wavelog Installer does not work!" msgstr "" #: install/index.php:1902 -#, php-format -msgid "Install %s and restart the webserver." +msgid "Please install the required modules and restart the webserver." msgstr "" #: install/run.php:10 diff --git a/install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.mo b/install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.mo index ec3a1b3ba..f0a0c7493 100644 Binary files a/install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.mo and b/install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.mo differ diff --git a/install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.po b/install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.po index fd56cd45b..373d6f53e 100644 --- a/install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.po +++ b/install/includes/gettext/locale/de_DE/LC_MESSAGES/installer.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-29 12:05+0000\n" +"POT-Creation-Date: 2024-07-30 10:38+0000\n" "PO-Revision-Date: 2024-07-29 12:08+0000\n" "Last-Translator: Fabian Berg \n" "Language-Team: German \n" #~ "\t\t\t\t\t\t\t\t\t\t\t\t- can't be empty
\n" diff --git a/install/includes/gettext/locale/el_GR/LC_MESSAGES/installer.po b/install/includes/gettext/locale/el_GR/LC_MESSAGES/installer.po index 4c4631f26..7ea2f40a7 100644 --- a/install/includes/gettext/locale/el_GR/LC_MESSAGES/installer.po +++ b/install/includes/gettext/locale/el_GR/LC_MESSAGES/installer.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-29 14:39+0000\n" +"POT-Creation-Date: 2024-07-30 10:38+0000\n" "PO-Revision-Date: 2024-07-29 12:05+0000\n" "Last-Translator: Fabian Berg \n" "Language-Team: Greek \n" "Language-Team: French \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Russian \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified) here." -msgstr "如遇到“文件夹可写权限”错误,请查看 Wiki。" +msgstr "" +"如遇到“文件夹可写权限”错误,请查看 Wiki。" #: install/index.php:323 msgid "You have some warnings!" @@ -438,8 +440,9 @@ msgstr "测试连接" msgid "" "Now you can create your first user in Wavelog. Fill out all fields and click " "continue. Make sure you use a safe password." -msgstr "您现在可以为 Wavelog " -"创建第一个用户了,填写所有信息点击下一步,确保创建一个高强度的密码。" +msgstr "" +"您现在可以为 Wavelog 创建第一个用户了,填写所有信息点击下一步,确保创建一个高" +"强度的密码。" #: install/index.php:473 msgid "All fields are required!" @@ -640,18 +643,16 @@ msgid "PHP Module missing" msgstr "PHP 模块未安装" #: install/index.php:1900 -#, php-format -msgid "The PHP module %s is missing." -msgstr "PHP 模块 %s 未安装。" +msgid "The following PHP modules are missing:" +msgstr "" #: install/index.php:1901 msgid "Without this module the Wavelog Installer does not work!" msgstr "Wavelog 需要这个模块来运行!" #: install/index.php:1902 -#, php-format -msgid "Install %s and restart the webserver." -msgstr "安装 %s 并重启服务器。" +msgid "Please install the required modules and restart the webserver." +msgstr "" #: install/run.php:10 msgid "Installation" @@ -726,6 +727,14 @@ msgstr "无法更新 DXCC 数据" msgid "Could not create install/.lock file" msgstr "无法创建 install/.lock 文件" +#, php-format +#~ msgid "The PHP module %s is missing." +#~ msgstr "PHP 模块 %s 未安装。" + +#, php-format +#~ msgid "Install %s and restart the webserver." +#~ msgstr "安装 %s 并重启服务器。" + #~ msgid "On" #~ msgstr "开启" diff --git a/install/includes/install_config/install_config.php b/install/includes/install_config/install_config.php index 2a5b772ea..1fb5da278 100644 --- a/install/includes/install_config/install_config.php +++ b/install/includes/install_config/install_config.php @@ -39,3 +39,7 @@ $required_php_modules = [ // MariaDB / MySQL $mariadb_version = 10.1; $mysql_version = 5.7; + +// PHP modules that are directly required for the installer +global $installer_required_modules; +$installer_required_modules = array("mbstring", "curl"); diff --git a/install/includes/install_config/install_lib.php b/install/includes/install_config/install_lib.php index f2555fc29..9eaa0ef69 100644 --- a/install/includes/install_config/install_lib.php +++ b/install/includes/install_config/install_lib.php @@ -133,3 +133,14 @@ function detect_nginx_php_setting($http_scheme) { curl_close($ch); return $code; } + +function installer_required_modules() { + global $installer_required_modules; + $not_found_modules = array(); + foreach ($installer_required_modules as $module) { + if (!extension_loaded($module)) { + array_push($not_found_modules, 'php-'.$module); + } + } + return $not_found_modules; +} diff --git a/install/index.php b/install/index.php index 0404b0924..785e87ba0 100644 --- a/install/index.php +++ b/install/index.php @@ -16,7 +16,7 @@ if (!file_exists('.lock')) { // php-mbstring has to be installed for the installer to work properly!! // The other prechecks can be run within the installer. - if ($required_php_modules['php-mbstring']['condition']) { ?> + if ($required_php_modules['php-mbstring']['condition'] && $required_php_modules['php-curl']['condition']) { ?> @@ -1897,9 +1897,9 @@ if (!file_exists('.lock')) {

danger_triangle -

php-mbstring"); ?>

+

".implode(',', installer_required_modules()).""; ?>

-

php-mbstring"); ?>

+