Skip to content

Commit 15b7538

Browse files
author
fantu
committed
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
1 parent fb02f0b commit 15b7538

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

interface/web/admin/language_complete.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ function merge_langfile($langfile,$masterfile) {
128128
$file_content .= '$wb['."'$key'".'] = '."'$val';\n";
129129
}
130130
$file_content .= "?>\n";
131-
131+
132+
if($n!=0)
132133
$msg .= "Added $n lines to the file $langfile<br />";
133134
if($r!=0)
134135
$msg .= "Removed $r lines to the file $langfile<br />";
@@ -140,7 +141,8 @@ function merge_langfile($langfile,$masterfile) {
140141
}
141142

142143

143-
144+
if($msg=='')
145+
$msg="No files created or modified<br />";
144146

145147
$app->tpl->setVar('msg',$msg);
146148

0 commit comments

Comments
 (0)