Merge pull request #114 from jwarmkessel/master

Fixing a bug that prevents updates to text for the All Set! page.

Author: YuanZhu-apple

APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCAllSetContentViewController.m

@@ -109,25 +109,24 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     switch (indexPath.row) {
         case APCAllSetRowActivities:
         {
-            NSString *original = NSLocalizedString(@"You’ll find your list of daily surveys and tasks on the “Activities” tab. New surveys and tasks will appear over the next few weeks.",
-                                                   @"You’ll find your list of daily surveys and tasks on the “Activities” tab. New surveys and tasks will appear over the next few weeks.");
+            NSString *original = NSLocalizedString(@"You’ll find your list of daily surveys and tasks on the “Activities” tab. New surveys and tasks will appear over the next few weeks.", nil);
+
+            cell.originalText = original;
 
-            if (self.textBlocks) {
-                for (NSDictionary *textBlock in self.textBlocks) {
-                    if (textBlock[kAllSetActivitiesTextOriginal]) {
+            if (self.textBlocks)
+            {
+                for (NSDictionary *textBlock in self.textBlocks)
+                {
+                    if (textBlock[kAllSetActivitiesTextOriginal])
+                    {
                         cell.originalText = textBlock[kAllSetActivitiesTextOriginal];
-                    } else {
-                        cell.originalText = original;
                     }
 
-                    if (textBlock[kAllSetActivitiesTextAdditional]) {
+                    if (textBlock[kAllSetActivitiesTextAdditional])
+                    {
                         cell.additonalText = textBlock[kAllSetActivitiesTextAdditional];
-                    } else {
-                        cell.additonalText = nil;
-                    }
+                    } 
                 }
-            } else {
-                cell.originalText = original;
             }
 
             cell.icon = [UIImage imageNamed:@"tab_activities_selected"];
@@ -136,8 +135,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
         default:
         {
-            NSString *original = NSLocalizedString(@"To see your results from surveys and tasks, check your “Dashboard” tab.",
-                                                   @"To see your results from surveys and tasks, check your “Dashboard” tab.");
+            NSString *original = NSLocalizedString(@"To see your results from surveys and tasks, check your “Dashboard” tab.", nil);
 
             if (self.textBlocks) {
                 for (NSDictionary *textBlock in self.textBlocks) {