Skip to content

Commit dea284f

Browse files
author
fantu
committed
Improved merge in language editor:
- Remove of the file how not exists in master language - Fix the msg show when no file has been created, removed or modified
1 parent 15b7538 commit dea284f

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

interface/web/admin/language_complete.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,22 @@
8282
merge_langfile(ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$target_lang_file,ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$lang_file);
8383
}
8484
}
85+
$handle2 = opendir(ISPC_WEB_PATH.'/'.$file.'/lib/lang');
86+
while ($lang_file = @readdir ($handle2)) {
87+
if ($lang_file != '.' && $lang_file != '..' && substr($lang_file,0,2) == $selected_language) {
88+
$master_lang_file=ISPC_WEB_PATH.'/'.$file.'/lib/lang/en'.substr($lang_file,2);
89+
$target_lang_file=ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$lang_file;
90+
if(!file_exists($master_lang_file)){
91+
unlink($target_lang_file);
92+
$msg.="File $target_lang_file remove because does not exist in master language<br />";
93+
}
94+
}
95+
}//Finish of remove the files how not exists in master language
8596
}
8697
}
8798
}
99+
if($msg=='')
100+
$msg="No files created, remove or modified<br />";
88101
}
89102

90103
function merge_langfile($langfile,$masterfile) {
@@ -140,10 +153,6 @@ function merge_langfile($langfile,$masterfile) {
140153
}
141154
}
142155

143-
144-
if($msg=='')
145-
$msg="No files created or modified<br />";
146-
147156
$app->tpl->setVar('msg',$msg);
148157

149158
//* load language file

0 commit comments

Comments
 (0)