diff options
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/controllers/quick.php | 1 | ||||
| -rw-r--r-- | modules/gallery/views/simple_uploader.html.php | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php index 53af2ba6..de027c1b 100644 --- a/modules/gallery/controllers/quick.php +++ b/modules/gallery/controllers/quick.php @@ -127,6 +127,7 @@ class Quick_Controller extends Controller { $msg = t("Deleted photo <b>%title</b>", array("title" => p::purify($item->title))); } + $parent = $item->parent(); $item->delete(); message::success($msg); diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php index 92155434..06a2eaff 100644 --- a/modules/gallery/views/simple_uploader.html.php +++ b/modules/gallery/views/simple_uploader.html.php @@ -255,9 +255,11 @@ function upload_complete(file) { var stats = this.getStats(); - $("#gUploadQueueInfo").text("(<?= t("completed") ?> " + stats.successful_uploads + - " <?= t("of") ?> " + (stats.files_queued + stats.successful_uploads + - stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")"); + var msg = "(<?= t("completed __COMPLETED__ of __TOTAL__") ?>)"; + msg = msg.replace("__COMPLETED__", stats.successful_uploads); + msg = msg.replace("__TOTAL__", stats.files_queued + stats.successful_uploads + + stats.upload_errors + stats.upload_cancelled + stats.queue_errors); + $("#gUploadQueueInfo").text(msg); if (stats.files_queued === 0) { $("#gUploadCancel").hide(); } |