Fix support for SOGoSieveFolderEncoding defaults

Fixed the following bugs in the mail filter editor:

1. Sieve folder encoding not respecting the SOGoSieveFolderEncoding
system defaults;
2. Conditions are still displayed when rule affects all messages;
3. Missing custom mail labels to "flag with" action.
This commit is contained in:
Francis Lachapelle
2016-11-17 09:41:15 -05:00
parent 5f70555975
commit baf1d44548
7 changed files with 36 additions and 9 deletions
@@ -319,11 +319,27 @@
"Header" = "Header";
"Body" = "Body";
"Flag the message with" = "Flag the message with";
/* Select field label of "flag message" mail filter action */
"Flag" = "Flag";
"Discard the message" = "Discard the message";
"File the message in" = "File the message in";
/* Select field label of "file message" mail filter action */
"Mailbox" = "Mailbox";
"Keep the message" = "Keep the message";
"Forward the message to" = "Forward the message to";
/* Input field label of "forward" mail filter action */
"Email" = "Email";
"Send a reject message" = "Send a reject message";
/* Input field label of "reject" mail filter action */
"Message" = "Message";
"Send a vacation message" = "Send a vacation message";
"Stop processing filter rules" = "Stop processing filter rules";
"is under" = "is under";
-5
View File
@@ -111,9 +111,4 @@
return [labels jsonRepresentation];
}
- (NSString *) sieveFolderEncoding
{
return [[SOGoSystemDefaults sharedSystemDefaults] sieveFolderEncoding];
}
@end
+8
View File
@@ -1622,6 +1622,14 @@ static NSArray *reminderValues = nil;
userCanChangePassword];
}
//
// Used wox by template
//
- (NSString *) sieveFolderEncoding
{
return [[SOGoSystemDefaults sharedSystemDefaults] sieveFolderEncoding];
}
// - (NSString *) localeCode
// {
// // WARNING : NSLocaleCode is not defined in <Foundation/NSUserDefaults.h>