Ticket #8162: Use mailbox names in confirmation alerts

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index 646c820..d20cc60 100644 (file)
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -659,14 +659,14 @@ var DimpBase = {
 
         case 'ctx_folder_empty':
             mbox = baseelt.up('LI').readAttribute('mbox');
-            if (window.confirm(DIMP.text.empty_folder)) {
+            if (window.confirm(DIMP.text.empty_folder.replace(/%s/, mbox))) {
                 DimpCore.doAction('EmptyFolder', { view: mbox }, null, this._emptyFolderCallback.bind(this));
             }
             break;
 
         case 'ctx_folder_delete':
             mbox = baseelt.up('LI').readAttribute('mbox');
-            if (window.confirm(DIMP.text.delete_folder)) {
+            if (window.confirm(DIMP.text.delete_folder.replace(/%s/, mbox))) {
                 DimpCore.doAction('DeleteFolder', { view: mbox }, null, this.bcache.get('folderC') || this.bcache.set('folderC', this._folderCallback.bind(this)));
             }
             break;

diff --git a/imp/lib/DIMP.php b/imp/lib/DIMP.php
index 29874f5..0eb7ba5 100644 (file)
--- a/imp/lib/DIMP.php
+++ b/imp/lib/DIMP.php
@@ -255,8 +255,8 @@ class DIMP
             'rename_prompt' => _("Rename folder to:"),
             'create_prompt' => _("Create folder:"),
             'createsub_prompt' => _("Create subfolder:"),
-            'empty_folder' => _("Permanently delete all messages?"),
-            'delete_folder' => _("Permanently delete this folder?"),
+            'empty_folder' => _("Permanently delete all messages in %s?"),
+            'delete_folder' => _("Permanently delete %s?"),
             'hidealog' => _("Hide Alerts Log"),
             'alog_error' => _("Error"),
             'alog_message' => _("Message"),