cleaned up strings

Author: Terry Worona

JBChartViewDemo/JBChartViewDemo.xcodeproj/project.pbxproj

@@ -199,10 +199,10 @@
 				9B6A68DD1829BE63006DB3BF /* JBBarChartViewController.m */,
 				9B07251F1829822A0052109B /* JBChartListViewController.h */,
 				9B0725201829822A0052109B /* JBChartListViewController.m */,
-				9B6A68DF1829BED5006DB3BF /* JBLineChartViewController.h */,
-				9B6A68E01829BED5006DB3BF /* JBLineChartViewController.m */,
 				94BDFC3219F933B2007492F6 /* JBLineChartMissingPointsViewController.h */,
 				94BDFC3319F933B2007492F6 /* JBLineChartMissingPointsViewController.m */,
+				9B6A68DF1829BED5006DB3BF /* JBLineChartViewController.h */,
+				9B6A68E01829BED5006DB3BF /* JBLineChartViewController.m */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";

JBChartViewDemo/JBChartViewDemo/Constants/JBStringConstants.h

@@ -42,8 +42,8 @@
 #pragma mark - Labels (Missing Points Line Chart)
 
 #define kJBStringLabel2014 localize(@"label.2014", @"2014")
-#define kJBStringLabelCyclingCurrentWeek2014 localize(@"label.cycling.2014", @"Cycling - 2014")
-#define kJBStringLabelCyclingCurrentWeekLastWeek2014 localize(@"label.current.last.week.cycling", @"Cycling Current Week and Last Year Week")
+#define kJBStringLabelCyclingDistances localize(@"label.cycling.distances", @"Cycling Distances")
+#define kJBStringLabelCyclingCurrentLastWeek2014 localize(@"label.cycling.current.last.week.2014", @"Current/Last Week - 2014")
 #define kJBStringLabelKm2014 localize(@"label.km", @"Km")
-#define kJBStringLabelLastYear2014 localize(@"label.last.average", @"Last Year")
-#define kJBStringLabelCurrentYear2014 localize(@"label.current.average", @"Current Year")
+#define kJBStringLabelLastWeek localize(@"label.last.week", @"Last Week")
+#define kJBStringLabelCurrentWeek localize(@"label.current.week", @"Current Week")

JBChartViewDemo/JBChartViewDemo/Controllers/JBChartListViewController.m

@@ -76,8 +76,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             type = JBChartTableCellTypeAreaChart;
             break;
         case JBChartListViewControllerRowLineChartMissingPoints:
-            text = kJBStringLabelCyclingCurrentWeek2014;
-            detailText = kJBStringLabelCyclingCurrentWeekLastWeek2014;
+            text = kJBStringLabelCyclingDistances;
+            detailText = kJBStringLabelCyclingCurrentLastWeek2014;
             type = JBChartTableCellTypeLineChart;
             break;
         default:

JBChartViewDemo/JBChartViewDemo/Controllers/JBLineChartMissingPointsViewController.m

@@ -138,7 +138,7 @@ - (void)loadView
     self.lineChartView.backgroundColor = kJBColorLineChartBackground;
 
     JBChartHeaderView *headerView = [[JBChartHeaderView alloc] initWithFrame:CGRectMake(kJBLineChartMissingPointsViewControllerChartPadding, ceil(self.view.bounds.size.height * 0.5) - ceil(kJBLineChartMissingPointsViewControllerChartHeaderHeight * 0.5), self.view.bounds.size.width - (kJBLineChartMissingPointsViewControllerChartPadding * 2), kJBLineChartMissingPointsViewControllerChartHeaderHeight)];
-    headerView.titleLabel.text = [kJBStringLabelCyclingCurrentWeek2014 uppercaseString];
+    headerView.titleLabel.text = [kJBStringLabelCyclingDistances uppercaseString];
     headerView.titleLabel.textColor = kJBColorLineChartHeader;
     headerView.titleLabel.shadowColor = [UIColor colorWithWhite:1.0 alpha:0.25];
     headerView.titleLabel.shadowOffset = CGSizeMake(0, 1);
@@ -224,7 +224,7 @@ - (void)lineChartView:(JBLineChartView *)lineChartView didSelectLineAtIndex:(NSU
         [self.informationView setHidden:YES animated:YES];
     } else {
         [self.informationView setValueText:[NSString stringWithFormat:@"%.2f", [valueNumber floatValue]] unitText:kJBStringLabelKm2014];
-        [self.informationView setTitleText:lineIndex == JBLineChartLineSolid ? kJBStringLabelLastYear2014 : kJBStringLabelCurrentYear2014];
+        [self.informationView setTitleText:lineIndex == JBLineChartLineSolid ? kJBStringLabelLastWeek : kJBStringLabelCurrentWeek];
         [self.informationView setHidden:NO animated:YES];
     }
     [self setTooltipVisible:YES animated:YES atTouchPoint:touchPoint];