Merge branch 'master' of github.com:openplans/OpenTripPlanner-iOS

Conflicts: OpenTripPlanner/MainStoryboard_iPhone.storyboard
opentripplanner · Oct 22, 2012 · 7842337 · 7842337
2 parents 21ffe89 + f714e5d
commit 7842337
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/OpenTripPlanner/MainStoryboard_iPhone.storyboard b/OpenTripPlanner/MainStoryboard_iPhone.storyboard
@@ -350,7 +350,7 @@
                                             <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         </label>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" restorationIdentifier="" text="Distance" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xAH-6a-vIk">
-                                            <rect key="frame" x="178" y="31" width="103" height="21"/>
+                                            <rect key="frame" x="205" y="31" width="103" height="21"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -392,7 +392,7 @@
                                             <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         </label>
                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" restorationIdentifier="" text="NumberOfStops" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="OBZ-yK-DhL">
-                                            <rect key="frame" x="191" y="32" width="94" height="21"/>
+                                            <rect key="frame" x="205" y="32" width="94" height="21"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>

diff --git a/OpenTripPlanner/OTPItineraryTableViewController.m b/OpenTripPlanner/OTPItineraryTableViewController.m
@@ -223,7 +223,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
             cell.iconLabel.text = leg.route;
             cell.instructionLabel.text = [NSString stringWithFormat: @"%@ twds %@", leg.mode.capitalizedString, leg.headsign.capitalizedString];
-            cell.departureTimeLabel.text = [NSString stringWithFormat:@"%@", [dateFormatter stringFromDate:leg.startTime]];
+            cell.departureTimeLabel.text = [NSString stringWithFormat:@"Departs %@", [dateFormatter stringFromDate:leg.startTime]];
 
             int intermediateStops = leg.intermediateStops.count + 1;
             NSString *stopUnitLabel = intermediateStops == 1 ? @"stop" : @"stops";