Get rid of NSUserDefaults deprecated constants for date and time info…

…rmation.

src/CalendarExtensions.m

@@ -73,8 +73,7 @@ -(NSString *)friendlyDescription
 	}
 	else
 	{
-		NSString * outputFormat = [defaults objectForKey:@"NSShortDateFormatString"];
-		theDate = [self descriptionWithCalendarFormat:outputFormat];
+		theDate = [NSDateFormatter localizedStringFromDate:self dateStyle:NSDateFormatterShortStyle timeStyle:NSDateFormatterNoStyle];
 	}
 
 	// If the time is 12.00 then replace with Noon or Midnight as appropriate.
@@ -91,10 +90,7 @@ -(NSString *)friendlyDescription
 	}
 	else
 	{
-		// Use the user's preferred time format but strip off the seconds.
-		NSMutableString * outputFormat = [NSMutableString stringWithString:[defaults objectForKey:@"NSTimeFormatString"]];
-		[outputFormat replaceOccurrencesOfString:@":%S" withString:@"" options:NSLiteralSearch range:NSMakeRange(0, [outputFormat length])];
-		theTime = [self descriptionWithCalendarFormat:outputFormat];
+		theTime = [NSDateFormatter localizedStringFromDate:self dateStyle:NSDateFormatterNoStyle timeStyle:NSDateFormatterShortStyle];
 	}
 	return [NSString stringWithFormat:NSLocalizedString(@"%@ at %@", nil), theDate, theTime];
 }