From 4b7ae46fd78afb236455ed5c6aa0367295a07782 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Mon, 21 Nov 2022 12:52:33 +0100 Subject: [PATCH] fix missing language-strings Signed-off-by: Michael Kaufmann --- lib/formfields/admin/domains/formfield.domains_add.php | 4 ++-- lib/formfields/admin/domains/formfield.domains_edit.php | 4 ++-- lib/formfields/formfield.domain_ssleditor.php | 6 ++++-- lng/de.lng.php | 2 ++ lng/en.lng.php | 4 ++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php index ed6248da..e58739f1 100644 --- a/lib/formfields/admin/domains/formfield.domains_add.php +++ b/lib/formfields/admin/domains/formfield.domains_add.php @@ -394,13 +394,13 @@ return [ 'visible' => Settings::Get('system.bind_enable') == '1' && $userinfo['change_serversettings'] == '1', 'fields' => [ 'isbinddomain' => [ - 'label' => 'Nameserver', + 'label' => lng('admin.createzonefile'), 'type' => 'checkbox', 'value' => '1', 'checked' => true ], 'zonefile' => [ - 'label' => 'Zonefile', + 'label' => lng('admin.custombindzone'), 'desc' => lng('admin.bindzonewarning'), 'type' => 'text' ] diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php index 98197c1f..fe5aaf7a 100644 --- a/lib/formfields/admin/domains/formfield.domains_edit.php +++ b/lib/formfields/admin/domains/formfield.domains_edit.php @@ -430,13 +430,13 @@ return [ 'visible' => Settings::Get('system.bind_enable') == '1' && $userinfo['change_serversettings'] == '1', 'fields' => [ 'isbinddomain' => [ - 'label' => 'Nameserver', + 'label' => lng('admin.createzonefile'), 'type' => 'checkbox', 'value' => '1', 'checked' => $result['isbinddomain'] ], 'zonefile' => [ - 'label' => 'Zonefile', + 'label' => lng('admin.custombindzone'), 'desc' => lng('admin.bindzonewarning'), 'type' => 'text', 'value' => $result['zonefile'] diff --git a/lib/formfields/formfield.domain_ssleditor.php b/lib/formfields/formfield.domain_ssleditor.php index bd998aa1..ee71cdad 100644 --- a/lib/formfields/formfield.domain_ssleditor.php +++ b/lib/formfields/formfield.domain_ssleditor.php @@ -43,7 +43,8 @@ return [ 'type' => 'textarea', 'cols' => 100, 'rows' => 15, - 'value' => $result['ssl_cert_file'] + 'value' => $result['ssl_cert_file'], + 'placeholder' => lng('domain.ssl_certificate_placeholder') ], 'ssl_key_file' => [ 'label' => lng('admin.ipsandports.ssl_key_file_content'), @@ -51,7 +52,8 @@ return [ 'type' => 'textarea', 'cols' => 100, 'rows' => 15, - 'value' => $result['ssl_key_file'] + 'value' => $result['ssl_key_file'], + 'placeholder' => lng('domain.ssl_key_placeholder') ], 'ssl_cert_chainfile' => [ 'label' => lng('admin.ipsandports.ssl_cert_chainfile_content'), diff --git a/lng/de.lng.php b/lng/de.lng.php index d6997c64..8ec3dfc0 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -173,6 +173,8 @@ return [ 'SERVER_PORT' => 'Wird mit dem Standard-Port ersetzt', 'DOMAINNAME' => 'Wird mit der Standardsubdomain des Kunden ersetzt (kann leer sein, wenn keine erstellt werden soll)', ], + 'createzonefile' => 'DNS Zone für Domain erstellen', + 'custombindzone' => 'Eigene / manuelle Zone', 'bindzonewarning' => 'Leer für Standardeinstellung.
WARNUNG: Bei der Verwendung einer Zonendatei müssen alle benötigten Records aller Subdomains ebenfalls manuell verwaltet werden.', 'ipsandports' => [ 'ipsandports' => 'IPs und Ports', diff --git a/lng/en.lng.php b/lng/en.lng.php index aeb066a4..878b536a 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -176,6 +176,8 @@ return [ 'DOMAINNAME' => 'Replaces the customers standard-subdomain (can be empty if none is generated)', ], 'webserver' => 'Webserver', + 'createzonefile' => 'Create dns zone for domain', + 'custombindzone' => 'Custom / unmanaged zone file', 'bindzonewarning' => 'empty for defaults
ATTENTION: If you use a zonefile you will have to manage all required records for all sub-zones manually as well.', 'ipsandports' => [ 'ipsandports' => 'IPs and Ports', @@ -705,6 +707,8 @@ return [ 'docroot' => 'Path from field above', 'homedir' => 'Home directory', 'docparent' => 'Parent-directory of path from field above', + 'ssl_certificate_placeholder' => '---- BEGIN CERTIFICATE---' . PHP_EOL . '[...]' . PHP_EOL . '----END CERTIFICATE----', + 'ssl_key_placeholder' => '---- BEGIN RSA PRIVATE KEY-----' . PHP_EOL . '[...]' . PHP_EOL . '-----END RSA PRIVATE KEY-----', ], 'domains' => [ 'description' => 'Here you can create (sub-)domains and change their paths.
The system will need some time to apply the new settings after every change.',