1.1

Fixed: long date display in list mode
mchehraz · May 8, 2015 · e019c51 · e019c51
1 parent 9fa86a5
commit e019c51
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/Atf.Core.Text/DateTimeFormatter.cs b/Atf.Core.Text/DateTimeFormatter.cs
@@ -544,6 +544,16 @@ public struct SpecifierInfo {
          }
          return false;
       }
+      public static string Format(string format, DateTimeFormatInfo dateTimeFormat,
+                                                Calendar calendar, DateTime? value) {
+         SpecifierInfo[] specifiers = GetSpecifiers(format);
+         DateTimeFormatter formatter = new DateTimeFormatter(dateTimeFormat, value);
+         StringBuilder sb = new StringBuilder();
+         foreach (var specifier in specifiers) {
+            sb.Append(formatter.GetDisplayText(specifier));
+         }
+         return sb.ToString();
+      }
       public string GetDisplayText(SpecifierInfo specifier) {
          if (specifier.ValueType == ValueType.StringLiteral) {
             return specifier.Symbol;

diff --git a/Atf.UI/DateTimeSelector/DateTimeSelector.cs b/Atf.UI/DateTimeSelector/DateTimeSelector.cs
@@ -64,7 +64,6 @@ public class DateTimeSelector : DropDownControl {
       private RightToLeft calendarRightToLeft = RightToLeft.Inherit;
       private static DateTimeFormatInfo persianFormat;
       private bool usePersianFormat = false;
-
       #endregion
 
       #region Constructors
@@ -255,7 +254,9 @@ public class DateTimeSelector : DropDownControl {
             DateTime? value = this.Value;
             if (value.HasValue) {
                string formatString = this.GetFormatString();
-               return value.Value.ToString(formatString, this.DateTimeFormat);
+               return DateTimeFormatter.Format(formatString, this.DateTimeFormat, this.DateTimeFormat.Calendar,
+                                               this.Value);
+               // return value.Value.ToString(formatString, this.DateTimeFormat);
             }
             return string.Empty;
          }
@@ -423,7 +424,9 @@ public class DateTimeSelector : DropDownControl {
          DateTime? value = this.Value;
          if (value.HasValue) {
             if (!string.IsNullOrEmpty(format)) {
-               return value.Value.ToString(format, this.DateTimeFormat);
+               // return value.Value.ToString(format, this.DateTimeFormat);
+               return DateTimeFormatter.Format(format, this.DateTimeFormat, this.DateTimeFormat.Calendar,
+                                               this.Value);
             }
          }
          return string.Empty;

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 [assembly: NeutralResourcesLanguageAttribute("")]