diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php index a57fab5aeed4e3374e3ba85d866789473b29354b..a3946eb4699b5215a9b4f35209e236a7b9f80cc1 100644 --- a/interface/lib/classes/listform.inc.php +++ b/interface/lib/classes/listform.inc.php @@ -59,9 +59,6 @@ class listform { } //* Set local Language File - $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/'.$_SESSION['s']['language'].'_list.lng'; - if(!file_exists($lng_file)) $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/en_'.'_list.lng'; - include($lng_file); $lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_'.$this->listDef['name'].'_list.lng'; if(!file_exists($lng_file)) $lng_file = 'lib/lang/en_'.$this->listDef['name'].'_list.lng'; include($lng_file); diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php index ca8ac3f035d8bc478544f89f7fc06d82a177eb17..2ea9c0cfbe3cb1c7d943efa11e477529001dd917 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -130,9 +130,6 @@ class tform { $this->module = $module; $wb = array(); - $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/'.$_SESSION['s']['language'].'_tform.lng'; - if(!file_exists($lng_file)) $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/en'.'_tform.lng'; - include($lng_file); if($module == '') { $lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng"; if(!file_exists($lng_file)) $lng_file = "lib/lang/en_".$this->formDef["name"].".lng"; @@ -641,8 +638,13 @@ class tform { } }else{$vip=0;} if($vip==0) { - $this->errorMessage .= $field_name.": ".$this->wordbook['ipv4_validator_error_txt']."<br />\r\n"; - } + $errmsg = $validator['errmsg']; + if(isset($this->wordbook[$errmsg])) { + $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n"; + } else { + $this->errorMessage .= $errmsg."<br />\r\n"; + } + } break; case 'CUSTOM': // Calls a custom class to validate this record diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index 724ac0df28143e005e38004904fb542e60400307..b5732c5237ce3eb5f397e3ed40f6104708ef2939 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -7,4 +7,13 @@ $wb['1003'] = 'The username is deactivated!'; $wb['delete_confirmation'] = 'Do you really want to delete this record?'; $wb['error_no_view_permission'] = 'You dont have the permission to view this record or this record does not exist!'; $wb['error_no_delete_permission'] = 'You dont have the permission to delete this record!'; +$wb["page_txt"] = 'Page'; +$wb["page_of_txt"] = 'of'; +$wb["page_next_txt"] = 'Next'; +$wb["page_back_txt"] = 'Back'; +$wb["delete_txt"] = 'Delete'; +$wb["filter_txt"] = 'Filter'; +$wb["add_new_record_txt"] = 'Add new record'; +$wb['btn_save_txt'] = "Save"; +$wb['btn_cancel_txt'] = "Cancel"; ?> diff --git a/interface/web/lang/lib/lang/bg_list.lng b/interface/web/lang/lib/lang/bg_list.lng deleted file mode 100644 index 77ece3b7da42f9b0ca3ce03e2e9364165c99261b..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/bg_list.lng +++ /dev/null @@ -1,9 +0,0 @@ -<?php -$wb['page_txt'] = 'Page'; -$wb['page_of_txt'] = 'of'; -$wb['page_next_txt'] = 'Next'; -$wb['page_back_txt'] = 'Back'; -$wb['delete_txt'] = 'Delete'; -$wb['filter_txt'] = 'Filter'; -$wb['add_new_record_txt'] = 'Add new record'; -?> diff --git a/interface/web/lang/lib/lang/bg_tform.lng b/interface/web/lang/lib/lang/bg_tform.lng deleted file mode 100644 index 6851d8bf53c0d743e8f1afa617724efa2470a676..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/bg_tform.lng +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Cancel'; -?> diff --git a/interface/web/lang/lib/lang/de_list.lng b/interface/web/lang/lib/lang/de_list.lng deleted file mode 100644 index 77ece3b7da42f9b0ca3ce03e2e9364165c99261b..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/de_list.lng +++ /dev/null @@ -1,9 +0,0 @@ -<?php -$wb['page_txt'] = 'Page'; -$wb['page_of_txt'] = 'of'; -$wb['page_next_txt'] = 'Next'; -$wb['page_back_txt'] = 'Back'; -$wb['delete_txt'] = 'Delete'; -$wb['filter_txt'] = 'Filter'; -$wb['add_new_record_txt'] = 'Add new record'; -?> diff --git a/interface/web/lang/lib/lang/de_tform.lng b/interface/web/lang/lib/lang/de_tform.lng deleted file mode 100644 index 6851d8bf53c0d743e8f1afa617724efa2470a676..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/de_tform.lng +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Cancel'; -?> diff --git a/interface/web/lang/lib/lang/en_list.lng b/interface/web/lang/lib/lang/en_list.lng deleted file mode 100644 index 30814d02d39ab9f6b2830b28c9b5f09eb7906420..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/en_list.lng +++ /dev/null @@ -1,9 +0,0 @@ -<?php -$wb["page_txt"] = 'Page'; -$wb["page_of_txt"] = 'of'; -$wb["page_next_txt"] = 'Next'; -$wb["page_back_txt"] = 'Back'; -$wb["delete_txt"] = 'Delete'; -$wb["filter_txt"] = 'Filter'; -$wb["add_new_record_txt"] = 'Add new record'; -?> diff --git a/interface/web/lang/lib/lang/en_tform.lng b/interface/web/lang/lib/lang/en_tform.lng deleted file mode 100644 index 1137d2f96a983673f68ea3bd2492282cc5ce1b7f..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/en_tform.lng +++ /dev/null @@ -1,5 +0,0 @@ -<?php -$wb['btn_save_txt'] = "Save"; -$wb['btn_cancel_txt'] = "Cancel"; -$wb['ipv4_validator_error_txt'] = "Is not valid IP address"; -?> diff --git a/interface/web/lang/lib/lang/es_list.lng b/interface/web/lang/lib/lang/es_list.lng deleted file mode 100644 index 77ece3b7da42f9b0ca3ce03e2e9364165c99261b..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/es_list.lng +++ /dev/null @@ -1,9 +0,0 @@ -<?php -$wb['page_txt'] = 'Page'; -$wb['page_of_txt'] = 'of'; -$wb['page_next_txt'] = 'Next'; -$wb['page_back_txt'] = 'Back'; -$wb['delete_txt'] = 'Delete'; -$wb['filter_txt'] = 'Filter'; -$wb['add_new_record_txt'] = 'Add new record'; -?> diff --git a/interface/web/lang/lib/lang/es_tform.lng b/interface/web/lang/lib/lang/es_tform.lng deleted file mode 100644 index 6851d8bf53c0d743e8f1afa617724efa2470a676..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/es_tform.lng +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Cancel'; -?> diff --git a/interface/web/lang/lib/lang/fr_list.lng b/interface/web/lang/lib/lang/fr_list.lng deleted file mode 100644 index 77ece3b7da42f9b0ca3ce03e2e9364165c99261b..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/fr_list.lng +++ /dev/null @@ -1,9 +0,0 @@ -<?php -$wb['page_txt'] = 'Page'; -$wb['page_of_txt'] = 'of'; -$wb['page_next_txt'] = 'Next'; -$wb['page_back_txt'] = 'Back'; -$wb['delete_txt'] = 'Delete'; -$wb['filter_txt'] = 'Filter'; -$wb['add_new_record_txt'] = 'Add new record'; -?> diff --git a/interface/web/lang/lib/lang/fr_tform.lng b/interface/web/lang/lib/lang/fr_tform.lng deleted file mode 100644 index 6851d8bf53c0d743e8f1afa617724efa2470a676..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/fr_tform.lng +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Cancel'; -?> diff --git a/interface/web/lang/lib/lang/it_list.lng b/interface/web/lang/lib/lang/it_list.lng deleted file mode 100644 index 85ca2dd1f9451645c9340e6e1ceabea5bc042bec..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/it_list.lng +++ /dev/null @@ -1,9 +0,0 @@ -<?php -$wb['page_txt'] = 'Pagina'; -$wb['page_of_txt'] = 'di'; -$wb['page_next_txt'] = 'Successiva'; -$wb['page_back_txt'] = 'Precedente'; -$wb['delete_txt'] = 'Cancella'; -$wb['filter_txt'] = 'Filtra'; -$wb['add_new_record_txt'] = 'Aggiungi nuovo record'; -?> diff --git a/interface/web/lang/lib/lang/it_tform.lng b/interface/web/lang/lib/lang/it_tform.lng deleted file mode 100644 index 7daf105a03cd0bef8d0c1f28ea38f23d982598fa..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/it_tform.lng +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$wb['btn_save_txt'] = 'Salva'; -$wb['btn_cancel_txt'] = 'Annulla'; -?> diff --git a/interface/web/lang/lib/lang/nl_list.lng b/interface/web/lang/lib/lang/nl_list.lng deleted file mode 100644 index 77ece3b7da42f9b0ca3ce03e2e9364165c99261b..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/nl_list.lng +++ /dev/null @@ -1,9 +0,0 @@ -<?php -$wb['page_txt'] = 'Page'; -$wb['page_of_txt'] = 'of'; -$wb['page_next_txt'] = 'Next'; -$wb['page_back_txt'] = 'Back'; -$wb['delete_txt'] = 'Delete'; -$wb['filter_txt'] = 'Filter'; -$wb['add_new_record_txt'] = 'Add new record'; -?> diff --git a/interface/web/lang/lib/lang/nl_tform.lng b/interface/web/lang/lib/lang/nl_tform.lng deleted file mode 100644 index 6851d8bf53c0d743e8f1afa617724efa2470a676..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/nl_tform.lng +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Cancel'; -?> diff --git a/interface/web/lang/lib/lang/ru_list.lng b/interface/web/lang/lib/lang/ru_list.lng deleted file mode 100644 index 77ece3b7da42f9b0ca3ce03e2e9364165c99261b..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/ru_list.lng +++ /dev/null @@ -1,9 +0,0 @@ -<?php -$wb['page_txt'] = 'Page'; -$wb['page_of_txt'] = 'of'; -$wb['page_next_txt'] = 'Next'; -$wb['page_back_txt'] = 'Back'; -$wb['delete_txt'] = 'Delete'; -$wb['filter_txt'] = 'Filter'; -$wb['add_new_record_txt'] = 'Add new record'; -?> diff --git a/interface/web/lang/lib/lang/ru_tform.lng b/interface/web/lang/lib/lang/ru_tform.lng deleted file mode 100644 index 6851d8bf53c0d743e8f1afa617724efa2470a676..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/ru_tform.lng +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Cancel'; -?> diff --git a/interface/web/lang/lib/lang/se_list.lng b/interface/web/lang/lib/lang/se_list.lng deleted file mode 100644 index 77ece3b7da42f9b0ca3ce03e2e9364165c99261b..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/se_list.lng +++ /dev/null @@ -1,9 +0,0 @@ -<?php -$wb['page_txt'] = 'Page'; -$wb['page_of_txt'] = 'of'; -$wb['page_next_txt'] = 'Next'; -$wb['page_back_txt'] = 'Back'; -$wb['delete_txt'] = 'Delete'; -$wb['filter_txt'] = 'Filter'; -$wb['add_new_record_txt'] = 'Add new record'; -?> diff --git a/interface/web/lang/lib/lang/se_tform.lng b/interface/web/lang/lib/lang/se_tform.lng deleted file mode 100644 index 6851d8bf53c0d743e8f1afa617724efa2470a676..0000000000000000000000000000000000000000 --- a/interface/web/lang/lib/lang/se_tform.lng +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Cancel'; -?>