Changeset 360 for trunk/Cocoa/Pester/Source/PSTimeDateEditor.m

Timestamp:

11/24/07 09:10:41 (16 years ago)

Author:

Nicholas Riley

Message:

Pester.xcodeproj: Add Perl embedding bits; remove SoundFileManager.h.

DynaLoader.a: i386/ppc version from Tiger; Leopard's version causes
Tiger to crash.

Info-Pester.plist: Updated copyright date.

Read Me.rtfd: Remove .typeAttributes.dict, no longer used; update a
bit.

PSTimeDateEditor.m: Switch to NJRDateFormatters again.

NJRDateFormatter.[hm]: Removed old-style date formatter workarounds;
added code for using Date::Manip and trying multiple ICU-based date
formatters.

English.lproj/InfoPlist.strings: Updated copyright date.

English.lproj/MainMenu.nib: Modified date completion menu for items
Date::Manip can parse.

Manip.pm: Date::Manip 5.47, converted to UTF-8.

File:

• trunk/Cocoa/Pester/Source/PSTimeDateEditor.m (modified) (2 diffs)

trunk/Cocoa/Pester/Source/PSTimeDateEditor.m

@@ -14 +14 @@
 + (void)setUpTimeField:(NSTextField *)timeOfDay dateField:(NSTextField *)timeDate completions:(NSPopUpButton *)timeDateCompletions;
 {
-    static NJRDateFormatter *timeFormatter = nil, *dateFormatter = nil;
+    [[NJRDateFormatter alloc] init]; // XXX testing
+    [NSDateFormatter setDefaultFormatterBehavior: NSDateFormatterBehavior10_4];
+    static NSDateFormatter *timeFormatter = nil, *dateFormatter = nil;
     if (timeFormatter == nil) {
-        timeFormatter = [[NJRDateFormatter alloc] initWithDateFormat: [NJRDateFormatter localizedTimeFormatIncludingSeconds: NO] allowNaturalLanguage: YES];
-        dateFormatter = [[NJRDateFormatter alloc] initWithDateFormat: [NJRDateFormatter localizedDateFormatIncludingWeekday: NO] allowNaturalLanguage: YES];
+        timeFormatter = [[NJRDateFormatter timeFormatter] retain];
+        [timeFormatter setLenient: YES];
+        [timeFormatter setDateStyle: NSDateFormatterNoStyle];
+        [timeFormatter setTimeStyle: NSDateFormatterShortStyle];
+        dateFormatter = [[NJRDateFormatter dateFormatter] retain];
+        [dateFormatter setLenient: YES];
+        [dateFormatter setDateStyle: NSDateFormatterLongStyle];
+        [dateFormatter setTimeStyle: NSDateFormatterNoStyle];
     }
     [timeOfDay setFormatter: timeFormatter];
@@ -24 +32 @@
 
     // add completions
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *dayNames = [defaults arrayForKey: NSWeekDayNameArray];
+    NSArray *dayNames = [dateFormatter weekdaySymbols];
     NSArray *completions = [timeDateCompletions itemTitles];
     NSEnumerator *e = [completions objectEnumerator];