Changeset 358

Timestamp:

11/24/07 03:03:52 (16 years ago)

Author:

Nicholas Riley

Message:

PSAlarm.m: Use 10.4-style (ICU-based) date formatters, which pick up format changes automatically. Still some un-localized bits for intervals and "on"/"at".

File:

• trunk/Cocoa/Pester/Source/PSAlarm.m (modified) (5 diffs)

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -11 +11 @@
 #import "PSAlerts.h"
 #import "PSTimer.h"
-#import "NJRDateFormatter.h"
 #import "NSCalendarDate-NJRExtensions.h"
 #import "NSDictionary-NJRExtensions.h"
@@ -29 +28 @@
 static NSString * const PLAlarmRepeating = @"repeating"; // NSNumber
 
-static NSString *dateFormat, *shortDateFormat, *timeFormat;
-static NSDictionary *locale;
+static NSDateFormatter *dateFormatter, *shortDateFormatter, *timeFormatter;
 
 @implementation PSAlarm
@@ -36 +34 @@
 #pragma mark initialize-release
 
-+ (void)initialize; // XXX change on locale modification, subscribe to NSNotifications
-{
-    dateFormat = [[NJRDateFormatter localizedDateFormatIncludingWeekday: YES] retain];
-    shortDateFormat = [[NJRDateFormatter localizedShortDateFormatIncludingWeekday: NO] retain];
-    timeFormat = [[NJRDateFormatter localizedTimeFormatIncludingSeconds: YES] retain];
-    locale = [[[NSUserDefaults standardUserDefaults] dictionaryRepresentation] retain];
++ (void)initialize;
+{
+    [NSDateFormatter setDefaultFormatterBehavior: NSDateFormatterBehavior10_4];
+    dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setTimeStyle: NSDateFormatterNoStyle];
+    [dateFormatter setDateStyle: NSDateFormatterFullStyle];
+    shortDateFormatter = [[NSDateFormatter alloc] init];
+    [shortDateFormatter setTimeStyle: NSDateFormatterNoStyle];
+    [shortDateFormatter setDateStyle: NSDateFormatterShortStyle];
+    timeFormatter = [[NSDateFormatter alloc] init];
+    [timeFormatter setTimeStyle: NSDateFormatterMediumStyle];
+    [timeFormatter setDateStyle: NSDateFormatterNoStyle];
 }
 
@@ -291 +295 @@
 - (NSString *)dateString;
 {
-    return [[self date] descriptionWithCalendarFormat: dateFormat locale: locale];
+    return [dateFormatter stringFromDate: [self date]];
 }
 
 - (NSString *)shortDateString;
 {
-    return [[self date] descriptionWithCalendarFormat: shortDateFormat locale: locale];
+    return [shortDateFormatter stringFromDate: [self date]];
 }
 
 - (NSString *)timeString;
 {
-    return [[self date] descriptionWithCalendarFormat: timeFormat locale: locale];
+    return [timeFormatter stringFromDate: [self date]];
 }
 
@@ -316 +320 @@
         NSCalendarDate *date = [[NSCalendarDate alloc] initWithTimeIntervalSinceNow: [self interval]];
         NSString *nextDateTimeString = [NSString stringWithFormat: @"%@ at %@",
-            [date descriptionWithCalendarFormat: dateFormat locale: locale],
-            [date descriptionWithCalendarFormat: timeFormat locale: locale]];
+                                        [dateFormatter stringFromDate: date],
+                                        [timeFormatter stringFromDate: date]];
         [date release];
         return nextDateTimeString;