From a991f3dfcf32af476d10a69f7e13f72fefebc525 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 19 Dec 2020 22:47:07 -0500 Subject: [PATCH] Add translation to required labels for install checks - Remove unused checks loop in install_base template --- src/Module/Install.php | 33 ++++++++++++++++++----------- view/templates/install_base.tpl | 9 -------- view/templates/install_checks.tpl | 10 ++++----- view/templates/install_db.tpl | 7 ++++-- view/templates/install_finished.tpl | 2 +- 5 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/Module/Install.php b/src/Module/Install.php index 1448d5544..3ad38041e 100644 --- a/src/Module/Install.php +++ b/src/Module/Install.php @@ -186,6 +186,10 @@ class Install extends BaseModule $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, '$pass' => DI::l10n()->t('System check'), + '$required' => DI::l10n()->t('Required'), + '$requirement_not_satisfied' => DI::l10n()->t('Requirement not satisfied'), + '$optional_requirement_not_satisfied' => DI::l10n()->t('Optional requirement not satisfied'), + '$ok' => DI::l10n()->t('OK'), '$checks' => self::$installer->getChecks(), '$passed' => $status, '$see_install' => DI::l10n()->t('Please see the file "doc/INSTALL.md".'), @@ -215,12 +219,12 @@ class Install extends BaseModule DI::l10n()->t('Host name'), $configCache->get('config', 'hostname'), DI::l10n()->t('Overwrite this field in case the determinated hostname isn\'t right, otherweise leave it as is.'), - 'required'], + DI::l10n()->t('Required')], '$basepath' => ['system-basepath', DI::l10n()->t("Base path to installation"), $configCache->get('system', 'basepath'), DI::l10n()->t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."), - 'required'], + DI::l10n()->t('Required')], '$urlpath' => ['system-urlpath', DI::l10n()->t('Sub path of the URL'), $configCache->get('system', 'urlpath'), @@ -239,7 +243,9 @@ class Install extends BaseModule '$info_01' => DI::l10n()->t('In order to install Friendica we need to know how to connect to your database.'), '$info_02' => DI::l10n()->t('Please contact your hosting provider or site administrator if you have questions about these settings.'), '$info_03' => DI::l10n()->t('The database you specify below should already exist. If it does not, please create it before continuing.'), - 'checks' => self::$installer->getChecks(), + '$required' => DI::l10n()->t('Required'), + '$requirement_not_satisfied' => DI::l10n()->t('Requirement not satisfied'), + '$checks' => self::$installer->getChecks(), '$hostname' => $configCache->get('config', 'hostname'), '$ssl_policy' => $configCache->get('system', 'ssl_policy'), '$basepath' => $configCache->get('system', 'basepath'), @@ -248,23 +254,23 @@ class Install extends BaseModule DI::l10n()->t('Database Server Name'), $configCache->get('database', 'hostname'), '', - 'required'], + DI::l10n()->t('Required')], '$dbuser' => ['database-username', DI::l10n()->t('Database Login Name'), $configCache->get('database', 'username'), '', - 'required', + DI::l10n()->t('Required'), 'autofocus'], '$dbpass' => ['database-password', DI::l10n()->t('Database Login Password'), $configCache->get('database', 'password'), DI::l10n()->t("For security reasons the password must not be empty"), - 'required'], + DI::l10n()->t('Required')], '$dbdata' => ['database-database', DI::l10n()->t('Database Name'), $configCache->get('database', 'database'), '', - 'required'], + DI::l10n()->t('Required')], '$lbl_10' => DI::l10n()->t('Please select a default timezone for your website'), '$php_path' => $configCache->get('config', 'php_path'), '$submit' => DI::l10n()->t('Submit') @@ -278,6 +284,7 @@ class Install extends BaseModule $tpl = Renderer::getMarkupTemplate('install_settings.tpl'); $output .= Renderer::replaceMacros($tpl, [ '$title' => $install_title, + '$required' => DI::l10n()->t('Required'), '$checks' => self::$installer->getChecks(), '$pass' => DI::l10n()->t('Site settings'), '$hostname' => $configCache->get('config', 'hostname'), @@ -292,7 +299,7 @@ class Install extends BaseModule DI::l10n()->t('Site administrator email address'), $configCache->get('config', 'admin_email'), DI::l10n()->t('Your account email address must match this in order to use the web admin panel.'), - 'required', 'autofocus', 'email'], + DI::l10n()->t('Required'), 'autofocus', 'email'], '$timezone' => Temporal::getTimezoneField('system-default_timezone', DI::l10n()->t('Please select a default timezone for your website'), $configCache->get('system', 'default_timezone'), @@ -318,10 +325,12 @@ class Install extends BaseModule $tpl = Renderer::getMarkupTemplate('install_finished.tpl'); $output .= Renderer::replaceMacros($tpl, [ - '$title' => $install_title, - '$checks' => self::$installer->getChecks(), - '$pass' => DI::l10n()->t('Installation finished'), - '$text' => $db_return_text . self::whatNext(), + '$title' => $install_title, + '$required' => DI::l10n()->t('Required'), + '$requirement_not_satisfied' => DI::l10n()->t('Requirement not satisfied'), + '$checks' => self::$installer->getChecks(), + '$pass' => DI::l10n()->t('Installation finished'), + '$text' => $db_return_text . self::whatNext(), ]); break; diff --git a/view/templates/install_base.tpl b/view/templates/install_base.tpl index 712488fb7..4907c2585 100644 --- a/view/templates/install_base.tpl +++ b/view/templates/install_base.tpl @@ -7,15 +7,6 @@ {{$info_03}}

- - {{foreach $checks as $check}} -
{{$check.title}} - {{if ! $check.status}} - Requirement not satisfied - {{/if}} - {{/foreach}} -
-
diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl index 49ca67059..4574faf06 100644 --- a/view/templates/install_checks.tpl +++ b/view/templates/install_checks.tpl @@ -6,20 +6,20 @@ {{foreach $checks as $check}} {{$check.title nofilter}} {{if $check.status}} - Ok + {{$ok}} {{else}} {{if $check.required}} - Requirement not satisfied + {{$requirement_not_satisfied}} {{else}} - Optional requirement not satisfied + {{$optional_requirement_not_satisfied}} {{/if}} {{/if}} - {{if $check.required}}(required){{/if}} + {{if $check.required}}{{$required}}{{/if}} {{if $check.help}}
{{$check.help nofilter}}
{{if $check.error_msg}} -
{{$check.error_msg.head}}
{{$check.error_msg.url}}
+
{{$check.error_msg.head}}
{{$check.error_msg.url}}
{{$check.error_msg.msg}}
{{/if}} diff --git a/view/templates/install_db.tpl b/view/templates/install_db.tpl index 1a5778cc8..f589223c7 100644 --- a/view/templates/install_db.tpl +++ b/view/templates/install_db.tpl @@ -9,10 +9,13 @@ {{foreach $checks as $check}} - + + {{/foreach}}
{{$check.title}} +
{{$check.title}} {{if ! $check.status}} - Requirement not satisfied + {{$requirement_not_satisfied}} {{/if}} +
diff --git a/view/templates/install_finished.tpl b/view/templates/install_finished.tpl index 8e643b7a1..1d5d391c4 100644 --- a/view/templates/install_finished.tpl +++ b/view/templates/install_finished.tpl @@ -2,7 +2,7 @@

{{$pass}}

{{foreach $checks as $check}} -Requirement not satisfied +{{$requirement_not_satisfied}} {{$check.title nofilter}} {{/foreach}}