LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix time format when default is chosen

pull/214/head
Francis Lachapelle 2016-06-10 14:26:34 -04:00
parent 6c2052ab6f
commit d9d8a72651
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -11,6 +11,7 @@ Bug fixes
- [web] properly encode rawsource of cards to avoid XSS issues
- [web] fixed all-day events covering a timezone change (#3457)
- [web] sgTimePicker parser now respects the user's time format and language
- [web] fixed time format when user chooses the default one
- [core] properly handle sorted/deleted calendars (#3723)
- [core] properly handle flattened timezone definitions (#2690)

5
UI/PreferencesUI/UIxPreferences.m
View File

@ -2155,13 +2155,16 @@ static NSArray *reminderValues = nil;
else
[v setObject: [NSNumber numberWithBool: NO] forKey: @"SOGoRememberLastModule"];
// We remove short/long date formats if they are default ones
// We remove short/long date/time formats if they are default ones
if ([[v objectForKey: @"SOGoShortDateFormat"] isEqualToString: @"default"])
[v removeObjectForKey: @"SOGoShortDateFormat"];
if ([[v objectForKey: @"SOGoLongDateFormat"] isEqualToString: @"default"])
[v removeObjectForKey: @"SOGoLongDateFormat"];
if ([[v objectForKey: @"SOGoTimeFormat"] isEqualToString: @"default"])
[v removeObjectForKey: @"SOGoTimeFormat"];
if (![self externalAvatarsEnabled])
{
[v removeObjectForKey: @"SOGoGravatarEnabled"];