From 1cce51d66d2f10b3d7a45b2b0362c46d808a81bf Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sat, 8 Nov 2014 17:26:09 +0000 Subject: [PATCH] extensions: Timestamps < 24h ago can also be yesterday --- SparkleLib/Git/SparkleRepoGit.cs | 3 +-- SparkleLib/SparkleExtensions.cs | 13 +++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index 2dcb7cf0..687cac2d 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -1098,8 +1098,7 @@ namespace SparkleLib.Git { private List ParseStatus () { List changes = new List (); - int count = 0; - + SparkleGit git_status = new SparkleGit (LocalPath, "status --porcelain"); git_status.Start (); diff --git a/SparkleLib/SparkleExtensions.cs b/SparkleLib/SparkleExtensions.cs index 5e3d50c5..e0c936a0 100755 --- a/SparkleLib/SparkleExtensions.cs +++ b/SparkleLib/SparkleExtensions.cs @@ -80,17 +80,18 @@ namespace SparkleLib { public static string ToPrettyDate (this DateTime timestamp) { - TimeSpan time_diff = DateTime.Now.Subtract(timestamp); + TimeSpan time_diff = DateTime.Now.Subtract (timestamp); int day_diff = (int) time_diff.TotalDays; - - if (day_diff == 0) { - return "at " + timestamp.ToString ("HH:mm"); + DateTime yesterday = DateTime.Today.AddDays (-1); - } else if (day_diff == 1) { + if (timestamp >= yesterday && timestamp < DateTime.Today) { return "yesterday at " + timestamp.ToString ("HH:mm"); + + } else if (day_diff == 0) { + return "today at " + timestamp.ToString ("HH:mm"); } else if (day_diff < 7) { - return timestamp.ToString ("dddd"); + return timestamp.ToString ("dddd"); } else if (day_diff < 31) { if (day_diff < 14)