Skip to content
This repository has been archived by the owner on Dec 24, 2022. It is now read-only.

Commit

Permalink
Ensure DateTime.ToString uses CultureInfo.InvariantCulture
Browse files Browse the repository at this point in the history
  • Loading branch information
mythz committed Mar 22, 2017
1 parent c16cb23 commit 0c970d3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/ServiceStack.Text/Common/DateTimeSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ private static string RepairXsdTimeSeparator(string dateTimeStr)

public static string ToDateTimeString(DateTime dateTime)
{
return dateTime.ToStableUniversalTime().ToString(XsdDateTimeFormat);
return dateTime.ToStableUniversalTime().ToString(XsdDateTimeFormat, CultureInfo.InvariantCulture);
}

public static DateTime ParseDateTime(string dateTimeStr)
Expand Down Expand Up @@ -446,7 +446,7 @@ public static string ToShortestXsdDateTimeString(DateTime dateTime)

var isStartOfDay = timeOfDay.Ticks == 0;
if (isStartOfDay && !JsConfig.SkipDateTimeConversion)
return dateTime.ToString(ShortDateTimeFormat);
return dateTime.ToString(ShortDateTimeFormat, CultureInfo.InvariantCulture);

var hasFractionalSecs = (timeOfDay.Milliseconds != 0)
|| (timeOfDay.Ticks % TimeSpan.TicksPerMillisecond != 0);
Expand All @@ -455,25 +455,25 @@ public static string ToShortestXsdDateTimeString(DateTime dateTime)
{
if (!hasFractionalSecs)
return dateTime.Kind == DateTimeKind.Local
? dateTime.ToString(DateTimeFormatSecondsUtcOffset)
? dateTime.ToString(DateTimeFormatSecondsUtcOffset, CultureInfo.InvariantCulture)
: dateTime.Kind == DateTimeKind.Unspecified
? dateTime.ToString(DateTimeFormatSecondsNoOffset)
: dateTime.ToStableUniversalTime().ToString(XsdDateTimeFormatSeconds);
? dateTime.ToString(DateTimeFormatSecondsNoOffset, CultureInfo.InvariantCulture)
: dateTime.ToStableUniversalTime().ToString(XsdDateTimeFormatSeconds, CultureInfo.InvariantCulture);

return dateTime.Kind == DateTimeKind.Local
? dateTime.ToString(DateTimeFormatTicksUtcOffset)
? dateTime.ToString(DateTimeFormatTicksUtcOffset, CultureInfo.InvariantCulture)
: dateTime.Kind == DateTimeKind.Unspecified
? dateTime.ToString(DateTimeFormatTicksNoUtcOffset)
: PclExport.Instance.ToXsdDateTimeString(dateTime);
}

if (!hasFractionalSecs)
return dateTime.Kind != DateTimeKind.Utc
? dateTime.ToString(DateTimeFormatSecondsUtcOffset)
? dateTime.ToString(DateTimeFormatSecondsUtcOffset, CultureInfo.InvariantCulture)
: dateTime.ToStableUniversalTime().ToString(XsdDateTimeFormatSeconds);

return dateTime.Kind != DateTimeKind.Utc
? dateTime.ToString(DateTimeFormatTicksUtcOffset)
? dateTime.ToString(DateTimeFormatTicksUtcOffset, CultureInfo.InvariantCulture)
: PclExport.Instance.ToXsdDateTimeString(dateTime);
}

Expand Down

0 comments on commit 0c970d3

Please sign in to comment.