Commit 15b75382 authored by fantu's avatar fantu

Improved merge in language editor:

- Not show line of added string if string added is 0
- If no files has been created or modified show rispective message
parent fb02f0b5
......@@ -128,7 +128,8 @@ function merge_langfile($langfile,$masterfile) {
$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 />";
......@@ -140,7 +141,8 @@ function merge_langfile($langfile,$masterfile) {
}
if($msg=='')
$msg="No files created or modified<br />";
$app->tpl->setVar('msg',$msg);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment