From 767cdc1f6f6a63ce997fc9476911e2c361f9d402 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Wed, 20 Feb 2013 20:33:05 -0500 Subject: Pushing missing changes --- .../Converters/DateTimeToStringConverter.cs | 75 ++++++++++++---------- 1 file changed, 41 insertions(+), 34 deletions(-) (limited to 'MediaBrowser.UI/Converters/DateTimeToStringConverter.cs') diff --git a/MediaBrowser.UI/Converters/DateTimeToStringConverter.cs b/MediaBrowser.UI/Converters/DateTimeToStringConverter.cs index 6c568c061..f0c93e7d5 100644 --- a/MediaBrowser.UI/Converters/DateTimeToStringConverter.cs +++ b/MediaBrowser.UI/Converters/DateTimeToStringConverter.cs @@ -1,34 +1,41 @@ -using System; -using System.Globalization; -using System.Windows.Data; - -namespace MediaBrowser.UI.Converters -{ - public class DateTimeToStringConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - var date = (DateTime)value; - - string format = parameter as string; - - if (string.IsNullOrEmpty(format)) - { - return date.ToString(); - } - - if (format.Equals("shorttime", StringComparison.OrdinalIgnoreCase)) - { - return date.ToShortTimeString(); - } - - return date.ToString(format); - } - - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} +using System; +using System.Globalization; +using System.Windows.Data; + +namespace MediaBrowser.UI.Converters +{ + public class DateTimeToStringConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + var date = (DateTime)value; + + string format = parameter as string; + + if (string.IsNullOrEmpty(format)) + { + return date.ToString(); + } + + // If a theme asks for this, they know it's only going to work if the current culture is en-us + if (format.Equals("timesuffixlower", StringComparison.OrdinalIgnoreCase)) + { + if (CultureInfo.CurrentCulture.Name.Equals("en-US", StringComparison.OrdinalIgnoreCase)) + { + var time = date.ToString("t"); + var values = time.Split(' '); + return values[values.Length - 1].ToLower(); + } + return string.Empty; + } + + return date.ToString(format); + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} -- cgit v1.2.3