diff --git a/NEWS b/NEWS index d4d16ce527..90bb349400 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ 3.1.3 (2016-MM-DD) ------------------ +Enhancements + - [web] always display name of month in week view (#3724) + Bug fixes - [web] fixed generic avatar in lists (#3719) - [web] fixed validation in Sieve filter editor diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m index 64d39a67dd..8cd7629ec2 100644 --- a/UI/Scheduler/UIxCalDayTable.m +++ b/UI/Scheduler/UIxCalDayTable.m @@ -312,35 +312,23 @@ - (NSString *) labelForDay - (NSString *) labelForMonth { - NSCalendarDate *nextDay; NSString *calendarFormat; - BOOL isLastOrFirstDay; + BOOL isFirstDay; - isLastOrFirstDay = NO; + isFirstDay = NO; calendarFormat = @"%b"; if ([currentView hasSuffix: @"dayview"]) { - isLastOrFirstDay = YES; + isFirstDay = YES; calendarFormat = @"%B"; } - else + else if ([currentTableDay dayOfMonth] == 1 || [daysToDisplay indexOfObject: currentTableDay] == 0) { - if ([currentTableDay dayOfMonth] == 1) - { - isLastOrFirstDay = YES; - } - else if ([currentTableDay dayOfMonth] > 27) - { - nextDay = [currentTableDay dateByAddingYears: 0 - months: 0 - days: 1]; - if ([nextDay dayOfMonth] == 1) - isLastOrFirstDay = YES; - } + isFirstDay = YES; } - return isLastOrFirstDay? [currentTableDay descriptionWithCalendarFormat: calendarFormat locale: locale] : nil; + return isFirstDay? [currentTableDay descriptionWithCalendarFormat: calendarFormat locale: locale] : nil; } - (NSString *) labelForDate