(js) Show message when emptying the trash

pull/186/head
Francis Lachapelle 2015-12-21 21:16:20 -05:00
parent 39510a3242
commit 662201a428
2 changed files with 36 additions and 9 deletions

View File

@ -21,6 +21,7 @@
"Options" = "Options";
"Close" = "Close";
"Size" = "Size";
/* Tooltips */
"Send this message now" = "Send this message now";
"Select a recipient from an Address Book" = "Select a recipient from an Address Book";
@ -40,6 +41,7 @@
"Unread" = "Unread";
"Flagged" = "Flagged";
"Search multiple mailboxes" = "Search multiple mailboxes";
/* Main Frame */
"Home" = "Home";
"Calendar" = "Calendar";
@ -47,6 +49,7 @@
"Mail" = "Mail";
"Right Administration" = "Right Administration";
"Help" = "Help";
/* Mail account main windows */
"Welcome to the SOGo Mailer. Use the folder tree on the left to browse your mail accounts!" = "Welcome to the SOGo Mailer. Use the folder tree on the left to browse your mail accounts!";
"Read messages" = "Read messages";
@ -54,8 +57,16 @@
"Share" = "Share";
"Account" = "Account";
"Shared Account" = "Shared Account";
/* Empty right pane */
"No message selected" = "No message selected";
/* Mailbox actions */
/* Compact Folder success message */
"Folder compacted" = "Folder compacted";
/* Empty Trash success message */
"Trash emptied" = "Trash emptied";
/* acls */
"Access rights to" = "Access rights to";
"For user" = "For user";
@ -75,6 +86,7 @@
"Saved Messages.zip" = "Saved Messages.zip";
"Update" = "Update";
"Cancel" = "Cancel";
/* Mail edition */
"From" = "From";
"Subject" = "Subject";
@ -109,12 +121,14 @@
"This mail is being sent from an unsecure network!" = "This mail is being sent from an unsecure network!";
"Address Book" = "Address Book";
"Search For" = "Search For";
/* Popup "show" */
"all" = "all";
"read" = "read";
"unread" = "unread";
"deleted" = "deleted";
"flagged" = "flagged";
/* MailListView */
"Sender" = "Sender";
"Subject or Sender" = "Subject or Sender";
@ -135,6 +149,7 @@
"Mark Unread" = "Mark Unread";
"Mark Read" = "Mark Read";
"Untitled" = "Untitled";
/* Tree */
"SentFolderName" = "Sent";
"TrashFolderName" = "Trash";
@ -142,15 +157,19 @@
"DraftsFolderName" = "Drafts";
"SieveFolderName" = "Filters";
"Folders" = "Folders"; /* title line */
/* MailMoveToPopUp */
"MoveTo" = "Move …";
/* Address Popup menu */
"Add to Address Book..." = "Add to Address Book...";
"Compose Mail To" = "Compose Mail To";
"Create Filter From Message..." = "Create Filter From Message...";
/* Image Popup menu */
"Save Image" = "Save Image";
"Save Attachment" = "Save Attachment";
/* Mailbox popup menus */
"Open in New Mail Window" = "Open in New Mail Window";
"Copy Folder Location" = "Copy Folder Location";
@ -167,10 +186,12 @@
"Get Messages for Account" = "Get Messages for Account";
"Properties..." = "Properties...";
"Delegation..." = "Delegation...";
/* Use This Folder menu */
"Sent Messages" = "Sent Messages";
"Drafts" = "Drafts";
"Deleted Messages" = "Deleted Messages";
/* Message list popup menu */
"Open Message In New Window" = "Open Message In New Window";
"Reply to Sender Only" = "Reply to Sender Only";
@ -186,11 +207,14 @@
"Print..." = "Print...";
"Delete Message" = "Delete Message";
"Delete Selected Messages" = "Delete Selected Messages";
/* Number of selected messages in list */
"selected" = "selected";
"This Folder" = "This Folder";
/* Label popup menu */
"None" = "None";
/* Mark popup menu */
"As Read" = "As Read";
"Thread As Read" = "Thread As Read";
@ -211,6 +235,7 @@
"results found" = "results found";
"result found" = "result found";
"Please specify at least one filter" = "Please specify at least one filter";
/* Folder operations */
"Name" = "Name";
"Enter the new name of your folder"
@ -239,9 +264,11 @@
= "Moving a message into its own folder is impossible!";
"Copying a message into its own folder is impossible!"
= "Copying a message into its own folder is impossible!";
/* Message operations */
"The messages could not be moved to the trash folder. Would you like to delete them immediately?"
= "The messages could not be moved to the trash folder. Would you like to delete them immediately?";
/* Message editing */
"error_missingsubject" = "The message has no subject. Are you sure you want to send it?";
"error_missingrecipients" = "Please specify at least one recipient.";
@ -249,10 +276,12 @@
"Error while saving the draft" = "Error while saving the draft";
"Error while uploading the file \"%{0}\":" = "Error while uploading the file \"%{0}\":";
"There is an active file upload. Closing the window will interrupt it." = "There is an active file upload. Closing the window will interrupt it.";
/* Message sending */
"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
"cannot send message (smtp) - recipients discarded" = "Cannot send message. The following addresses are invalid";
"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";
/* Contacts list in mail editor */
"Email" = "Email";
"More mail options" = "More mail options";

View File

@ -221,8 +221,8 @@
vm.editMode = false;
vm.showingAdvancedSearch = false;
vm.service.$virtualMode = false;
// Close sidenav on small devices
if ($mdMedia('sm'))
// Close sidenav on small devices
if ($mdMedia('xs'))
$mdSidenav('left').close();
$state.go('mail.account.mailbox', { accountId: account.id, mailboxId: encodeUriFilter(folder.path) });
}
@ -231,8 +231,6 @@
folder.$rename()
.then(function(data) {
vm.editMode = false;
}, function(data, status) {
Dialog.alert(l('Warning'), data);
});
}
@ -248,9 +246,11 @@
function emptyTrashFolder(folder) {
folder.$emptyTrash().then(function() {
// Success
}, function(error) {
Dialog.alert(l('Warning'), error);
$mdToast.show(
$mdToast.simple()
.content(l('Trash emptied'))
.position('top right')
.hideDelay(3000));
});
}
@ -312,8 +312,6 @@
function setFolderAs(folder, type) {
folder.$setFolderAs(type).then(function() {
folder.$account.$getMailboxes({reload: true});
}, function(error) {
Dialog.alert(l('Warning'), error);
});
}