From 58efe9c5b23ea8bfd442a7c7fad50c47be6173af Mon Sep 17 00:00:00 2001 From: Daniel Stolt Date: Thu, 7 Aug 2014 03:46:45 +0200 Subject: [PATCH] Fixed a bug with fraction formatting of millisecond component. --- src/Orchard/Localization/Services/DefaultDateFormatter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard/Localization/Services/DefaultDateFormatter.cs b/src/Orchard/Localization/Services/DefaultDateFormatter.cs index 5a79cad86..3197ca3b6 100644 --- a/src/Orchard/Localization/Services/DefaultDateFormatter.cs +++ b/src/Orchard/Localization/Services/DefaultDateFormatter.cs @@ -320,8 +320,8 @@ namespace Orchard.Localization.Services { fraction1Zero = (((decimal)parts.Millisecond) / 1000).ToString("0.0", CultureInfo.InvariantCulture).Substring(2); fraction2Zero = (((decimal)parts.Millisecond) / 1000).ToString("0.00", CultureInfo.InvariantCulture).Substring(2); fraction3Zero = (((decimal)parts.Millisecond) / 1000).ToString("0.000", CultureInfo.InvariantCulture).Substring(2); - fraction1Digit = parts.Millisecond > 0 ? (((decimal)parts.Millisecond) / 1000).ToString("0.#", CultureInfo.InvariantCulture).Substring(2) : ""; - fraction2Digit = parts.Millisecond > 0 ? (((decimal)parts.Millisecond) / 1000).ToString("0.##", CultureInfo.InvariantCulture).Substring(2) : ""; + fraction1Digit = parts.Millisecond >= 50 ? (((decimal)parts.Millisecond) / 1000).ToString("0.#", CultureInfo.InvariantCulture).Substring(2) : ""; + fraction2Digit = parts.Millisecond >= 5 ? (((decimal)parts.Millisecond) / 1000).ToString("0.##", CultureInfo.InvariantCulture).Substring(2) : ""; fraction3Digit = parts.Millisecond > 0 ? (((decimal)parts.Millisecond) / 1000).ToString("0.###", CultureInfo.InvariantCulture).Substring(2) : ""; }