- Improve multilanguage in help module and merge all language

- Small improve

Author: fantu

interface/lib/classes/listform.inc.php

@@ -59,12 +59,12 @@ public function loadListDef($file, $module = '')
 		}
 
 		//* Set local Language 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);
 		$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);
 
 		$this->wordbook = $wb;
 

interface/lib/classes/listform_tpl_generator.inc.php

@@ -132,47 +132,8 @@ function buildHTML($listDef,$module = '') {
 		}
 		fclose($handle);
 
-		/*$lang["page_txt"] = 'Page';
-		$lang["page_of_txt"] = 'of';
-		$lang["page_next_txt"] = 'Next';
-		$lang["page_back_txt"] = 'Back';
-		$lang["delete_txt"] = 'Delete';
-		$lang["filter_txt"] = 'Filter';
-		$lang["add_new_record_txt"] = 'Add new record';
-		
-		// save language file
-		$this->lng_add($lang,$listDef,$module);*/
     }
-	
-	function lng_add($lang,$listDef,$module = '') {
-		global $go_api, $go_info,$conf;
-		
-		if($module == '') {
-			$lng_file = "lib/lang/".$conf["language"]."_".$listDef['name']."_list.lng";
-		} else {
-			$lng_file = '../'.$module."/lib/lang/en_".$listDef['name']."_list.lng";
-		}
-		
-		if(is_file($lng_file)) {
-			include_once($lng_file);
-		} else {
-			$wb = array();
-		}
-		
-		$wb_out = array_merge($lang,$wb);
-		
-		if(is_array($wb_out)) {
-			$fp = fopen ($lng_file, "w");
-			fwrite($fp,"<?php\r\n");
-			foreach($wb_out as $key => $val) {
-				$new_line = '$wb["'.$key.'"] = '."'$val';\r\n";
-				fwrite($fp,$new_line);
-				
-			}
-			fwrite($fp,"?>");
-			fclose($fp);
-		}
-	}
+
 }
 
 ?>

interface/web/help/lib/lang/bg_support_message_list.lng

@@ -2,11 +2,5 @@
 $wb['list_head_txt'] = 'Съобщения до поддръжката';
 $wb['sender_id_txt'] = 'Подател';
 $wb['subject_txt'] = 'Тема';
-$wb['page_txt'] = 'Страница';
-$wb['page_of_txt'] = 'от';
-$wb['page_next_txt'] = 'Следваща';
-$wb['page_back_txt'] = 'Предишна';
-$wb['delete_txt'] = 'Истриване';
-$wb['filter_txt'] = 'Филтър';
 $wb['add_new_record_txt'] = 'Ново съобщение';
 ?>

interface/web/help/lib/lang/de_support_message_list.lng

@@ -2,11 +2,5 @@
 $wb['list_head_txt'] = 'Support Messages';
 $wb['sender_id_txt'] = 'Sender';
 $wb['subject_txt'] = 'Subject';
-$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'] = 'Create new support message';
 ?>

interface/web/help/lib/lang/en_support_message_list.lng

@@ -2,11 +2,5 @@
 $wb['list_head_txt'] = 'Support Messages';
 $wb['sender_id_txt'] = 'Sender';
 $wb['subject_txt'] = 'Subject';
-$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"] = 'Create new support message';
 ?>

interface/web/help/lib/lang/es.lng

@@ -5,4 +5,3 @@ $wb['Send message'] = 'Enviar mensaje';
 $wb['View messages'] = 'Ver mensaje';
 $wb['Support'] = 'Soporte';
 ?>
-

interface/web/help/lib/lang/es_support_message.lng

@@ -7,4 +7,3 @@ $wb['tstamp_txt'] = 'Marcadetiempo';
 $wb['btn_save_txt'] = 'Guardar';
 $wb['btn_cancel_txt'] = 'Cancelar';
 ?>
-

interface/web/help/lib/lang/es_support_message_list.lng

@@ -2,12 +2,5 @@
 $wb['list_head_txt'] = 'Mensajes de soporte';
 $wb['sender_id_txt'] = 'Remitente';
 $wb['subject_txt'] = 'Asunto';
-$wb['page_txt'] = 'Página';
-$wb['page_of_txt'] = 'de';
-$wb['page_next_txt'] = 'Siguiente';
-$wb['page_back_txt'] = 'Atrás';
-$wb['delete_txt'] = 'Borrar';
-$wb['filter_txt'] = 'Filtro';
 $wb['add_new_record_txt'] = 'Crear nuevo mensaje de soporte';
 ?>
-

interface/web/help/lib/lang/fr.lng

@@ -0,0 +1,7 @@
+<?php
+$wb['Support Message'] = 'Support Message';
+$wb['Message'] = 'Message';
+$wb['Send message'] = 'Send message';
+$wb['View messages'] = 'View messages';
+$wb['Support'] = 'Support';
+?>

interface/web/help/lib/lang/fr_support_message.lng

@@ -0,0 +1,9 @@
+<?php
+$wb['recipient_id_txt'] = 'Recipient ID';
+$wb['sender_id_txt'] = 'Sender ID';
+$wb['subject_txt'] = 'Subject';
+$wb['message_txt'] = 'Message';
+$wb['tstamp_txt'] = 'Timestamp';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>