Merge pull request #626 from cloudscribe/feature/998

#998 ensuring translatable strings are in place

Author: JimKerslake

src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentFormPartial.cshtml

@@ -1,7 +1,7 @@
 @model cloudscribe.SimpleContent.Web.ViewModels.BlogViewModel
 @using cloudscribe.SimpleContent.Models
 @using cloudscribe.SimpleContent.Web
-
+@inject IStringLocalizer<SimpleContent> sr
 
 @{
     var path = Url.Action("AjaxPostComment", "Blog");
@@ -10,28 +10,28 @@
 }
 <form id="commentform" asp-antiforgery="true" class="form-horizontal" data-blog-path="@path">
     <fieldset>
-        <legend>Post comment</legend>
+        <legend>@sr["Post comment"]</legend>
 
         <div class="mb-3 row">
-            <label for="commentname" class="control-label col-sm-2">Name</label>
+            <label for="commentname" class="control-label col-sm-2">@sr["Name"]</label>
             <div class="col-sm-7">
                 <input id="commentname" class="form-control" type="text" placeholder="Name" required />
             </div>
         </div>
         <div class="mb-3 row">
-            <label for="commentemail" class="control-label col-sm-2">Email</label>
+            <label for="commentemail" class="control-label col-sm-2">@sr["Email"]</label>
             <div class="col-sm-7">
                 <input id="commentemail" class="form-control" type="email" placeholder="Email" required />
             </div>
         </div>
         <div class="mb-3 row">
-            <label for="commenturl" class="control-label col-sm-2">Website</label>
+            <label for="commenturl" class="control-label col-sm-2">@sr["Website"]</label>
             <div class="col-sm-7">
                 <input id="commenturl" class="form-control" type="url" placeholder="Website URL" />
             </div>
         </div>
         <div class="mb-3 row">
-            <label for="commentcontent" class="control-label col-sm-2">Comment (no HTML allowed)</label>
+            <label for="commentcontent" class="control-label col-sm-2">@sr["Comment (no HTML allowed)"]</label>
             <div class="col-sm-10">
                 <textarea id="commentcontent" class="form-control" rows="4" placeholder="Comment" required></textarea>
             </div>
@@ -49,7 +49,7 @@
         <div class="mb-3 row">
             <div class="col-sm-offset-2 col-sm-10">
                 <input name="postId2" type="hidden" value="@Model.CurrentPost.Id" />
-                <button class="btn btn-primary">Post comment</button>
+                <button class="btn btn-primary">@sr["Post comment"]</button>
                 <span id="status" class="alert" role="status" aria-live="polite"></span>
             </div>
         </div>

src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/Views/Shared/CommentPartial.cshtml

@@ -2,6 +2,8 @@
 @using cloudscribe.SimpleContent.Web
 @addTagHelper "*, cloudscribe.Web.Common"
 @model cloudscribe.SimpleContent.Web.ViewModels.BlogViewModel
+@inject IStringLocalizer<SimpleContent> sr
+
 <article data-id="@Model.TmpComment.Id" itemscope itemtype="http://schema.org/UserComments" itemprop="comment" class="@(Model.TmpComment.IsAdmin ? "self" : null)">
     <img gravatar-email="@Model.TmpComment.Email" gravatar-size="50" alt="Comment by @Model.TmpComment.Author" />
     <div class="comment-item">
@@ -17,7 +19,7 @@
         }
         @if (Model.CanEdit)
         {
-            <button class="deletecomment btn btn-link">Delete</button>
+            <button class="deletecomment btn btn-link">@sr["Delete"]</button>
             @if (Model.ProjectSettings.ModerateComments && !Model.TmpComment.IsApproved)
             {
                 <button class="approvecomment btn btn-link">Approve</button>
@@ -26,6 +28,6 @@
     </div>
     @if (Model.ProjectSettings.ModerateComments && !Model.TmpComment.IsApproved && !Model.CanEdit)
     {
-        <div itemprop="approvalWarning">! The comment will not be visible until a moderator approves it !</div>
+        <div itemprop="approvalWarning">@sr["! The comment will not be visible until a moderator approves it !"]</div>
     } 
 </article>

src/cloudscribe.SimpleContent.Syndication/RssChannelProvider.cs

@@ -12,6 +12,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Routing;
+using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -30,7 +31,8 @@ public RssChannelProvider(
             IHttpContextAccessor contextAccessor,
             IUrlHelperFactory urlHelperFactory,
             IActionContextAccessor actionContextAccesor,
-            IContentProcessor contentProcessor
+            IContentProcessor contentProcessor,
+            IStringLocalizer<RssChannelProvider> localizer
             )
         {
             ProjectService = projectService;
@@ -41,6 +43,7 @@ IContentProcessor contentProcessor
             ActionContextAccesor = actionContextAccesor;
             ContentProcessor = contentProcessor;
             BlogRoutes = blogRoutes;
+            sr = localizer;
         }
 
         protected IUrlHelperFactory UrlHelperFactory { get; private set; }
@@ -51,7 +54,7 @@ IContentProcessor contentProcessor
         protected IBlogRoutes BlogRoutes { get; private set; }
         protected IContentProcessor ContentProcessor { get; private set; }
         protected IBlogUrlResolver BlogUrlResolver { get; private set; }
-
+        protected IStringLocalizer sr { get; private set; }
 
         public string Name { get; } = "cloudscribe.SimpleContent.Syndication.RssChannelProvider";
 
@@ -87,7 +90,7 @@ IContentProcessor contentProcessor
             else
             {
                 // prevent error, channel desc cannot be empty
-                channel.Description = "Welcome to my blog";
+                channel.Description = sr["Welcome to my blog"];
             }
 
             if(!string.IsNullOrEmpty(project.ChannelCategoriesCsv))
@@ -199,8 +202,7 @@ IContentProcessor contentProcessor
                 rssItem.Description = filteredResult.FilteredContent;
                 if(!filteredResult.IsFullContent)
                 {
-                    //TODO: localize
-                    var readMore = " <a href='" + postUrl + "'>...read more</a>";
+                    var readMore = " <a href='" + postUrl + "'>" + sr["...read more"] + "</a>";
                     rssItem.Description += readMore;
                 }
 

src/cloudscribe.SimpleContent.Web/Controllers/BlogController.cs

@@ -1308,7 +1308,7 @@ public virtual async Task<IActionResult> AjaxPostComment(CommentViewModel model)
                 Log.LogDebug("returning 403 because no content was posted");
                 Response.StatusCode = 403;
                 //await Response.WriteAsync("Please enter a valid content");
-                return Content("Please enter a valid content");
+                return Content(StringLocalizer["Please enter valid content"]);
             }
 
             var blogPost = await BlogService.GetPost(model.PostId);
@@ -1329,7 +1329,7 @@ public virtual async Task<IActionResult> AjaxPostComment(CommentViewModel model)
                         Log.LogDebug("returning 403 captcha validation failed");
                         Response.StatusCode = 403;
                         //await Response.WriteAsync("captcha validation failed");
-                        return Content("captcha validation failed");
+                        return Content(StringLocalizer["captcha validation failed"]);
                     }
                 }
             }

src/cloudscribe.SimpleContent.Web/Controllers/PageController.cs

@@ -123,12 +123,12 @@ public virtual async Task<IActionResult> Index(
                     if (HttpContext.Request.Path == "/")
                     {
                         ViewData["Title"] = StringLocalizer["Home"];
-                        page.Title = "No pages found, please click the plus icon to create the home page";
+                        page.Title = StringLocalizer["No pages found, please click the plus icon to create the home page"];
                     }
                     else
                     {
                         ViewData["Title"] = StringLocalizer["No Pages Found"];
-                        page.Title = "No pages found, please click the plus icon to create the first page";
+                        page.Title = StringLocalizer["No pages found, please click the plus icon to create the first page"];
                     }
                 }
                 else

src/cloudscribe.SimpleContent.Web/Services/Page/PageService.cs

@@ -227,7 +227,7 @@ public async Task<PageActionResult> Move(PageMoveModel model)
 
             if (string.IsNullOrEmpty(model.MovedNode) || string.IsNullOrEmpty(model.TargetNode) || (model.MovedNode == "-1") || (model.TargetNode == "-1") || (string.IsNullOrEmpty(model.Position)))
             {
-                result = new PageActionResult(false, "bad request, failed to move page");
+                result = new PageActionResult(false, _sr["bad request, failed to move page"]);
                 return result;
             }
 
@@ -236,7 +236,7 @@ public async Task<PageActionResult> Move(PageMoveModel model)
 
             if ((movedNode == null) || (targetNode == null))
             {
-                result = new PageActionResult(false, "bad request, page or target page not found");
+                result = new PageActionResult(false, _sr["bad request, page or target page not found"]);
                 return result;
             }
 
@@ -308,7 +308,7 @@ public async Task<PageActionResult> Move(PageMoveModel model)
 
             //ClearNavigationCache();
 
-            result = new PageActionResult(true, "operation succeeded");
+            result = new PageActionResult(true, _sr["operation succeeded"]);
 
             await _eventHandlers.HandleMoved(_settings.Id, movedNode, targetNode, model.Position).ConfigureAwait(false);
 
@@ -340,7 +340,7 @@ public async Task<PageActionResult> SortChildPagesAlpha(string pageId)
             }
 
             //ClearNavigationCache();
-            return new PageActionResult(true, "operation succeeded");
+            return new PageActionResult(true, _sr["operation succeeded"]);
 
         }