(fix) use proper values for short/long date formats

This commit is contained in:
Ludovic Marcotte
2015-07-29 19:10:03 -04:00
parent b73450e992
commit 0fc7c96924
2 changed files with 11 additions and 3 deletions
+2 -2
View File
@@ -51,8 +51,8 @@
SOGoTimeFormat = "%H:%M";
SOGoFirstDayOfWeek = 0;
SOGoFirstWeekOfYear = "January1";
SOGoShortDateFormat = "default";
SOGoLongDateFormat = "default";
SOGoShortDateFormat = "%d-%b-%y";
SOGoLongDateFormat = "%A, %B %d, %Y";
SOGoIMAPServer = "localhost";
SOGoMailDomain = "localhost";
+9 -1
View File
@@ -257,7 +257,7 @@ static NSArray *reminderValues = nil;
unsigned int nbr;
BOOL done;
shortDateFormatsList = [NSMutableArray arrayWithObject: @"default"];
shortDateFormatsList = [NSMutableArray array];
nbr = 0;
done = NO;
@@ -2086,6 +2086,14 @@ static NSArray *reminderValues = nil;
// We convert our object into a mutable one
v = [[v mutableCopy] autorelease];
// We remove short/long date formats if they are default ones
if ([[v objectForKey: @"SOGoShortDateFormat"] isEqualToString: @"default"])
[v removeObjectForKey: @"SOGoShortDateFormat"];
if ([[v objectForKey: @"SOGoLongDateFormat"] isEqualToString: @"default"])
[v removeObjectForKey: @"SOGoLongDateFormat"];
//
// We sanitize mail labels
//