summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-08-15 11:23:20 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-08-15 11:23:20 -0400
commitcb062e4e0a8f15114ba1df855f179aa37082a71b (patch)
treeecca9fc192e01884ba2a5a8c9cfa0f29e1160e89
parentee290811ec7a0897b80c527747ec6b8a4be6aba9 (diff)
downloadpo-cb062e4e0a8f15114ba1df855f179aa37082a71b.tar.gz
po-cb062e4e0a8f15114ba1df855f179aa37082a71b.tar.bz2
po-cb062e4e0a8f15114ba1df855f179aa37082a71b.zip
[misc] don't print "transferring metadata ... " unless it fails
-rw-r--r--src/include/import.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/include/import.php b/src/include/import.php
index 440c47e..5d6a3c5 100644
--- a/src/include/import.php
+++ b/src/include/import.php
@@ -195,7 +195,6 @@ function transfer_metadata($source_name, $dest_name, $fix_orient, $image_data, &
/* Copy over image tags */
if (is_executable($sys_exiftool)) {
- $output .= "<li>".$strings['import_transferring_metadata']." ... ";
if ($fix_orient) {
$orient = " -Orientation=1 -n ";
} else {
@@ -206,11 +205,9 @@ function transfer_metadata($source_name, $dest_name, $fix_orient, $image_data, &
system($cmdline, $retval);
if ($retval) {
- $output .= "<font color=\"red\">".$strings['generic_failed'].".</font></li>\n";
+ $output .= "<font color=\"red\">".$trings['import_transferring_metadata'] . " " . $strings['generic_failed'].".</font></li>\n";
$output .= "<li><pre>$cmdline</pre></li>\n";
return FALSE;
- } else {
- $output .= $strings['generic_done'].".</li>\n";
}
}
return TRUE;