From 626636f5b5874a48a3a016b8998e66a2fb94d70b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 17 Mar 2009 09:32:54 -0400
Subject: [PATCH] Updated de language files.

---
 interface/web/admin/language_complete.php |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index 4f45724..7ae926f 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -82,9 +82,22 @@
 						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 removed 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, removed or modified<br />";
 }
 
 function merge_langfile($langfile,$masterfile) {
@@ -112,6 +125,14 @@
 				$n++;
 			}
 		}
+		
+		$r = 0;
+		foreach($wb as $key => $val) {
+			if(!isset($wb_master[$key])) {
+				unset($wb[$key]);
+				$r++;
+			}
+		}
 	
 		$file_content = "<?php\n";
 		foreach($wb as $key => $val) {
@@ -120,17 +141,17 @@
 			$file_content .= '$wb['."'$key'".'] = '."'$val';\n";
 		}
 		$file_content .= "?>\n";
-	
+		
+		if($n!=0)
 		$msg .= "Added $n lines to the file $langfile<br />";
+		if($r!=0)
+		$msg .= "Removed $r lines to the file $langfile<br />";
 		file_put_contents($langfile ,$file_content);
 	} else {
 		$msg .= "File does not exist yet. Copied file $masterfile to $langfile<br />";
 		copy($masterfile,$langfile);
 	}
 }
-
-
-
 
 $app->tpl->setVar('msg',$msg);
 

--
Gitblit v1.9.1