From 9539ceb4aed94566529d952392c26aef3dfc92fd Mon Sep 17 00:00:00 2001 From: filip <filip@ispconfig3> Date: Fri, 08 Oct 2010 06:36:21 -0400 Subject: [PATCH] Add translations of values in select boxes (first, in customer modules) Updated english languages files Updated czech languages files --- interface/web/mail/lib/lang/cz_mail_user_filter.lng | 11 +++++ interface/web/mail/list/mail_whitelist.list.php | 4 +- interface/web/sites/lib/lang/en_web_aliasdomain_list.lng | 5 ++ interface/web/sites/lib/lang/cz_web_subdomain.lng | 2 + interface/lib/classes/tform.inc.php | 4 ++ interface/web/sites/lib/lang/cz.lng | 1 interface/web/sites/lib/lang/en_web_domain.lng | 9 ++++ interface/web/mail/lib/lang/cz_mail_user.lng | 1 interface/web/sites/lib/lang/en_web_subdomain.lng | 4 + interface/web/mail/form/mail_user_filter.tform.php | 7 ++- interface/web/mail/lib/lang/cz_mail_whitelist.lng | 2 + interface/web/mail/templates/mail_user_autoresponder_edit.htm | 4 +- interface/web/mail/lib/lang/en_mail_user_filter.lng | 9 ++++ interface/web/mail/lib/lang/en_mail_user.lng | 1 interface/web/sites/form/web_aliasdomain.tform.php | 6 +- interface/web/sites/form/web_subdomain.tform.php | 4 +- interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng | 3 + interface/web/sites/form/web_domain.tform.php | 10 ++-- interface/web/sites/lib/lang/cz_web_domain.lng | 7 +++ 19 files changed, 73 insertions(+), 21 deletions(-) diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index 79f040b..b9a417c 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -379,6 +379,8 @@ if(is_array($field['value'])) { foreach($field['value'] as $k => $v) { $selected = ($k == $val)?' SELECTED':''; + if(!empty($this->wordbook[$v])) + $v = $this->wordbook[$v]; $out .= "<option value='$k'$selected>$v</option>\r\n"; } } @@ -492,6 +494,8 @@ $out = ''; foreach($field['value'] as $k => $v) { $selected = ($k == $field["default"])?' SELECTED':''; + if(!empty($this->wordbook[$v])) + $v = $this->wordbook[$v]; $out .= "<option value='$k'$selected>$v</option>\r\n"; } } diff --git a/interface/web/mail/form/mail_user_filter.tform.php b/interface/web/mail/form/mail_user_filter.tform.php index 565d5c4..70f3492 100644 --- a/interface/web/mail/form/mail_user_filter.tform.php +++ b/interface/web/mail/form/mail_user_filter.tform.php @@ -81,13 +81,14 @@ 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => '', - 'value' => array('Subject' => 'Subject','From'=>'From','To'=>'To') + 'value' => array('Subject' => 'subject_txt','From'=>'from_txt','To'=>'to_txt') ), 'op' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => '', - 'value' => array('contains'=>'Contains','is' => 'Is','begins'=>'Begins with','ends'=>'Ends with') + #'value' => array('contains'=>'contains_txt','is' => 'Is','begins'=>'Begins with','ends'=>'Ends with') + 'value' => array('contains'=>'contains_txt','is' => 'is_txt','begins'=>'begins_with_txt','ends'=>'ends_with_txt') ), 'searchterm' => array ( 'datatype' => 'VARCHAR', @@ -104,7 +105,7 @@ 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => '', - 'value' => array('move' => 'Move to','delete'=>'Delete') + 'value' => array('move' => 'move_to_txt','delete'=>'delete_txt') ), 'target' => array ( 'datatype' => 'VARCHAR', diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng index add0bf9..1e23a6c 100644 --- a/interface/web/mail/lib/lang/cz_mail_user.lng +++ b/interface/web/mail/lib/lang/cz_mail_user.lng @@ -40,4 +40,5 @@ $wb['cc_txt'] = 'Přeposílat na'; $wb['cc_error_isemail'] = 'Adresa uvedená v poli "Přeposílat na" je neplatná'; $wb['domain_txt'] = 'Doména'; +$wb['now_txt']='Nyní'; ?> diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng index 263bb7b..e350a5b 100644 --- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng @@ -4,7 +4,16 @@ $wb['target_txt'] = 'Složka'; $wb['active_txt'] = 'Aktivní'; $wb['rulename_error_empty'] = 'Název je prázdný.'; -$wb['searchterm_is_empty'] = 'Vyhledávací žádek je prázdný.'; +$wb['searchterm_is_empty'] = 'Vyhledávací řádek je prázdný.'; $wb['source_txt'] = 'Zdroj'; $wb['target_error_regex'] = 'Cíl může obsahovat jen tyto znaky: a-z, 0-9, -, ., _, a {mezeru}'; +$wb['subject_txt'] = 'Předmět'; +$wb['from_txt'] = 'Odesílatel'; +$wb['to_txt'] = 'Adresát'; +$wb['contains_txt'] = 'Obsahuje'; +$wb['is_txt'] = 'Je'; +$wb['begins_with_txt'] = 'Začíná na'; +$wb['ends_with_txt'] = 'Končí na'; +$wb['move_to_txt'] = 'Přesunout do'; +$wb['delete_txt'] = 'Smazat'; ?> diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng index 2c9002a..fdbc4ed 100644 --- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng @@ -6,4 +6,6 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.'; $wb['type_txt'] = 'Typ'; $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.'; +$wb['sender_txt'] = 'Odesílatel'; +$wb['client_txt'] = 'Klient'; ?> diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng index 4f9ec7f..1b74ea8 100644 --- a/interface/web/mail/lib/lang/en_mail_user.lng +++ b/interface/web/mail/lib/lang/en_mail_user.lng @@ -40,4 +40,5 @@ $wb['cc_txt'] = 'Send copy to'; $wb['cc_error_isemail'] = 'The "Send copy to" field does not conatin a valid email address'; $wb['domain_txt'] = 'Domain'; +$wb['now_txt']='Now'; ?> diff --git a/interface/web/mail/lib/lang/en_mail_user_filter.lng b/interface/web/mail/lib/lang/en_mail_user_filter.lng index 3245a09..20ffa3d 100644 --- a/interface/web/mail/lib/lang/en_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/en_mail_user_filter.lng @@ -7,4 +7,13 @@ $wb["searchterm_is_empty"] = 'Search term is empty.'; $wb["source_txt"] = 'Source'; $wb["target_error_regex"] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}'; +$wb['subject_txt'] = 'Subject'; +$wb['from_txt'] = 'From'; +$wb['to_txt'] = 'To'; +$wb['contains_txt'] = 'Contains'; +$wb['is_txt'] = 'Is'; +$wb['begins_with_txt'] = 'Begins with'; +$wb['ends_with_txt'] = 'Ends with'; +$wb['move_to_txt'] = 'Move to'; +$wb['delete_txt'] = 'Delete'; ?> diff --git a/interface/web/mail/list/mail_whitelist.list.php b/interface/web/mail/list/mail_whitelist.list.php index 958a3e9..718adb6 100644 --- a/interface/web/mail/list/mail_whitelist.list.php +++ b/interface/web/mail/list/mail_whitelist.list.php @@ -88,7 +88,7 @@ 'prefix' => "", 'suffix' => "", 'width' => "", - 'value' => array('recipient' => 'Recipient', 'sender' => 'Sender', 'client' => 'Client')); + 'value' => array('recipient' => 'recipient_txt', 'sender' => 'sender_txt', 'client' => 'client_txt')); -?> \ No newline at end of file +?> diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm index 7b137fc..2bec5b9 100644 --- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm @@ -18,7 +18,7 @@ <p style="margin-bottom: 3px;"> <label for="autoresponder_start_date[day]" style="width: 55px;">{tmpl_var name='autoresponder_start_date_txt'}</label> - {tmpl_var name='autoresponder_start_date'} <a href="javascript:AR_SetNow();">now</a></p> + {tmpl_var name='autoresponder_start_date'} <a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a></p> <label for="password" style="width: 55px;">{tmpl_var name='autoresponder_end_date_txt'}</label> {tmpl_var name='autoresponder_end_date'} @@ -34,4 +34,4 @@ </div> </div> -</div> \ No newline at end of file +</div> diff --git a/interface/web/sites/form/web_aliasdomain.tform.php b/interface/web/sites/form/web_aliasdomain.tform.php index e8ed0b3..2ced981 100644 --- a/interface/web/sites/form/web_aliasdomain.tform.php +++ b/interface/web/sites/form/web_aliasdomain.tform.php @@ -106,7 +106,7 @@ 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => 'y', - 'value' => array('' => 'No redirect', 'no' => 'No flag', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L') + 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L') ), 'redirect_path' => array ( 'datatype' => 'VARCHAR', @@ -124,7 +124,7 @@ 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => 'y', - 'value' => array('none' => 'none', 'www' => 'www.', '*' => '*.') + 'value' => array('none' => 'none_txt', 'www' => 'www.', '*' => '*.') ), 'active' => array ( 'datatype' => 'VARCHAR', @@ -139,4 +139,4 @@ ); -?> \ No newline at end of file +?> diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index 09d34d3..928df1c 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -178,7 +178,7 @@ 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => 'y', - 'value' => array('none' => 'none', 'www' => 'www.', '*' => '*.') + 'value' => array('none' => 'none_txt', 'www' => 'www.', '*' => '*.') ), 'ssl' => array ( 'datatype' => 'VARCHAR', @@ -191,7 +191,7 @@ 'formtype' => 'SELECT', 'default' => 'fast-cgi', 'valuelimit' => 'client:web_php_options', - 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP') + 'value' => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP') ), 'ruby' => array ( 'datatype' => 'VARCHAR', @@ -225,7 +225,7 @@ 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => '', - 'value' => array('' => 'No redirect', 'no' => 'No flag', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L') + 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L') ), 'redirect_path' => array ( 'datatype' => 'VARCHAR', @@ -350,7 +350,7 @@ 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => '', - 'value' => array('' => 'None', 'save' => 'Save Certificate', 'create' => 'Create Certificate','del' => 'Delete Certificate') + 'value' => array('' => 'none_txt', 'save' => 'save_certificate_txt', 'create' => 'create_certificate_txt','del' => 'delete_certificate_txt') ), ################################## # ENDE Datatable fields @@ -512,4 +512,4 @@ } -?> \ No newline at end of file +?> diff --git a/interface/web/sites/form/web_subdomain.tform.php b/interface/web/sites/form/web_subdomain.tform.php index f81ee8d..a398fc1 100644 --- a/interface/web/sites/form/web_subdomain.tform.php +++ b/interface/web/sites/form/web_subdomain.tform.php @@ -106,7 +106,7 @@ 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => 'y', - 'value' => array('' => 'No redirect', 'no' => 'No flag', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L') + 'value' => array('' => 'no_redirect_txt', 'no' => 'no_flag_txt', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L') ), 'redirect_path' => array ( 'datatype' => 'VARCHAR', @@ -133,4 +133,4 @@ ); -?> \ No newline at end of file +?> diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng index dab1444..2a60e7e 100644 --- a/interface/web/sites/lib/lang/cz.lng +++ b/interface/web/sites/lib/lang/cz.lng @@ -23,4 +23,5 @@ $wb['Webdav'] = 'Webdav'; $wb['Statistics'] = 'Statistiky'; $wb['Website quota (Harddisk)'] = 'Disková kvóta'; +$wb['Web Domain'] = 'Webová doména'; ?> diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng index 59ee15b..22a4ffe 100644 --- a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng @@ -8,4 +8,7 @@ $wb['domain_error_empty'] = 'Doména je prázdná.'; $wb['domain_error_unique'] = 'Doména musí být unkátní.'; $wb['domain_error_regex'] = 'Doménové jméno je chybné.'; +$wb['no_redirect_txt'] = 'Žádné přesměrování'; +$wb['no_flag_txt'] = 'Žádný příznak'; +$wb['none_txt'] = 'Žádná'; ?> diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng index d941840..8c439a3 100644 --- a/interface/web/sites/lib/lang/cz_web_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_domain.lng @@ -64,4 +64,11 @@ $wb['stats_user_txt'] = 'Webové statistiky: uživatelské jméno'; $wb['stats_type_txt'] = 'Webové statistiky: program'; $wb['custom_php_ini_txt'] = 'Vlastní nastavení php.ini'; +$wb['none_txt'] = 'Žádná'; +$wb['disabled_txt'] = 'Zakázáno'; +$wb['no_redirect_txt'] = 'Žádné přesměrování'; +$wb['no_flag_txt'] = 'Žádný příznak'; +$wb['save_certificate_txt'] = 'Uložit certifikát'; +$wb['create_certificate_txt'] = 'Vytvořit certifikát'; +$wb['delete_certificate_txt'] = 'Smazat certifikát'; ?> diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng index a00c4a8..1dbd2c6 100644 --- a/interface/web/sites/lib/lang/cz_web_subdomain.lng +++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng @@ -37,4 +37,6 @@ $wb['domain_error_regex'] = 'Neplatné doménové jméno.'; $wb['host_txt'] = 'Host'; $wb['redirect_error_regex'] = 'Neplatná cesta přesměrování. Platné přesměrování je například: /test/ nebo http://www.domain.tld/test/'; +$wb['no_redirect_txt'] = 'Žádné přesměrování'; +$wb['no_flag_txt'] = 'Žádný příznak'; ?> diff --git a/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng index 3945d23..0635583 100644 --- a/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng @@ -8,4 +8,7 @@ $wb["domain_error_empty"] = 'Domain is empty.'; $wb["domain_error_unique"] = 'Domain must be unique.'; $wb["domain_error_regex"] = 'Domain name invalid.'; -?> \ No newline at end of file +$wb['no_redirect_txt'] = 'No redirect'; +$wb['no_flag_txt'] = 'No flag'; +$wb['none_txt'] = 'None'; +?> diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng index 79438c8..8270026 100644 --- a/interface/web/sites/lib/lang/en_web_domain.lng +++ b/interface/web/sites/lib/lang/en_web_domain.lng @@ -64,4 +64,11 @@ $wb["stats_user_txt"] = 'Webstatistics username'; $wb["stats_type_txt"] = 'Webstatistics program'; $wb["custom_php_ini_txt"] = 'Custom php.ini settings'; -?> \ No newline at end of file +$wb['none_txt'] = 'None'; +$wb['disabled_txt'] = 'Disabled'; +$wb['no_redirect_txt'] = 'No redirect'; +$wb['no_flag_txt'] = 'No flag'; +$wb['save_certificate_txt'] = 'Save certificate'; +$wb['create_certificate_txt'] = 'Create certificate'; +$wb['delete_certificate_txt'] = 'Delete certificate'; +?> diff --git a/interface/web/sites/lib/lang/en_web_subdomain.lng b/interface/web/sites/lib/lang/en_web_subdomain.lng index 6bd3b08..a26e03e 100644 --- a/interface/web/sites/lib/lang/en_web_subdomain.lng +++ b/interface/web/sites/lib/lang/en_web_subdomain.lng @@ -37,4 +37,6 @@ $wb["domain_error_regex"] = 'Domain name invalid.'; $wb["host_txt"] = 'Host'; $wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/'; -?> \ No newline at end of file +$wb['no_redirect_txt'] = 'No redirect'; +$wb['no_flag_txt'] = 'No flag'; +?> -- Gitblit v1.9.1