From 12bf7db481b949f2274369c7b153e785b1ddf3ae Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 18 Mar 2022 10:28:02 +0100 Subject: [PATCH] add language strings for configfiles Signed-off-by: Michael Kaufmann --- admin_configfiles.php | 6 ++--- lng/english.lng.php | 9 +++++--- lng/german.lng.php | 9 +++++--- .../Froxlor/settings/configuration.html.twig | 23 +++++++++++-------- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/admin_configfiles.php b/admin_configfiles.php index 0ca32668..a72fa7c2 100644 --- a/admin_configfiles.php +++ b/admin_configfiles.php @@ -86,7 +86,7 @@ if ($userinfo['change_serversettings'] == '1') { 'distribution' => $distribution, // alert 'type' => 'info', - 'alert_msg' => 'Parameter file generated successfully. Now run the following command as root:', + 'alert_msg' => $lng['admin']['configfiles']['finishnote'], 'basedir' => \Froxlor\Froxlor::getInstallDir(), 'params_filename' => $params_filename ]); @@ -108,7 +108,7 @@ if ($userinfo['change_serversettings'] == '1') { 'config' => [ 'title' => $lng['admin']['configfiles']['serverconfiguration'], 'image' => 'fa-solid fa-wrench', - 'description' => 'Configure the system services', + 'description' => $lng['admin']['configfiles']['description'], 'sections' => [ 'section_config' => [ 'fields' => [ @@ -140,7 +140,7 @@ if ($userinfo['change_serversettings'] == '1') { ]] : [], // alert 'type' => 'warning', - 'alert_msg' => $lng['panel']['settings_before_configuration'] + 'alert_msg' => $lng['panel']['settings_before_configuration'] . ((int)Settings::Get('panel.is_configured') == 1 ? '

' . $lng['panel']['system_is_configured'] : '') ]); } } diff --git a/lng/english.lng.php b/lng/english.lng.php index 8fc13ae3..b536a505 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -2060,11 +2060,9 @@ $lng['2fa']['2fa_ga_desc'] = 'Your account is set up to use time-based one-time $lng['admin']['logviewenabled'] = 'Enable access to access/error-logs'; $lng['panel']['viewlogs'] = 'View logfiles'; $lng['panel']['not_configured'] = 'System not configured yet. Click here to go to configurations.'; -$lng['panel']['done_configuring'] = 'When you are done configuring all required / desired services,
click the link below'; $lng['panel']['ihave_configured'] = 'I have configured the services'; -$lng['panel']['system_is_configured'] = 'System is already set as configured'; +$lng['panel']['system_is_configured'] = 'System is already set as configured'; $lng['panel']['settings_before_configuration'] = 'Please be sure you adjusted the settings prior to configuring the services here'; -$lng['panel']['alternative_cmdline_config'] = 'Alternatively, just run the following command as root-user in your shell to configure the services automatically'; $lng['tasks']['DELETE_DOMAIN_PDNS'] = 'Delete domain %domain% from PowerDNS database'; $lng['tasks']['DELETE_DOMAIN_SSL'] = 'Delete ssl files of domain %domain%'; $lng['admin']['novhostcontainer'] = '

None of the IPs and ports has the "' . $lng['admin']['ipsandports']['create_vhostcontainer'] . '" option enabled, many settings here will not be available'; @@ -2148,3 +2146,8 @@ $lng['ssl_certificates']['valid_from'] = 'Valid from'; $lng['ssl_certificates']['valid_until'] = 'Valid until'; $lng['ssl_certificates']['issuer'] = 'Issuer'; $lng['panel']['listing_empty'] = 'No entries found'; +$lng['admin']['configfiles']['finishnote'] = 'Parameter file generated successfully. Now run the following command as root:'; +$lng['admin']['configfiles']['description'] = 'Configure the system services'; +$lng['admin']['configfiles']['skipconfig'] = 'Don\'t (re)configure'; +$lng['admin']['configfiles']['recommendednote'] = 'Recommended/required services based on current system settings'; +$lng['admin']['configfiles']['selectrecommended'] = 'Select recommended'; diff --git a/lng/german.lng.php b/lng/german.lng.php index a3f06764..6d0a9d18 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1706,11 +1706,9 @@ $lng['2fa']['2fa_ga_desc'] = 'Das Konto ist eingerichtet, um zeitbasierte Einmal $lng['admin']['logviewenabled'] = 'Zugriff auf access/error-Logdateien'; $lng['panel']['viewlogs'] = 'Logdateien einsehen'; $lng['panel']['not_configured'] = 'Das System wurde noch nicht konfiguriert. Klicke auf den Button um die Installation zu starten.'; -$lng['panel']['done_configuring'] = 'Nach Abschluss der Konfiguration der Dienste,
untenstehenden Link klicken'; $lng['panel']['ihave_configured'] = 'Ich habe die Dienste konfiguriert'; -$lng['panel']['system_is_configured'] = 'Das System ist bereits konfiguriert'; +$lng['panel']['system_is_configured'] = 'Das System ist bereits konfiguriert'; $lng['panel']['settings_before_configuration'] = 'Stelle sicher, dass die Einstellungen angepasst wurden bevor die Dienste konfiguriert werden.'; -$lng['panel']['alternative_cmdline_config'] = 'Alternativ, führe den folgenden Befehl als root-Benutzer auf der Shell aus, um die Dienste automatisch zu konfigurieren.'; $lng['tasks']['DELETE_DOMAIN_PDNS'] = 'Lösche Domain %domain% von PowerDNS Datenbank'; $lng['tasks']['DELETE_DOMAIN_SSL'] = 'Lösche SSL Dateien von Domain %domain%'; $lng['admin']['novhostcontainer'] = '

Keine der IPs und Ports hat die Option "' . $lng['admin']['ipsandports']['create_vhostcontainer'] . '" aktiviert, einige Einstellungen sind daher nicht verfügbar.'; @@ -1790,3 +1788,8 @@ $lng['serversettings']['acmeshpath']['description'] = 'Installationspfad zu acme $lng['panel']['usage_statistics'] = 'Resourcen-Verbrauch'; $lng['panel']['security_question'] = 'Sicherheitsabfrage'; $lng['panel']['listing_empty'] = 'Keine Einträge gefunden'; +$lng['admin']['configfiles']['finishnote'] = 'Parameter Datei erfolgreich erstellt. Folgende Befehle müssen als root ausgeführt werden:'; +$lng['admin']['configfiles']['description'] = 'System-Dienste konfigurieren'; +$lng['admin']['configfiles']['skipconfig'] = 'Nicht (erneut) konfigurieren'; +$lng['admin']['configfiles']['recommendednote'] = 'Empfohlene/benötigte Dienste ahand der aktuellen Systemeinstellungen'; +$lng['admin']['configfiles']['selectrecommended'] = 'Empfohlene wählen'; diff --git a/templates/Froxlor/settings/configuration.html.twig b/templates/Froxlor/settings/configuration.html.twig index 5d4ed04f..bf776f09 100644 --- a/templates/Froxlor/settings/configuration.html.twig +++ b/templates/Froxlor/settings/configuration.html.twig @@ -5,7 +5,7 @@ {{ lng('admin.configfiles.serverconfiguration') }} - Configure the system services + {{ lng('admin.configfiles.description') }} {% endblock %} {% block actions %} @@ -29,7 +29,7 @@
{% endif %} @@ -46,14 +46,15 @@ (dtype == 'php-fpm' and get_setting('phpfpm.enabled') == '1') or (dtype == 'cron') %} - {% set recommended = true %} + {% set recommended = true %} {% endif %} @@ -70,14 +71,15 @@ (dtype == 'proftpd' and get_setting('system.ftpserver') == 'proftpd') or (dtype == 'pureftpd' and get_setting('system.ftpserver') == 'pureftpd') %} - {% set recommended = true %} + {% set recommended = true %} {% endif %} @@ -92,10 +94,11 @@
- * Empfohlene/benötigte Dienste ahand der aktuellen Systemeinstellungen + * + {{ lng('admin.configfiles.recommendednote') }}
- +