lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#18777: Adding support for later date in DateTimeRelative

Browse Source 
Work Item: 18777

--HG--
branch : 1.x
This commit is contained in:
Piotr Szmyd
2012-06-27 14:07:51 -07:00
parent ae1c82dd17
commit 3b78375a5b
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Orchard.Web/Core/Shapes/DateTimeShapes.cs
View File

@@ -34,18 +34,32 @@ namespace Orchard.Core.Shapes {
public IHtmlString DateTimeRelative(dynamic Display, DateTime dateTimeUtc) {
var time = _clock.UtcNow - dateTimeUtc;
if (time.TotalDays > 7)
if (time.TotalDays > 7 || time.TotalDays < -7)
return Display.DateTime(DateTimeUtc: dateTimeUtc, CustomFormat: T("'on' MMM d yyyy 'at' h:mm tt"));
if (time.TotalHours > 24)
return T.Plural("1 day ago", "{0} days ago", time.Days);
if (time.TotalHours < -24)
return T.Plural("in 1 day", "in {0} days", -time.Days);
if (time.TotalMinutes > 60)
return T.Plural("1 hour ago", "{0} hours ago", time.Hours);
if (time.TotalMinutes < -60)
return T.Plural("in 1 hour", "in {0} hours", -time.Hours);
if (time.TotalSeconds > 60)
return T.Plural("1 minute ago", "{0} minutes ago", time.Minutes);
if (time.TotalSeconds < -60)
return T.Plural("in 1 minute", "in {0} minutes", -time.Minutes);
if (time.TotalSeconds > 10)
return T.Plural("1 second ago", "{0} seconds ago", time.Seconds); //aware that the singular won't be used
if (time.TotalSeconds < -10)
return T.Plural("in 1 second", "in {0} seconds", -time.Seconds);
return T("a moment ago");
return time.TotalMilliseconds > 0
? T("a moment ago")
: T("in a moment");
}
[Shape]
@@ -73,4 +87,4 @@ namespace Orchard.Core.Shapes {
}
}
}
}