Skip to content

Commit bc7f205

Browse files
committed
1 parent bf3d2ec commit bc7f205

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

Extensions/XEP-0009/XMPPIQ+JabberRPCResonse.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,10 @@ -(NSDictionary *)parseMember:(NSXMLElement *)memberElement {
236236

237237
- (NSDate *)parseDateString: (NSString *)dateString withFormat: (NSString *)format {
238238
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
239-
NSDate *result = nil;
240-
239+
[dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
241240
[dateFormatter setDateFormat: format];
242241

243-
result = [dateFormatter dateFromString: dateString];
244-
242+
NSDate *result = [dateFormatter dateFromString: dateString];
245243

246244
return result;
247245
}

Extensions/XEP-0082/NSDate+XMPPDateTimeProfiles.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ - (NSString *)xmppStringWithDateFormat:(NSString *)dateFormat
6767
{
6868
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
6969
[dateFormatter setFormatterBehavior:NSDateFormatterBehavior10_4];
70+
[dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
7071
[dateFormatter setDateFormat:dateFormat];
7172
[dateFormatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
7273

Extensions/XEP-0082/XMPPDateTimeProfiles.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ + (NSDate *)parseDate:(NSString *)dateStr
4747

4848
NSDateFormatter *df = [self threadDateFormatter];
4949
[df setFormatterBehavior:NSDateFormatterBehavior10_4]; // Use unicode patterns (as opposed to 10_3)
50-
[df setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US"]]; //Bypass NSDateFormatter locale bug
50+
[df setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
5151
[df setDateFormat:@"yyyy-MM-dd"];
5252

5353
NSDate *result = [df dateFromString:dateStr];
@@ -87,7 +87,7 @@ + (NSDate *)parseTime:(NSString *)timeStr
8787

8888
NSDateFormatter *df = [self threadDateFormatter];
8989
[df setFormatterBehavior:NSDateFormatterBehavior10_4]; // Use unicode patterns (as opposed to 10_3)
90-
[df setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US"]]; //Bypass NSDateFormatter locale bug
90+
[df setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
9191
[df setDateFormat:@"yyyy-MM-dd"];
9292

9393
NSString *today = [df stringFromDate:[NSDate date]];
@@ -191,7 +191,7 @@ + (NSDate *)parseDateTime:(NSString *)dateTimeStr withMandatoryTimeZone:(BOOL)ma
191191

192192
NSDateFormatter *df = [self threadDateFormatter];
193193
[df setFormatterBehavior:NSDateFormatterBehavior10_4]; // Use unicode patterns (as opposed to 10_3)
194-
[df setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US"]]; //Bypass NSDateFormatter locale bug
194+
[df setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
195195
[df setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss"];
196196

197197
NSDate *result = nil;

Extensions/XEP-0202/XMPPTime.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ + (NSXMLElement *)timeElementFromDate:(NSDate *)date
453453

454454
NSDateFormatter *df = [[NSDateFormatter alloc] init];
455455
[df setFormatterBehavior:NSDateFormatterBehavior10_4]; // Use unicode patterns (as opposed to 10_3)
456+
[df setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
456457
[df setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss'Z'"];
457458
[df setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
458459

Extensions/XEP-0203/NSXMLElement+XEP_0203.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ - (NSDate *)delayedDeliveryDate
6969

7070
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
7171
[dateFormatter setFormatterBehavior:NSDateFormatterBehavior10_4];
72+
[dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
7273
[dateFormatter setDateFormat:@"yyyyMMdd'T'HH:mm:ss"];
7374
[dateFormatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"GMT"]];
7475

0 commit comments

Comments
 (0)