From 67300189f3c6b9e1405c0f7e751915f24e717135 Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Thu, 11 Dec 2008 12:23:11 +0000
Subject: [PATCH] multilanguage improve also in "tform-system"

---
 interface/lib/classes/tform.inc.php           |  3 ++
 .../lib/classes/tform_tpl_generator.inc.php   | 29 -------------------
 interface/web/lang/lib/lang/en_tform.lng      |  4 +++
 3 files changed, 7 insertions(+), 29 deletions(-)
 create mode 100644 interface/web/lang/lib/lang/en_tform.lng

diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index c9baa5cb1..f05e19ede 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -139,6 +139,9 @@ class tform {
                         include_once("../$module/lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng");
 					}
                 }
+				$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);
                 $this->wordbook = $wb;
 
                 return true;
diff --git a/interface/lib/classes/tform_tpl_generator.inc.php b/interface/lib/classes/tform_tpl_generator.inc.php
index 5a9af704d..b11de8500 100644
--- a/interface/lib/classes/tform_tpl_generator.inc.php
+++ b/interface/lib/classes/tform_tpl_generator.inc.php
@@ -171,8 +171,6 @@ class tform_tpl_generator {
 </div>
 ";
 
-		$lang['btn_save_txt'] = "Save";
-		$lang['btn_cancel_txt'] = "Cancel";
 				
 		// speichere Template
 		if (!$handle = fopen($formDef['tabs'][$tab]['template'], 'w')) { 
@@ -186,9 +184,6 @@ class tform_tpl_generator {
 		}
 		fclose($handle);
 		
-		// speichere language Datei
-		$this->lng_add($lang,$formDef);
-		
 		// überprüfe, ob es die Tabelle schon gibt,
 		// ansonsten wird sie angelegt
 		$tables = $app->db->getTables();
@@ -325,30 +320,6 @@ class tform_tpl_generator {
 		}
     }
 	
-	function lng_add($lang,$formDef) {
-		global $go_api, $go_info,$conf;
-		
-		$lng_file = "lib/lang/".$conf["language"]."_".$formDef['name'].".lng";
-		if(is_file($lng_file)) {
-			include($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/lang/lib/lang/en_tform.lng b/interface/web/lang/lib/lang/en_tform.lng
new file mode 100644
index 000000000..f0eed30a0
--- /dev/null
+++ b/interface/web/lang/lib/lang/en_tform.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['btn_save_txt'] = "Save";
+$wb['btn_cancel_txt'] = "Cancel";
+?>
-- 
GitLab