diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php index 947c0cd0..d8dc5418 100644 --- a/lib/formfields/admin/domains/formfield.domains_add.php +++ b/lib/formfields/admin/domains/formfield.domains_add.php @@ -87,7 +87,8 @@ return array( 'type' => 'text' ), 'ipandport' => array( - 'label' => 'IP/Port', + 'label' => $lng['domains']['ipandport_multi']['title'], + 'desc' => $lng['domains']['ipandport_multi']['description'], 'type' => 'checkbox', 'values' => $ipsandports, 'value' => array($settings['system']['defaultip']), @@ -95,7 +96,8 @@ return array( 'mandatory' => true ), 'ssl_ipandport' => array( - 'label' => 'IP/Port (SSL)', + 'label' => $lng['domains']['ipandport_ssl_multi']['title'], + 'desc' => $lng['domains']['ipandport_ssl_multi']['description'], 'type' => 'checkbox', 'values' => $ssl_ipsandports, 'value' => '', @@ -103,7 +105,8 @@ return array( ), 'ssl_redirect' => array( 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), - 'label' => 'SSL Redirect', + 'label' => $lng['domains']['ssl_redirect']['title'], + 'desc' => $lng['domains']['ssl_redirect']['description'], 'type' => 'checkbox', 'values' => array( array ('label' => $lng['panel']['yes'], 'value' => '1') diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php index 1abf273f..938d8654 100644 --- a/lib/formfields/admin/domains/formfield.domains_edit.php +++ b/lib/formfields/admin/domains/formfield.domains_edit.php @@ -98,7 +98,8 @@ return array( 'value' => $result['documentroot'] ), 'ipandport' => array( - 'label' => 'IP/Port', + 'label' => $lng['domains']['ipandport_multi']['title'], + 'desc' => $lng['domains']['ipandport_multi']['description'], 'type' => 'checkbox', 'values' => $ipsandports, 'value' => $usedips, @@ -106,7 +107,8 @@ return array( 'mandatory' => true ), 'ssl_ipandport' => array( - 'label' => 'IP/Port (SSL)', + 'label' => $lng['domains']['ipandport_ssl_multi']['title'], + 'desc' => $lng['domains']['ipandport_ssl_multi']['description'], 'type' => 'checkbox', 'values' => $ssl_ipsandports, 'value' => $usedips, @@ -114,7 +116,8 @@ return array( ), 'ssl_redirect' => array( 'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false), - 'label' => 'SSL Redirect', + 'label' => $lng['domains']['ssl_redirect']['title'], + 'desc' => $lng['domains']['ssl_redirect']['description'], 'type' => 'checkbox', 'values' => array( array ('label' => $lng['panel']['yes'], 'value' => '1') diff --git a/lib/init.php b/lib/init.php index 367a68a9..cca75f17 100644 --- a/lib/init.php +++ b/lib/init.php @@ -352,8 +352,8 @@ if($language != 'English') } } -// last but not least include language error_references file -include_once makeSecurePath('lng/error_references.php'); +// last but not least include language references file +include_once makeSecurePath('lng/lng_references.php'); // Initialize our new link - class diff --git a/lng/english.lng.php b/lng/english.lng.php index 7fbcbfd7..eb338f93 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1963,3 +1963,8 @@ $lng['admin']['phpfpm.ininote'] = 'Not all values you may want to define can be // Added in Froxlor 0.9.29.1-dev $lng['crondesc']['cron_mailboxsize'] = 'Calculating of mailbox-sizes'; +$lng['domains']['ipandport_multi']['title'] = 'IP address(es)'; +$lng['domains']['ipandport_multi']['description'] = 'Specify one or more IP address for the domain.

NOTE: IP addresses cannot be changed when the domain is configured as alias-domain of another domain.
'; +$lng['domains']['ipandport_ssl_multi']['title'] = 'SSL IP address(es)'; +$lng['domains']['ssl_redirect']['title'] = 'SSL redirect'; +$lng['domains']['ssl_redirect']['description'] = 'This option creates redirects for non-ssl vhosts so that all requests are redirected to the SSL-vhost.

e.g. a request to http://domain.tld/ will redirect you to https://domain.tld/'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 0103488d..cb186e39 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1684,3 +1684,8 @@ $lng['admin']['phpfpm.ininote'] = 'Nicht alle gewünschten Werte können in der // Added in Froxlor 0.9.29.1-dev $lng['crondesc']['cron_mailboxsize'] = 'Berechnung der Mailbox-Größen'; +$lng['domains']['ipandport_multi']['title'] = 'IP Adresse(n)'; +$lng['domains']['ipandport_multi']['description'] = 'Definiere eine oder mehrere IP Adresse(n) für diese Domain.

Hinweis: Die IP Adressen können nicht geändert werden, sollte die Domain als Alias-Domain für eine andere Domain konfiguriert worden sein.
'; +$lng['domains']['ipandport_ssl_multi']['title'] = 'SSL IP Adresse(n)'; +$lng['domains']['ssl_redirect']['title'] = 'SSL Weiterleitung'; +$lng['domains']['ssl_redirect']['description'] = 'Diese Option erstellt für alle nicht-ssl vhosts eine Weiterleitung (Redirect), so dass alle Anfragen an den SSL-vhost übermittelt werden.

z.B. eine Anfrage an http://domain.tld/ würde weiterleiten zu https://domain.tld/'; diff --git a/lng/error_references.php b/lng/lng_references.php similarity index 89% rename from lng/error_references.php rename to lng/lng_references.php index f39e7f29..5d874255 100644 --- a/lng/error_references.php +++ b/lng/lng_references.php @@ -32,4 +32,9 @@ $lng['error']['domainname'] = $lng['domains']['domainname']; $lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\''; $lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\''; $lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\''; -$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; \ No newline at end of file +$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets']; + +/** + * other language-strings which need no translation + */ +$lng['domains']['ipandport_ssl_multi']['description'] = $lng['domains']['ipandport_multi']['description'];