Localized (and properly pluralized) a couple of HtmlHelper extensions (around friendly published datetimes)

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Blogs/Extensions/HtmlHelperExtensions.cs

@@ -2,24 +2,25 @@ using System.Web.Mvc;
 using Orchard.Blogs.Models;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
+using Orchard.Localization;
 using Orchard.Mvc.Html;
 
 namespace Orchard.Blogs.Extensions {
     public static class HtmlHelperExtensions {
-        public static string PublishedState(this HtmlHelper<BlogPost> htmlHelper) {
+        public static LocalizedString PublishedState(this HtmlHelper<BlogPost> htmlHelper, Localizer T) {
-            return htmlHelper.PublishedState(htmlHelper.ViewData.Model);
+            return htmlHelper.PublishedState(htmlHelper.ViewData.Model, T);
         }
 
-        public static string PublishedState(this HtmlHelper htmlHelper, BlogPost blogPost) {
+        public static LocalizedString PublishedState(this HtmlHelper htmlHelper, BlogPost blogPost, Localizer T) {
-            return htmlHelper.DateTime(blogPost.As<ICommonAspect>().VersionPublishedUtc, "Draft");
+            return htmlHelper.DateTime(blogPost.As<ICommonAspect>().VersionPublishedUtc, T("Draft"));
         }
 
-        public static string PublishedWhen(this HtmlHelper<BlogPost> htmlHelper) {
+        public static LocalizedString PublishedWhen(this HtmlHelper<BlogPost> htmlHelper, Localizer T) {
-            return htmlHelper.PublishedWhen(htmlHelper.ViewData.Model);
+            return htmlHelper.PublishedWhen(htmlHelper.ViewData.Model, T);
         }
 
-        public static string PublishedWhen(this HtmlHelper htmlHelper, BlogPost blogPost) {
+        public static LocalizedString PublishedWhen(this HtmlHelper htmlHelper, BlogPost blogPost, Localizer T) {
-            return htmlHelper.DateTimeRelative(blogPost.As<ICommonAspect>().VersionPublishedUtc, "as a Draft");
+            return htmlHelper.DateTimeRelative(blogPost.As<ICommonAspect>().VersionPublishedUtc, T("as a Draft"), T);
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx

@@ -1,9 +1,7 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.ContentManagement"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h2><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item)) %></h2>
-<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
+<div class="meta"><%=Html.PublishedState(Model.Item, T) %> | <%Html.Zone("meta");%></div>
 <div class="content"><% Html.Zone("primary", ":manage :metadata");%></div>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.SummaryAdmin.ascx

@@ -1,7 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
 <%@ Import Namespace="Orchard.ContentManagement.Aspects"%>
 <%@ Import Namespace="Orchard.ContentManagement"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
@@ -11,15 +10,15 @@
         <ul>
             <li><%
             if (Model.Item.HasPublished) { %>
-                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Blogs/Content/Admin/images/online.gif") %>" alt="<%: T("Online") %>" title="<%: T("The page is currently online") %>" /><%: T(" Published")%><%
+                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Blogs/Content/Admin/images/online.gif") %>" alt="<%: T("Online") %>" title="<%: T("The page is currently online") %>" /> <%: T("Published")%><%
             }
             else { %>
-                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Blogs/Content/Admin/images/offline.gif") %>" alt="<%: T("Offline") %>" title="<%: T("The page is currently offline") %>" /><%: T(" Not Published")%><%
+                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Blogs/Content/Admin/images/offline.gif") %>" alt="<%: T("Offline") %>" title="<%: T("The page is currently offline") %>" /> <%: T("Not Published")%><%
             } %>&nbsp;&#124;&nbsp;
             </li>
             <li><%
             if (Model.Item.HasDraft) { %>
-                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Blogs/Content/Admin/images/draft.gif") %>" alt="<%: T("Draft") %>" title="<%: T("The post has a draft") %>" /><%=Html.PublishedState(Model.Item)%><%
+                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Blogs/Content/Admin/images/draft.gif") %>" alt="<%: T("Draft") %>" title="<%: T("The post has a draft") %>" /><%=Html.PublishedState(Model.Item, T) %><%
             }
             else { %>
                 <%: T("No draft")%><%
@@ -31,10 +30,10 @@
                 <%=Html.DateTime(Model.Item.ScheduledPublishUtc.Value, "M/d/yyyy h:mm tt")%><%
             }
             else if (Model.Item.IsPublished) { %>
-                <%: T("Published: ") + Html.DateTimeRelative(Model.Item.As<ICommonAspect>().VersionPublishedUtc.Value)%><%
+                <%: T("Published: {0}", Html.DateTimeRelative(Model.Item.As<ICommonAspect>().VersionPublishedUtc.Value, T)) %><%
             }
             else { %>
-                <%: T("Last modified: ") + Html.DateTimeRelative(Model.Item.As<ICommonAspect>().ModifiedUtc.Value) %><%
+                <%: T("Last modified: {0}", Html.DateTimeRelative(Model.Item.As<ICommonAspect>().ModifiedUtc.Value, T)) %><%
             } %>&nbsp;&#124;&nbsp;
             </li>
             <li><%: T("By {0}", Model.Item.Creator.UserName)%></li>                   

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.Summary.ascx

@@ -2,5 +2,5 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%><%
 if (Model.Creator != null) { 
-   %><span class="posted"><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model)) %> | </span><%
+   %><span class="posted"><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %> | </span><%
 } %>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx

@@ -3,6 +3,6 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <div class="metadata"><%
     if (Model.Creator != null) { 
-       %><div class="posted"><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model)) %></div><%
+       %><div class="posted"><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %></div><%
     } %>
 </div>

src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.ascx

@@ -6,7 +6,7 @@ foreach (var comment in Model) { %>
         <div class="comment">
             <span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>
             <%-- todo: (heskew) need comment permalink --%>
-            <span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault()), "#")%></span>
+            <span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault(), T).Text, "#")%></span>
         </div>
         <div class="text">
             <%-- todo: (heskew) comment text needs processing depending on comment markup style --%>

src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx

@@ -1,7 +1,6 @@
 <%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<PagesViewModel>" %>
 <%@ Import Namespace="Orchard.ContentManagement.Aspects"%>
 <%@ Import Namespace="Orchard.ContentManagement"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Pages.ViewModels"%><%
 Html.RegisterStyle("admin.css"); %>
@@ -45,10 +44,10 @@ using (Html.BeginFormAntiForgeryPost()) { %>
                             <li><%
                             // Published or not
                             if (pageEntry.Page.HasPublished) { %>
-                                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Pages/Content/Admin/images/online.gif") %>" alt="<%: T("Online") %>" title="<%: T("The page is currently online") %>" /><%: T("Published") %>&nbsp;&#124;&nbsp;<%
+                                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Pages/Content/Admin/images/online.gif") %>" alt="<%: T("Online") %>" title="<%: T("The page is currently online") %>" /> <%: T("Published") %>&nbsp;&#124;&nbsp;<%
                             }
                             else { %>
-                                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Pages/Content/Admin/images/offline.gif") %>" alt="<%: T("Offline") %>" title="<%: T("The page is currently offline") %>" /><%: T("Not Published")%>&nbsp;&#124;&nbsp;<%
+                                <img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Pages/Content/Admin/images/offline.gif") %>" alt="<%: T("Offline") %>" title="<%: T("The page is currently offline") %>" /> <%: T("Not Published")%>&nbsp;&#124;&nbsp;<%
                             } %>
                             </li>
                             <li><%
@@ -66,10 +65,10 @@ using (Html.BeginFormAntiForgeryPost()) { %>
                                 <%=Html.DateTime(pageEntry.Page.ScheduledPublishUtc.Value, "M/d/yyyy h:mm tt")%><%
                             }
                             else if (pageEntry.Page.IsPublished) { %>
-                                <%: T("Published: ") + Html.DateTimeRelative(pageEntry.Page.As<ICommonAspect>().VersionPublishedUtc.Value) %><%
+                                <%: T("Published: {0}", Html.DateTimeRelative(pageEntry.Page.As<ICommonAspect>().VersionPublishedUtc.Value, T)) %><%
                             }
                             else { %>
-                                <%: T("Last modified: ") + Html.DateTimeRelative(pageEntry.Page.As<ICommonAspect>().ModifiedUtc.Value) %><%
+                                <%: T("Last modified: {0}", Html.DateTimeRelative(pageEntry.Page.As<ICommonAspect>().ModifiedUtc.Value, T)) %><%
                             } %>&nbsp;&#124;&nbsp;
                             </li>
                             <li><%: T("By {0}", pageEntry.Page.Creator.UserName)%></li>

src/Orchard.Web/Modules/Orchard.Search/Views/Admin/Index.ascx

@@ -4,7 +4,7 @@ Html.RegisterStyle("admin.css"); %>
 <h1><%=Html.TitleForPage(T("Search Index Management").ToString()) %></h1><%
 using (Html.BeginForm("update", "admin", FormMethod.Post, new {area = "Orchard.Search"})) { %>
     <fieldset>
-        <p><%=T("The search index was last updated {0}. <button type=\"submit\" title=\"Update the search index.\" class=\"primaryAction\">Update</button>", Html.DateTimeRelative(Model.IndexUpdatedUtc))%></p>
+        <p><%=T("The search index was last updated {0}. <button type=\"submit\" title=\"Update the search index.\" class=\"primaryAction\">Update</button>", Html.DateTimeRelative(Model.IndexUpdatedUtc, T))%></p>
         <%=Html.AntiForgeryTokenOrchard() %>
     </fieldset><%
 }

src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx

@@ -1,12 +1,10 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.ContentManagement"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%Model.Zones.AddRenderPartial("zonetest", "ZoneTest", Model); %>
 <h2><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item)) %></h2>
-<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
+<div class="meta"><%=Html.PublishedState(Model.Item, T) %> | <%Html.Zone("meta");%></div>
 <div class="postsummary">
 <% Html.Zone("primary"); %>
 </div>

src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx

@@ -1,7 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPost>" %>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%><%
-<%
+if (Model.Creator != null) { 
-    if (Model.Creator != null) { 
+    %><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %><%
-       %><%: T("Posted by {0} {1}", Model.Creator.UserName, "|", Html.PublishedWhen(Model)) %><%
+} %>
-    } %>

src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx

@@ -1,12 +1,10 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.ContentManagement"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%Model.Zones.AddRenderPartial("zonetest", "ZoneTest", Model); %>
 <h2><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item)) %></h2>
-<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
+<div class="meta"><%=Html.PublishedState(Model.Item, T) %> | <%Html.Zone("meta");%></div>
 <div class="postsummary">
 <% Html.Zone("primary"); %>
 </div>

src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx

@@ -1,7 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPost>" %>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%><%
-<%
+if (Model.Creator != null) { 
-    if (Model.Creator != null) { 
+    %><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %><%
-       %><%: T("Posted by {0} {1}", Model.Creator.UserName, "|", Html.PublishedWhen(Model)) %><%
+} %>
-    } %>

src/Orchard.Web/Themes/Contoso/Views/ListOfComments.ascx

@@ -3,15 +3,12 @@
 <ul class="comments"><%
 foreach (var comment in Model) { %>
     <li>
-
+        <div class="comment">
-<div class="comment">
+            <p><%: comment.Record.CommentText %></p>
-<p><%: comment.Record.CommentText %></p>
+        </div>
-</div>
+        <div class="commentauthor">
-        
+            <span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault(), T).Text, "#")%></span>
-<div class="commentauthor">
+        </div>       
-<span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault()), "#")%></span>
-</div>       
-        
     </li><%
 } %>
 </ul>

src/Orchard.Web/Themes/Corporate/Views/ListOfComments.ascx

@@ -3,15 +3,12 @@
 <ul class="comments"><%
 foreach (var comment in Model) { %>
     <li>
-
+        <div class="comment">
-<div class="comment">
+            <p><%: comment.Record.CommentText %></p>
-<p><%: comment.Record.CommentText %></p>
+        </div>
-</div>
+        <div class="commentauthor">
-        
+            <span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault(), T).Text, "#")%></span>
-<div class="commentauthor">
+        </div>       
-<span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault()), "#")%></span>
-</div>       
-        
     </li><%
 } %>
 </ul>

src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx

@@ -1,14 +1,9 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
-<%@ Import Namespace="Orchard.ContentManagement"%>
-<%@ Import Namespace="Orchard.Core.Common.Models"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-
 <h3><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item)) %></h3>
-
+<div class="meta"><%=Html.PublishedState(Model.Item, T) %> | <%Html.Zone("meta");%></div>
-<div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
-
 <div class="postsummary">
 <% Html.Zone("primary"); %>
-</div>
+</div>

src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx

@@ -1,7 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPost>" %>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
-<%@ Import Namespace="Orchard.Blogs.Models"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%><%
-<%
+if (Model.Creator != null) { 
-    if (Model.Creator != null) { 
+    %><%: T("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model, T)) %><%
-       %><%: T("Posted by {0} {1}", Model.Creator.UserName, "|", Html.PublishedWhen(Model)) %><%
+} %>
-    } %>

src/Orchard.Web/Themes/Green/Views/ListOfComments.ascx

@@ -3,15 +3,12 @@
 <ul class="comments"><%
 foreach (var comment in Model) { %>
     <li>
-
+        <div class="comment">
-<div class="comment">
+            <p><%: comment.Record.CommentText %></p>
-<p><%: comment.Record.CommentText %></p>
+        </div>
-</div>
+        <div class="commentauthor">
-        
+            <span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault(), T).Text, "#")%></span>
-<div class="commentauthor">
+        </div>       
-<span class="who"><%=Html.LinkOrDefault(Html.Encode(comment.Record.UserName), Html.Encode(comment.Record.SiteName), new { rel = "nofollow" })%></span>&nbsp;<span>said <%=Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault()), "#")%></span>
-</div>       
-        
     </li><%
 } %>
 </ul>

src/Orchard/Mvc/Html/HtmlHelperExtensions.cs

@@ -7,6 +7,7 @@ using System.Web.Mvc;
 using System.Web.Mvc.Html;
 using System.Web.Routing;
 using Orchard.Collections;
+using Orchard.Localization;
 using Orchard.Mvc.ViewModels;
 using Orchard.Services;
 using Orchard.Settings;
@@ -178,44 +179,44 @@ namespace Orchard.Mvc.Html {
 
         #region Format Date/Time
 
-        public static string DateTimeRelative(this HtmlHelper htmlHelper, DateTime? value, string defaultIfNull) {
+        public static LocalizedString DateTimeRelative(this HtmlHelper htmlHelper, DateTime? value, LocalizedString defaultIfNull, Localizer T) {
-            return value.HasValue ? htmlHelper.DateTimeRelative(value.Value) : defaultIfNull;
+            return value.HasValue ? htmlHelper.DateTimeRelative(value.Value, T) : defaultIfNull;
         }
 
         //TODO: (erikpo) This method needs localized
-        public static string DateTimeRelative(this HtmlHelper htmlHelper, DateTime value) {
+        public static LocalizedString DateTimeRelative(this HtmlHelper htmlHelper, DateTime value, Localizer T) {
-            TimeSpan time = htmlHelper.Resolve<IClock>().UtcNow - value;
+            var time = htmlHelper.Resolve<IClock>().UtcNow - value;
 
             if (time.TotalDays > 7)
-                return "on " + htmlHelper.DateTime(value, "MMM d yyyy 'at' h:mm tt");
+                return htmlHelper.DateTime(value, T("'on' MMM d yyyy 'at' h:mm tt"));
             if (time.TotalHours > 24)
-                return string.Format("{0} day{1} ago", time.Days, time.Days == 1 ? "" : "s");
+                return T.Plural("1 day ago", "{0} days ago", time.Days);
             if (time.TotalMinutes > 60)
-                return string.Format("{0} hour{1} ago", time.Hours, time.Hours == 1 ? "" : "s");
+                return T.Plural("1 hour ago", "{0} hours ago", time.Hours);
             if (time.TotalSeconds > 60)
-                return string.Format("{0} minute{1} ago", time.Minutes, time.Minutes == 1 ? "" : "s");
+                return T.Plural("1 minute ago", "{0} minutes ago", time.Minutes);
             if (time.TotalSeconds > 10)
-                return string.Format("{0} second{1} ago", time.Seconds, time.Seconds == 1 ? "" : "s");
+                return T.Plural("1 second ago", "{0} seconds ago", time.Seconds);
 
-            return "a moment ago";
+            return T("a moment ago");
         }
 
-        public static string DateTime(this HtmlHelper htmlHelper, DateTime? value, string defaultIfNull) {
+        public static LocalizedString DateTime(this HtmlHelper htmlHelper, DateTime? value, LocalizedString defaultIfNull) {
             return value.HasValue ? htmlHelper.DateTime(value.Value) : defaultIfNull;
         }
 
-        public static string DateTime(this HtmlHelper htmlHelper, DateTime? value, string defaultIfNull, string customFormat) {
+        public static LocalizedString DateTime(this HtmlHelper htmlHelper, DateTime? value, LocalizedString defaultIfNull, LocalizedString customFormat) {
             return value.HasValue ? htmlHelper.DateTime(value.Value, customFormat) : defaultIfNull;
         }
 
-        public static string DateTime(this HtmlHelper htmlHelper, DateTime value) {
+        public static LocalizedString DateTime(this HtmlHelper htmlHelper, DateTime value) {
             //TODO: (erikpo) This default format should come from a site setting
-            return htmlHelper.DateTime(value, "MMM d yyyy h:mm tt");
+            return htmlHelper.DateTime(value, new LocalizedString("MMM d yyyy h:mm tt")); //todo: above comment and get rid of just wrapping this as a localized string
         }
 
-        public static string DateTime(this HtmlHelper htmlHelper, DateTime value, string customFormat) {
+        public static LocalizedString DateTime(this HtmlHelper htmlHelper, DateTime value, LocalizedString customFormat) {
             //TODO: (erikpo) In the future, convert this to "local" time before calling ToString
-            return value.ToString(customFormat);
+            return value.ToString(customFormat.Text);
         }
 
         #endregion