From dea284f5715c8efda8a450ca8fffee6d8e78e83a Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Tue, 18 Nov 2008 21:43:38 +0000
Subject: [PATCH] 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
---
interface/web/admin/language_complete.php | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index cdbb55aa41..63c89e7792 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -82,9 +82,22 @@ if(isset($_POST['lng_select']) && $error == '') {
merge_langfile(ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$target_lang_file,ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$lang_file);
}
}
+ $handle2 = opendir(ISPC_WEB_PATH.'/'.$file.'/lib/lang');
+ while ($lang_file = @readdir ($handle2)) {
+ if ($lang_file != '.' && $lang_file != '..' && substr($lang_file,0,2) == $selected_language) {
+ $master_lang_file=ISPC_WEB_PATH.'/'.$file.'/lib/lang/en'.substr($lang_file,2);
+ $target_lang_file=ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$lang_file;
+ if(!file_exists($master_lang_file)){
+ unlink($target_lang_file);
+ $msg.="File $target_lang_file remove because does not exist in master language<br />";
+ }
+ }
+ }//Finish of remove the files how not exists in master language
}
}
}
+if($msg=='')
+$msg="No files created, remove or modified<br />";
}
function merge_langfile($langfile,$masterfile) {
@@ -140,10 +153,6 @@ function merge_langfile($langfile,$masterfile) {
}
}
-
-if($msg=='')
-$msg="No files created or modified<br />";
-
$app->tpl->setVar('msg',$msg);
//* load language file
--
GitLab