From 9cd4b1bc5899a6bf2d3b22dc96268f1642989583 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Sun, 08 May 2016 03:31:46 -0400 Subject: [PATCH] Display different confirmation text when moving messages to Trash (#5220) --- CHANGELOG | 1 + program/localization/en_US/messages.inc | 1 + program/steps/mail/move_del.inc | 2 +- 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 47b3e82..1571d5b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Display different confirmation text when moving messages to Trash (#5220) - Indicate that a collapsed thread has flagged children (#5013) - Implemented message/rfc822 attachment preview - Update to jsTimezoneDetect 1.0.6 diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index a3f7095..8c2428f 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -176,6 +176,7 @@ $messages['savedsearchcreateerror'] = 'Could not create saved search.'; $messages['messagedeleted'] = 'Message(s) deleted successfully.'; $messages['messagemoved'] = 'Message(s) moved successfully.'; +$messages['messagemovedtotrash'] = 'Message(s) moved to Trash successfully.'; $messages['messagecopied'] = 'Message(s) copied successfully.'; $messages['messagemarked'] = 'Message(s) marked successfully.'; $messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.'; diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index 0856a26..88aff2c 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -56,7 +56,7 @@ $OUTPUT->send(); } else { - $OUTPUT->show_message('messagemoved', 'confirmation'); + $OUTPUT->show_message($target == $trash ? 'messagemovedtotrash' : 'messagemoved', 'confirmation'); } if (!empty($_POST['_refresh'])) { -- Gitblit v1.9.1