From 5ded80864dd58bea3d57f9650f66769e27acedf9 Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Thu, 11 Dec 2008 10:56:17 +0000
Subject: [PATCH] - Improve multilanguage in help module and merge all language
 - Small improve

---
 interface/lib/classes/listform.inc.php        |  6 +--
 .../classes/listform_tpl_generator.inc.php    | 41 +------------------
 .../help/lib/lang/bg_support_message_list.lng |  6 ---
 .../help/lib/lang/de_support_message_list.lng |  6 ---
 .../help/lib/lang/en_support_message_list.lng |  6 ---
 interface/web/help/lib/lang/es.lng            |  1 -
 .../web/help/lib/lang/es_support_message.lng  |  1 -
 .../help/lib/lang/es_support_message_list.lng |  7 ----
 interface/web/help/lib/lang/fr.lng            |  7 ++++
 .../web/help/lib/lang/fr_support_message.lng  |  9 ++++
 .../help/lib/lang/fr_support_message_list.lng |  6 +++
 .../help/lib/lang/nl_support_message_list.lng |  6 ---
 interface/web/help/lib/lang/ru.lng            |  7 ++++
 .../help/lib/lang/ru_support_message_list.lng |  6 ---
 interface/web/help/lib/lang/se.lng            |  7 ++++
 .../web/help/lib/lang/se_support_message.lng  |  9 ++++
 .../help/lib/lang/se_support_message_list.lng |  6 +++
 17 files changed, 55 insertions(+), 82 deletions(-)
 create mode 100644 interface/web/help/lib/lang/fr.lng
 create mode 100644 interface/web/help/lib/lang/fr_support_message.lng
 create mode 100644 interface/web/help/lib/lang/fr_support_message_list.lng
 create mode 100644 interface/web/help/lib/lang/ru.lng
 create mode 100644 interface/web/help/lib/lang/se.lng
 create mode 100644 interface/web/help/lib/lang/se_support_message.lng
 create mode 100644 interface/web/help/lib/lang/se_support_message_list.lng

diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 174716cd30..2a68758442 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -59,12 +59,12 @@ class listform {
 		}
 		
 		//* 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;
 		
diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php
index 353b402279..86c3a4c7ed 100644
--- a/interface/lib/classes/listform_tpl_generator.inc.php
+++ b/interface/lib/classes/listform_tpl_generator.inc.php
@@ -132,47 +132,8 @@ class listform_tpl_generator {
 		}
 		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);
-		}
-	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/interface/web/help/lib/lang/bg_support_message_list.lng b/interface/web/help/lib/lang/bg_support_message_list.lng
index 9c94c25949..1a5c21c50c 100644
--- a/interface/web/help/lib/lang/bg_support_message_list.lng
+++ b/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'] = 'Ново съобщение';
 ?>
diff --git a/interface/web/help/lib/lang/de_support_message_list.lng b/interface/web/help/lib/lang/de_support_message_list.lng
index cf100918d8..d6bc2aac33 100644
--- a/interface/web/help/lib/lang/de_support_message_list.lng
+++ b/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';
 ?>
diff --git a/interface/web/help/lib/lang/en_support_message_list.lng b/interface/web/help/lib/lang/en_support_message_list.lng
index 371d037a63..9f2b3fd377 100644
--- a/interface/web/help/lib/lang/en_support_message_list.lng
+++ b/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';
 ?>
\ No newline at end of file
diff --git a/interface/web/help/lib/lang/es.lng b/interface/web/help/lib/lang/es.lng
index 5f476c0a49..507017451a 100644
--- a/interface/web/help/lib/lang/es.lng
+++ b/interface/web/help/lib/lang/es.lng
@@ -5,4 +5,3 @@ $wb['Send message'] = 'Enviar mensaje';
 $wb['View messages'] = 'Ver mensaje';
 $wb['Support'] = 'Soporte';
 ?>
-
diff --git a/interface/web/help/lib/lang/es_support_message.lng b/interface/web/help/lib/lang/es_support_message.lng
index dfb6c882c5..27044a3f1e 100644
--- a/interface/web/help/lib/lang/es_support_message.lng
+++ b/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';
 ?>
-
diff --git a/interface/web/help/lib/lang/es_support_message_list.lng b/interface/web/help/lib/lang/es_support_message_list.lng
index a0964c4b13..0ff8eb931f 100644
--- a/interface/web/help/lib/lang/es_support_message_list.lng
+++ b/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';
 ?>
-
diff --git a/interface/web/help/lib/lang/fr.lng b/interface/web/help/lib/lang/fr.lng
new file mode 100644
index 0000000000..ee25fef422
--- /dev/null
+++ b/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';
+?>
diff --git a/interface/web/help/lib/lang/fr_support_message.lng b/interface/web/help/lib/lang/fr_support_message.lng
new file mode 100644
index 0000000000..1d27248168
--- /dev/null
+++ b/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';
+?>
diff --git a/interface/web/help/lib/lang/fr_support_message_list.lng b/interface/web/help/lib/lang/fr_support_message_list.lng
new file mode 100644
index 0000000000..d6bc2aac33
--- /dev/null
+++ b/interface/web/help/lib/lang/fr_support_message_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Support Messages';
+$wb['sender_id_txt'] = 'Sender';
+$wb['subject_txt'] = 'Subject';
+$wb['add_new_record_txt'] = 'Create new support message';
+?>
diff --git a/interface/web/help/lib/lang/nl_support_message_list.lng b/interface/web/help/lib/lang/nl_support_message_list.lng
index 41496c4e09..eb2de7404f 100644
--- a/interface/web/help/lib/lang/nl_support_message_list.lng
+++ b/interface/web/help/lib/lang/nl_support_message_list.lng
@@ -2,11 +2,5 @@
 $wb['list_head_txt'] = 'Support berichten';
 $wb['sender_id_txt'] = 'Afzender';
 $wb['subject_txt'] = 'Onderwerp';
-$wb['page_txt'] = 'Pagina';
-$wb['page_of_txt'] = 'van';
-$wb['page_next_txt'] = 'Volgende';
-$wb['page_back_txt'] = 'Terug';
-$wb['delete_txt'] = 'Verwijderen';
-$wb['filter_txt'] = 'Filter';
 $wb['add_new_record_txt'] = 'Aanmaken nieuw support bericht';
 ?>
diff --git a/interface/web/help/lib/lang/ru.lng b/interface/web/help/lib/lang/ru.lng
new file mode 100644
index 0000000000..ee25fef422
--- /dev/null
+++ b/interface/web/help/lib/lang/ru.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';
+?>
diff --git a/interface/web/help/lib/lang/ru_support_message_list.lng b/interface/web/help/lib/lang/ru_support_message_list.lng
index ca4c1049fc..a25816b70e 100644
--- a/interface/web/help/lib/lang/ru_support_message_list.lng
+++ b/interface/web/help/lib/lang/ru_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'] = 'Создайте новое сообщение службы поддержки';
 ?>
diff --git a/interface/web/help/lib/lang/se.lng b/interface/web/help/lib/lang/se.lng
new file mode 100644
index 0000000000..ee25fef422
--- /dev/null
+++ b/interface/web/help/lib/lang/se.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';
+?>
diff --git a/interface/web/help/lib/lang/se_support_message.lng b/interface/web/help/lib/lang/se_support_message.lng
new file mode 100644
index 0000000000..1d27248168
--- /dev/null
+++ b/interface/web/help/lib/lang/se_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';
+?>
diff --git a/interface/web/help/lib/lang/se_support_message_list.lng b/interface/web/help/lib/lang/se_support_message_list.lng
new file mode 100644
index 0000000000..d6bc2aac33
--- /dev/null
+++ b/interface/web/help/lib/lang/se_support_message_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Support Messages';
+$wb['sender_id_txt'] = 'Sender';
+$wb['subject_txt'] = 'Subject';
+$wb['add_new_record_txt'] = 'Create new support message';
+?>
-- 
GitLab