Skip to content

Commit f42b096

Browse files
authored
Fixed an issue with the way dates were displayed in the app (#2092)
1 parent 8bc30c8 commit f42b096

File tree

1 file changed

+4
-42
lines changed

1 file changed

+4
-42
lines changed

Files/Filesystem/ListedItem.cs

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public DateTimeOffset ItemDateModifiedReal
119119
get => _itemDateModifiedReal;
120120
set
121121
{
122-
ItemDateModified = GetFriendlyDate(value);
122+
ItemDateModified = GetFriendlyDateFromFormat(value, DateReturnFormat);
123123
_itemDateModifiedReal = value;
124124
}
125125
}
@@ -131,7 +131,7 @@ public DateTimeOffset ItemDateCreatedReal
131131
get => _itemDateCreatedReal;
132132
set
133133
{
134-
ItemDateCreated = GetFriendlyDate(value);
134+
ItemDateCreated = GetFriendlyDateFromFormat(value, DateReturnFormat);
135135
_itemDateCreatedReal = value;
136136
}
137137
}
@@ -143,7 +143,7 @@ public DateTimeOffset ItemDateAccessedReal
143143
get => _itemDateAccessedReal;
144144
set
145145
{
146-
ItemDateAccessed = GetFriendlyDate(value);
146+
ItemDateAccessed = GetFriendlyDateFromFormat(value, DateReturnFormat);
147147
_itemDateAccessedReal = value;
148148
}
149149
}
@@ -182,49 +182,11 @@ public ListedItem(string folderRelativeId, string dateReturnFormat = null)
182182

183183
private string DateReturnFormat { get; }
184184

185-
private string GetFriendlyDate(DateTimeOffset d)
186-
{
187-
var elapsed = DateTimeOffset.Now - d;
188-
189-
if (elapsed.TotalDays > 7)
190-
{
191-
return d.ToString(DateReturnFormat);
192-
}
193-
else if (elapsed.TotalDays > 2)
194-
{
195-
return string.Format(ResourceController.GetTranslation("DaysAgo"), elapsed.Days);
196-
}
197-
else if (elapsed.TotalDays > 1)
198-
{
199-
return string.Format(ResourceController.GetTranslation("DayAgo"), elapsed.Days);
200-
}
201-
else if (elapsed.TotalHours > 2)
202-
{
203-
return string.Format(ResourceController.GetTranslation("HoursAgo"), elapsed.Hours);
204-
}
205-
else if (elapsed.TotalHours > 1)
206-
{
207-
return string.Format(ResourceController.GetTranslation("HourAgo"), elapsed.Hours);
208-
}
209-
else if (elapsed.TotalMinutes > 2)
210-
{
211-
return string.Format(ResourceController.GetTranslation("MinutesAgo"), elapsed.Minutes);
212-
}
213-
else if (elapsed.TotalMinutes > 1)
214-
{
215-
return string.Format(ResourceController.GetTranslation("MinuteAgo"), elapsed.Minutes);
216-
}
217-
else
218-
{
219-
return string.Format(ResourceController.GetTranslation("SecondsAgo"), elapsed.Seconds);
220-
}
221-
}
222-
223185
public static string GetFriendlyDateFromFormat(DateTimeOffset d, string returnFormat)
224186
{
225187
var elapsed = DateTimeOffset.Now - d;
226188

227-
if (elapsed.TotalDays > 7)
189+
if (elapsed.TotalDays > 7 || returnFormat == "g")
228190
{
229191
return d.ToString(returnFormat);
230192
}

0 commit comments

Comments
 (0)