From d9d8a726516d973ea360c8e47cc18123cd95ec08 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 10 Jun 2016 14:26:34 -0400 Subject: [PATCH] Fix time format when default is chosen --- NEWS | 1 + UI/PreferencesUI/UIxPreferences.m | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 90bb34940..13b069475 100644 --- a/NEWS +++ b/NEWS @@ -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) diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index b9c24eed5..91d4a7b96 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -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"];