From 15b75382f3b8cf273d49b8537e086b2506a2e62b Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Tue, 18 Nov 2008 15:47:40 -0500
Subject: [PATCH] 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
---
interface/web/admin/language_complete.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index b0e36fe..cdbb55a 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -128,7 +128,8 @@
$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 @@
}
-
+if($msg=='')
+$msg="No files created or modified<br />";
$app->tpl->setVar('msg',$msg);
--
Gitblit v1.9.1