From 56c8dedb13126db0d3a4837b382ea94ae934372d Mon Sep 17 00:00:00 2001 From: jerome Morissard Date: Wed, 16 Apr 2014 07:50:26 +0200 Subject: [PATCH] add localize day of the week --- .../CalendarIOS7/CALAgendaViewController.m | 2 +- .../CalendarIOS7/CalendarIOS7/CALMonthHeaderView.m | 7 +++++++ CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.h | 1 + CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.m | 10 ++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) mode change 100644 => 100755 CalendarIOS7/CalendarIOS7/CalendarIOS7/CALAgendaViewController.m mode change 100644 => 100755 CalendarIOS7/CalendarIOS7/CalendarIOS7/CALMonthHeaderView.m mode change 100644 => 100755 CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.h diff --git a/CalendarIOS7/CalendarIOS7/CalendarIOS7/CALAgendaViewController.m b/CalendarIOS7/CalendarIOS7/CalendarIOS7/CALAgendaViewController.m old mode 100644 new mode 100755 index 46cef65..3589268 --- a/CalendarIOS7/CalendarIOS7/CalendarIOS7/CALAgendaViewController.m +++ b/CalendarIOS7/CalendarIOS7/CalendarIOS7/CALAgendaViewController.m @@ -189,7 +189,7 @@ - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView if ([kind isEqualToString:UICollectionElementKindSectionHeader]) { CALMonthHeaderView *monthHeader = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:@"CALMonthHeaderView" forIndexPath:indexPath]; monthHeader.masterLabel.text = [self monthAtIndexPath:indexPath]; - [monthHeader updateWithDayNames:@[@"DIM", @"LUN", @"MAR", @"MER", @"JEU", @"VEN", @"SAM"]]; + [monthHeader updateWithDayNames:[NSDate weekdaySymbols]]; monthHeader.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.95f]; return monthHeader; } diff --git a/CalendarIOS7/CalendarIOS7/CalendarIOS7/CALMonthHeaderView.m b/CalendarIOS7/CalendarIOS7/CalendarIOS7/CALMonthHeaderView.m old mode 100644 new mode 100755 index c185def..045c1c7 --- a/CalendarIOS7/CalendarIOS7/CalendarIOS7/CALMonthHeaderView.m +++ b/CalendarIOS7/CalendarIOS7/CalendarIOS7/CALMonthHeaderView.m @@ -57,6 +57,7 @@ - (void)setup CGFloat yOffset = 44.0f; UILabel *dayOfTheWeekLabel = [[UILabel alloc]initWithFrame:CGRectMake(xOffset,yOffset, CATDayLabelWidth, CATDayLabelHeight)]; + dayOfTheWeekLabel.textAlignment = NSTextAlignmentCenter; [dayOfTheWeekLabel setBackgroundColor:[UIColor clearColor]]; [dayOfTheWeekLabel setFont:[UIFont fontWithName:@"HelveticaNeue-Light" size:15.0f]]; self.day1OfTheWeekLabel = dayOfTheWeekLabel; @@ -64,6 +65,7 @@ - (void)setup xOffset += CATDayLabelWidth + 5.0f; dayOfTheWeekLabel = [[UILabel alloc]initWithFrame:CGRectMake(xOffset,yOffset, CATDayLabelWidth, CATDayLabelHeight)]; + dayOfTheWeekLabel.textAlignment = NSTextAlignmentCenter; [dayOfTheWeekLabel setBackgroundColor:[UIColor clearColor]]; [dayOfTheWeekLabel setFont:[UIFont fontWithName:@"HelveticaNeue-Light" size:15.0f]]; self.day2OfTheWeekLabel = dayOfTheWeekLabel; @@ -71,12 +73,14 @@ - (void)setup xOffset += CATDayLabelWidth + 5.0f; dayOfTheWeekLabel = [[UILabel alloc]initWithFrame:CGRectMake(xOffset,yOffset, CATDayLabelWidth, CATDayLabelHeight)]; + dayOfTheWeekLabel.textAlignment = NSTextAlignmentCenter; [dayOfTheWeekLabel setBackgroundColor:[UIColor clearColor]]; [dayOfTheWeekLabel setFont:[UIFont fontWithName:@"HelveticaNeue-Light" size:15.0f]]; self.day3OfTheWeekLabel = dayOfTheWeekLabel; [self addSubview:self.day3OfTheWeekLabel]; xOffset += CATDayLabelWidth + 5.0f; + dayOfTheWeekLabel.textAlignment = NSTextAlignmentCenter; dayOfTheWeekLabel = [[UILabel alloc]initWithFrame:CGRectMake(xOffset,yOffset, CATDayLabelWidth, CATDayLabelHeight)]; [dayOfTheWeekLabel setBackgroundColor:[UIColor clearColor]]; [dayOfTheWeekLabel setFont:[UIFont fontWithName:@"HelveticaNeue-Light" size:15.0f]]; @@ -84,6 +88,7 @@ - (void)setup [self addSubview:self.day4OfTheWeekLabel]; xOffset += CATDayLabelWidth + 5.0f; + dayOfTheWeekLabel.textAlignment = NSTextAlignmentCenter; dayOfTheWeekLabel = [[UILabel alloc]initWithFrame:CGRectMake(xOffset,yOffset, CATDayLabelWidth, CATDayLabelHeight)]; [dayOfTheWeekLabel setBackgroundColor:[UIColor clearColor]]; [dayOfTheWeekLabel setFont:[UIFont fontWithName:@"HelveticaNeue-Light" size:15.0f]]; @@ -92,6 +97,7 @@ - (void)setup xOffset += CATDayLabelWidth + 5.0f; dayOfTheWeekLabel = [[UILabel alloc]initWithFrame:CGRectMake(xOffset,yOffset, CATDayLabelWidth, CATDayLabelHeight)]; + dayOfTheWeekLabel.textAlignment = NSTextAlignmentCenter; [dayOfTheWeekLabel setBackgroundColor:[UIColor clearColor]]; [dayOfTheWeekLabel setFont:[UIFont fontWithName:@"HelveticaNeue-Light" size:15.0f]]; self.day6OfTheWeekLabel = dayOfTheWeekLabel; @@ -99,6 +105,7 @@ - (void)setup xOffset += CATDayLabelWidth + 5.0f; dayOfTheWeekLabel = [[UILabel alloc]initWithFrame:CGRectMake(xOffset,yOffset, CATDayLabelWidth, CATDayLabelHeight)]; + dayOfTheWeekLabel.textAlignment = NSTextAlignmentCenter; [dayOfTheWeekLabel setBackgroundColor:[UIColor clearColor]]; [dayOfTheWeekLabel setFont:[UIFont fontWithName:@"HelveticaNeue-Light" size:15.0f]]; self.day7OfTheWeekLabel = dayOfTheWeekLabel; diff --git a/CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.h b/CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.h old mode 100644 new mode 100755 index cfc32bd..7e594a7 --- a/CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.h +++ b/CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.h @@ -29,5 +29,6 @@ - (NSDate *)startingDate; - (NSDate *)endingDate; ++ (NSArray *)weekdaySymbols; @end diff --git a/CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.m b/CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.m index adfce3c..5e05270 100755 --- a/CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.m +++ b/CalendarIOS7/CalendarIOS7/CalendarIOS7/NSDate+Agenda.m @@ -147,4 +147,14 @@ - (NSDate *)endingDate return [[NSDate gregorianCalendar] dateFromComponents:components]; } ++ (NSArray *)weekdaySymbols +{ + NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; + NSMutableArray *upper = [NSMutableArray new]; + for (NSString *day in [dateFormatter shortWeekdaySymbols]) { + [upper addObject:day.uppercaseString]; + } + return upper; +} + @end