output preflight-checks nicely
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
@@ -2145,6 +2145,9 @@ Vielen Dank, Ihr Administrator',
|
|||||||
'manual_config' => 'Ich werden die Dienste manuell konfigurieren, direkt zum Login umleiten',
|
'manual_config' => 'Ich werden die Dienste manuell konfigurieren, direkt zum Login umleiten',
|
||||||
],
|
],
|
||||||
'errors' => [
|
'errors' => [
|
||||||
|
'wrong_ownership' => 'Die froxlor Dateien gehören nicht vollständig dem Benutzer %s:%s',
|
||||||
|
'missing_extensions' => 'Folgende PHP Erweiterungen werden zusätzlich benötigt',
|
||||||
|
'suggestedextensions' => 'Folgende PHP Erweiterungen werden empfohlen',
|
||||||
'databaseexists' => 'Datenbank existiert bereits, Uberschreiben-Option oder anderen Namen wählen.',
|
'databaseexists' => 'Datenbank existiert bereits, Uberschreiben-Option oder anderen Namen wählen.',
|
||||||
'unabletocreatedb' => 'Test-Datenbank konnte nicht erstellt werden',
|
'unabletocreatedb' => 'Test-Datenbank konnte nicht erstellt werden',
|
||||||
'unabletodropdb' => 'Test-Datenbank konnte nicht gelöscht werden',
|
'unabletodropdb' => 'Test-Datenbank konnte nicht gelöscht werden',
|
||||||
|
|||||||
@@ -2506,6 +2506,9 @@ Yours sincerely, your administrator',
|
|||||||
'manual_config' => 'I will manually configure the services, just take me to the login',
|
'manual_config' => 'I will manually configure the services, just take me to the login',
|
||||||
],
|
],
|
||||||
'errors' => [
|
'errors' => [
|
||||||
|
'wrong_ownership' => 'Make sure the froxlor files are owned by %s:%s',
|
||||||
|
'missing_extensions' => 'The following php extensions are required and not installed',
|
||||||
|
'suggestedextensions' => 'The following php extensions could not be found but are recommended',
|
||||||
'databaseexists' => 'Database already exist, please set override option to rebuild or chose another name',
|
'databaseexists' => 'Database already exist, please set override option to rebuild or chose another name',
|
||||||
'unabletocreatedb' => 'Test database could not be created',
|
'unabletocreatedb' => 'Test database could not be created',
|
||||||
'unabletodropdb' => 'Test database could not be dropped',
|
'unabletodropdb' => 'Test database could not be dropped',
|
||||||
|
|||||||
@@ -79,8 +79,19 @@
|
|||||||
{% if preflight.criticals %}
|
{% if preflight.criticals %}
|
||||||
<p class="text-muted">{{ lng('install.critical_error') }}</p>
|
<p class="text-muted">{{ lng('install.critical_error') }}</p>
|
||||||
<ul>
|
<ul>
|
||||||
{% for critical in preflight.criticals %}
|
{% for ctype, critical in preflight.criticals %}
|
||||||
<li>{{ critical|json_encode }}</li>
|
{% if ctype == 'wrong_ownership' %}
|
||||||
|
<li>{{ lng('install.errors.' ~ ctype, [critical.user, critical.group]) }}</li>
|
||||||
|
{% elseif ctype == 'missing_extensions' %}
|
||||||
|
<li>{{ lng('install.errors.' ~ ctype) }}<ul>
|
||||||
|
{% for missext in critical %}
|
||||||
|
<li>{{ missext }}</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
{% else %}
|
||||||
|
<li>{{ critical|raw }}</li>
|
||||||
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@@ -88,8 +99,17 @@
|
|||||||
{% if preflight.suggestions %}
|
{% if preflight.suggestions %}
|
||||||
<p class="text-muted">{{ lng('install.suggestions') }}</p>
|
<p class="text-muted">{{ lng('install.suggestions') }}</p>
|
||||||
<ul>
|
<ul>
|
||||||
{% for suggestion in preflight.suggestions %}
|
{% for ctype, suggestion in preflight.suggestions %}
|
||||||
<li>{{ suggestion|json_encode }}</li>
|
{% if ctype == 'missing_extensions' %}
|
||||||
|
<li>{{ lng('install.errors.suggestedextensions') }}<ul>
|
||||||
|
{% for missext in suggestion %}
|
||||||
|
<li>{{ missext }}</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
{% else %}
|
||||||
|
<li>{{ suggestion|raw }}</li>
|
||||||
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user