Skip to content

Commit 6730018

Browse files
author
fantu
committed
multilanguage improve also in "tform-system"
1 parent d82bfbb commit 6730018

File tree

3 files changed

+7
-29
lines changed

3 files changed

+7
-29
lines changed

interface/lib/classes/tform.inc.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ function loadFormDef($file,$module = '') {
139139
include_once("../$module/lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng");
140140
}
141141
}
142+
$lng_file = ISPC_WEB_PATH.'/lang/lib/lang/'.$_SESSION['s']['language'].'_tform.lng';
143+
if(!file_exists($lng_file)) $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/en_'.'_tform.lng';
144+
include($lng_file);
142145
$this->wordbook = $wb;
143146

144147
return true;

interface/lib/classes/tform_tpl_generator.inc.php

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ function buildHTML($formDef,$tab) {
171171
</div>
172172
";
173173

174-
$lang['btn_save_txt'] = "Save";
175-
$lang['btn_cancel_txt'] = "Cancel";
176174

177175
// speichere Template
178176
if (!$handle = fopen($formDef['tabs'][$tab]['template'], 'w')) {
@@ -186,9 +184,6 @@ function buildHTML($formDef,$tab) {
186184
}
187185
fclose($handle);
188186

189-
// speichere language Datei
190-
$this->lng_add($lang,$formDef);
191-
192187
// überprüfe, ob es die Tabelle schon gibt,
193188
// ansonsten wird sie angelegt
194189
$tables = $app->db->getTables();
@@ -325,30 +320,6 @@ function buildHTML($formDef,$tab) {
325320
}
326321
}
327322

328-
function lng_add($lang,$formDef) {
329-
global $go_api, $go_info,$conf;
330-
331-
$lng_file = "lib/lang/".$conf["language"]."_".$formDef['name'].".lng";
332-
if(is_file($lng_file)) {
333-
include($lng_file);
334-
} else {
335-
$wb = array();
336-
}
337-
338-
$wb_out = array_merge($lang,$wb);
339-
340-
if(is_array($wb_out)) {
341-
$fp = fopen ($lng_file, "w");
342-
fwrite($fp,"<?php\r\n");
343-
foreach($wb_out as $key => $val) {
344-
$new_line = '$wb["'.$key.'"] = '."'$val';\r\n";
345-
fwrite($fp,$new_line);
346-
347-
}
348-
fwrite($fp,"?>");
349-
fclose($fp);
350-
}
351-
}
352323
}
353324

354325
?>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?php
2+
$wb['btn_save_txt'] = "Save";
3+
$wb['btn_cancel_txt'] = "Cancel";
4+
?>

0 commit comments

Comments
 (0)