From 253245fb093574840293e911f209b79c8f742ef5 Mon Sep 17 00:00:00 2001 From: Stu Bonham Date: Sun, 24 Jun 2018 11:16:35 +0100 Subject: [PATCH] Localize main CoreWiki pages --- .../Areas/Identity/Pages/_ViewImports.cshtml | 4 + CoreWiki/Globalization/Models/Article.resx | 126 ++++++++++++++++ CoreWiki/Globalization/Models/Comment.resx | 132 +++++++++++++++++ CoreWiki/Globalization/Pages/All.resx | 123 ++++++++++++++++ .../Globalization/Pages/ArticleNotFound.resx | 129 ++++++++++++++++ .../CreateComments/CreateComments.resx | 126 ++++++++++++++++ .../Components/ListComments/ListComments.resx | 126 ++++++++++++++++ CoreWiki/Globalization/Pages/Create.resx | 135 +++++++++++++++++ .../Pages/CreateArticleFromLink.resx | 135 +++++++++++++++++ CoreWiki/Globalization/Pages/Delete.resx | 129 ++++++++++++++++ CoreWiki/Globalization/Pages/Details.resx | 138 ++++++++++++++++++ CoreWiki/Globalization/Pages/Edit.resx | 138 ++++++++++++++++++ .../Globalization/Pages/LatestChanges.resx | 126 ++++++++++++++++ CoreWiki/Globalization/Pages/Privacy.resx | 126 ++++++++++++++++ CoreWiki/Globalization/Pages/Search.resx | 129 ++++++++++++++++ .../Pages/Shared/_CookieConsentPartial.resx | 126 ++++++++++++++++ .../Globalization/Pages/Shared/_Layout.resx | 132 +++++++++++++++++ .../Pages/Shared/_LoginPartial.resx | 129 ++++++++++++++++ .../Pages/Shared/_ThemePartial.resx | 129 ++++++++++++++++ CoreWiki/Globalization/Pages/_ArticleRow.resx | 129 ++++++++++++++++ CoreWiki/Helpers/ArticleHelpers.cs | 30 ++-- CoreWiki/Models/Article.cs | 2 + CoreWiki/Models/Comment.cs | 6 +- CoreWiki/Pages/All.cshtml | 2 +- CoreWiki/Pages/ArticleNotFound.cshtml | 9 +- .../CreateComments/CreateComments.cshtml | 4 +- .../ListComments/ListComments.cshtml | 4 +- CoreWiki/Pages/Create.cshtml | 12 +- CoreWiki/Pages/CreateArticleFromLink.cshtml | 10 +- CoreWiki/Pages/Delete.cshtml | 10 +- CoreWiki/Pages/Details.cshtml | 19 ++- CoreWiki/Pages/Edit.cshtml | 12 +- CoreWiki/Pages/LatestChanges.cshtml | 6 +- CoreWiki/Pages/Privacy.cshtml | 4 +- CoreWiki/Pages/Search.cshtml | 8 +- .../Pages/Shared/_CookieConsentPartial.cshtml | 4 +- CoreWiki/Pages/Shared/_Layout.cshtml | 31 ++-- CoreWiki/Pages/Shared/_LoginPartial.cshtml | 6 +- CoreWiki/Pages/Shared/_ThemePartial.cshtml | 6 +- CoreWiki/Pages/_ArticleRow.cshtml | 6 +- CoreWiki/Pages/_ViewImports.cshtml | 5 + CoreWiki/Startup.cs | 10 ++ 42 files changed, 2583 insertions(+), 90 deletions(-) create mode 100644 CoreWiki/Globalization/Models/Article.resx create mode 100644 CoreWiki/Globalization/Models/Comment.resx create mode 100644 CoreWiki/Globalization/Pages/All.resx create mode 100644 CoreWiki/Globalization/Pages/ArticleNotFound.resx create mode 100644 CoreWiki/Globalization/Pages/Components/CreateComments/CreateComments.resx create mode 100644 CoreWiki/Globalization/Pages/Components/ListComments/ListComments.resx create mode 100644 CoreWiki/Globalization/Pages/Create.resx create mode 100644 CoreWiki/Globalization/Pages/CreateArticleFromLink.resx create mode 100644 CoreWiki/Globalization/Pages/Delete.resx create mode 100644 CoreWiki/Globalization/Pages/Details.resx create mode 100644 CoreWiki/Globalization/Pages/Edit.resx create mode 100644 CoreWiki/Globalization/Pages/LatestChanges.resx create mode 100644 CoreWiki/Globalization/Pages/Privacy.resx create mode 100644 CoreWiki/Globalization/Pages/Search.resx create mode 100644 CoreWiki/Globalization/Pages/Shared/_CookieConsentPartial.resx create mode 100644 CoreWiki/Globalization/Pages/Shared/_Layout.resx create mode 100644 CoreWiki/Globalization/Pages/Shared/_LoginPartial.resx create mode 100644 CoreWiki/Globalization/Pages/Shared/_ThemePartial.resx create mode 100644 CoreWiki/Globalization/Pages/_ArticleRow.resx diff --git a/CoreWiki/Areas/Identity/Pages/_ViewImports.cshtml b/CoreWiki/Areas/Identity/Pages/_ViewImports.cshtml index b4d14ac4..2e1a6a89 100644 --- a/CoreWiki/Areas/Identity/Pages/_ViewImports.cshtml +++ b/CoreWiki/Areas/Identity/Pages/_ViewImports.cshtml @@ -1,5 +1,9 @@ @using Microsoft.AspNetCore.Identity @using CoreWiki.Areas.Identity @using CoreWiki.Areas.Identity.Data +@using Microsoft.AspNetCore.Mvc.Localization + +@inject IViewLocalizer Localizer + @namespace CoreWiki.Areas.Identity.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/CoreWiki/Globalization/Models/Article.resx b/CoreWiki/Globalization/Models/Article.resx new file mode 100644 index 00000000..03b614ee --- /dev/null +++ b/CoreWiki/Globalization/Models/Article.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Content + + + Topic: + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Models/Comment.resx b/CoreWiki/Globalization/Models/Comment.resx new file mode 100644 index 00000000..0f94f643 --- /dev/null +++ b/CoreWiki/Globalization/Models/Comment.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Content + + + Email + + + Name + + + Not a valid Email address! + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/All.resx b/CoreWiki/Globalization/Pages/All.resx new file mode 100644 index 00000000..28657417 --- /dev/null +++ b/CoreWiki/Globalization/Pages/All.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + All Articles + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/ArticleNotFound.resx b/CoreWiki/Globalization/Pages/ArticleNotFound.resx new file mode 100644 index 00000000..7789d320 --- /dev/null +++ b/CoreWiki/Globalization/Pages/ArticleNotFound.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Article not found + + + Please check that the URL you entered is correct. It's also possible that an article at this address was deleted. + + + Go to Homepage + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Components/CreateComments/CreateComments.resx b/CoreWiki/Globalization/Pages/Components/CreateComments/CreateComments.resx new file mode 100644 index 00000000..ff027594 --- /dev/null +++ b/CoreWiki/Globalization/Pages/Components/CreateComments/CreateComments.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + New Comment + + + Submit + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Components/ListComments/ListComments.resx b/CoreWiki/Globalization/Pages/Components/ListComments/ListComments.resx new file mode 100644 index 00000000..556f498c --- /dev/null +++ b/CoreWiki/Globalization/Pages/Components/ListComments/ListComments.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Comments List + + + There are no comments to show! + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Create.resx b/CoreWiki/Globalization/Pages/Create.resx new file mode 100644 index 00000000..8c46064d --- /dev/null +++ b/CoreWiki/Globalization/Pages/Create.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Choose file + + + Create + + + Create New Article + + + Back to Home + + + Upload + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/CreateArticleFromLink.resx b/CoreWiki/Globalization/Pages/CreateArticleFromLink.resx new file mode 100644 index 00000000..c1c1a4d3 --- /dev/null +++ b/CoreWiki/Globalization/Pages/CreateArticleFromLink.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + The following links to CoreWiki articles that do not yet exist were found in the Article + + + Would you like to create these articles now? + + + Found links to articles that do not yet exist + + + No + + + Yes + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Delete.resx b/CoreWiki/Globalization/Pages/Delete.resx new file mode 100644 index 00000000..493db5b1 --- /dev/null +++ b/CoreWiki/Globalization/Pages/Delete.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Delete + + + Are you sure you want to delete this article? + + + Back to Home + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Details.resx b/CoreWiki/Globalization/Pages/Details.resx new file mode 100644 index 00000000..ed591bb2 --- /dev/null +++ b/CoreWiki/Globalization/Pages/Details.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Details + + + Edit + + + Back to Home + + + Last Published + + + Estimated Reading Time + + + View Count + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Edit.resx b/CoreWiki/Globalization/Pages/Edit.resx new file mode 100644 index 00000000..daa17760 --- /dev/null +++ b/CoreWiki/Globalization/Pages/Edit.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Choose file + + + Edit + + + Edit Article + + + Back to Home + + + Save + + + Upload + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/LatestChanges.resx b/CoreWiki/Globalization/Pages/LatestChanges.resx new file mode 100644 index 00000000..6c3e57e0 --- /dev/null +++ b/CoreWiki/Globalization/Pages/LatestChanges.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Latest Changes + + + New Article + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Privacy.resx b/CoreWiki/Globalization/Pages/Privacy.resx new file mode 100644 index 00000000..206a3b90 --- /dev/null +++ b/CoreWiki/Globalization/Pages/Privacy.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Privacy Policy + + + Detauil your Privacy Policy here. + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Search.resx b/CoreWiki/Globalization/Pages/Search.resx new file mode 100644 index 00000000..cde02335 --- /dev/null +++ b/CoreWiki/Globalization/Pages/Search.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Search + + + Search for articles on CoreWiki + + + Search CoreWiki + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Shared/_CookieConsentPartial.resx b/CoreWiki/Globalization/Pages/Shared/_CookieConsentPartial.resx new file mode 100644 index 00000000..efbc86dd --- /dev/null +++ b/CoreWiki/Globalization/Pages/Shared/_CookieConsentPartial.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Text of your Cookie Policy goes here. + + + Learn More + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Shared/_Layout.resx b/CoreWiki/Globalization/Pages/Shared/_Layout.resx new file mode 100644 index 00000000..02518f76 --- /dev/null +++ b/CoreWiki/Globalization/Pages/Shared/_Layout.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CoreWiki: An Open Source Project from the Fritz and Friends Community + + + All Articles + + + Latest Changes + + + New Article + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Shared/_LoginPartial.resx b/CoreWiki/Globalization/Pages/Shared/_LoginPartial.resx new file mode 100644 index 00000000..5e4996b8 --- /dev/null +++ b/CoreWiki/Globalization/Pages/Shared/_LoginPartial.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Login + + + Logout + + + Register + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/Shared/_ThemePartial.resx b/CoreWiki/Globalization/Pages/Shared/_ThemePartial.resx new file mode 100644 index 00000000..630655a5 --- /dev/null +++ b/CoreWiki/Globalization/Pages/Shared/_ThemePartial.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Dark + + + Default + + + Ouch! + + \ No newline at end of file diff --git a/CoreWiki/Globalization/Pages/_ArticleRow.resx b/CoreWiki/Globalization/Pages/_ArticleRow.resx new file mode 100644 index 00000000..fff897bc --- /dev/null +++ b/CoreWiki/Globalization/Pages/_ArticleRow.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Delete + + + Edit + + + View Count + + \ No newline at end of file diff --git a/CoreWiki/Helpers/ArticleHelpers.cs b/CoreWiki/Helpers/ArticleHelpers.cs index f3a6def2..6856cdb4 100644 --- a/CoreWiki/Helpers/ArticleHelpers.cs +++ b/CoreWiki/Helpers/ArticleHelpers.cs @@ -13,23 +13,27 @@ public static class ArticleHelpers public static IList GetArticlesToCreate(ApplicationDbContext context, Article article, bool createSlug = false) { var articlesToCreate = new List(); - var internalWikiLinkArray = FindWikiArticleLinks(article.Content); - foreach (var link in internalWikiLinkArray) - { - // Normalise the potential new wiki link into our slug format - var slug = createSlug ? UrlHelpers.URLFriendly(link) : link; - // Does the slug already exist in the database? - if (!context.Articles.Any(x => x.Slug.Equals(slug) && x.Id != article.Id)) + if (!string.IsNullOrWhiteSpace(article.Content)) + { + var internalWikiLinkArray = FindWikiArticleLinks(article.Content); + foreach (var link in internalWikiLinkArray) { - if (createSlug && !slug.Equals(link)) + // Normalise the potential new wiki link into our slug format + var slug = createSlug ? UrlHelpers.URLFriendly(link) : link; + + // Does the slug already exist in the database? + if (!context.Articles.Any(x => x.Slug.Equals(slug) && x.Id != article.Id)) { - var target = LinkPrefix + link; - var replacement = LinkPrefix + slug; - article.Content = article.Content.Replace(target, replacement); - } + if (createSlug && !slug.Equals(link)) + { + var target = LinkPrefix + link; + var replacement = LinkPrefix + slug; + article.Content = article.Content.Replace(target, replacement); + } - articlesToCreate.Add(slug); + articlesToCreate.Add(slug); + } } } diff --git a/CoreWiki/Models/Article.cs b/CoreWiki/Models/Article.cs index 25b7ea13..80e3f342 100644 --- a/CoreWiki/Models/Article.cs +++ b/CoreWiki/Models/Article.cs @@ -17,6 +17,7 @@ public class Article public int Id { get; set; } [Required, MaxLength(100)] + [Display(Name = "Topic")] public string Topic { get; set; } public string Slug { get; set; } @@ -37,6 +38,7 @@ public DateTime PublishedDateTime } [DataType(DataType.MultilineText)] + [Display(Name = "Content")] public string Content { get; set; } public virtual ICollection Comments { get; set; } public Article() diff --git a/CoreWiki/Models/Comment.cs b/CoreWiki/Models/Comment.cs index d305663e..e87e4c9a 100644 --- a/CoreWiki/Models/Comment.cs +++ b/CoreWiki/Models/Comment.cs @@ -24,7 +24,8 @@ public class Comment [Display(Name = "Name")] public string DisplayName { get; set; } - [Required, MaxLength(100), DataType(DataType.EmailAddress), EmailAddress(ErrorMessage = "Not a valid Email address")] + [Display(Name = "Email")] + [Required, MaxLength(100), DataType(DataType.EmailAddress), EmailAddress(ErrorMessage = "Not a valid Email address")] public string Email { get; set; } [NotMapped] @@ -42,7 +43,8 @@ public DateTime SubmittedDateTime } [Required] - [DataType(DataType.MultilineText)] + [Display(Name = "Content")] + [DataType(DataType.MultilineText)] public string Content { get; set; } } } diff --git a/CoreWiki/Pages/All.cshtml b/CoreWiki/Pages/All.cshtml index 2ecb2a04..14dfa184 100644 --- a/CoreWiki/Pages/All.cshtml +++ b/CoreWiki/Pages/All.cshtml @@ -6,7 +6,7 @@ ViewData["Title"] = "All"; } -

All Articles

+

@Localizer["AllArticles"]

diff --git a/CoreWiki/Pages/ArticleNotFound.cshtml b/CoreWiki/Pages/ArticleNotFound.cshtml index 6589a8a0..d9e2e7a9 100644 --- a/CoreWiki/Pages/ArticleNotFound.cshtml +++ b/CoreWiki/Pages/ArticleNotFound.cshtml @@ -1,7 +1,6 @@ @{ - var title = "Article not found"; - ViewData["Title"] = title; + ViewData["Title"] = Localizer["ArticleNotFound"]; } -

@title

-

Please check that the URL you entered is correct. It's also possible that an article at this address was deleted.

-Go to Homepage \ No newline at end of file +

@Localizer["ArticleNotFound"]

+

@Localizer["ArticleNotFoundText"]

+@Localizer["GoHome"] diff --git a/CoreWiki/Pages/Components/CreateComments/CreateComments.cshtml b/CoreWiki/Pages/Components/CreateComments/CreateComments.cshtml index 2c3914c8..3be66748 100644 --- a/CoreWiki/Pages/Components/CreateComments/CreateComments.cshtml +++ b/CoreWiki/Pages/Components/CreateComments/CreateComments.cshtml @@ -1,7 +1,7 @@ @model Models.Comment

-

New Comment

+

@Localizer["NewComment"]

@@ -33,7 +33,7 @@
- +
diff --git a/CoreWiki/Pages/Components/ListComments/ListComments.cshtml b/CoreWiki/Pages/Components/ListComments/ListComments.cshtml index fe582fa9..fa47176d 100644 --- a/CoreWiki/Pages/Components/ListComments/ListComments.cshtml +++ b/CoreWiki/Pages/Components/ListComments/ListComments.cshtml @@ -1,13 +1,13 @@ @model ICollection
-

Comments List

+

@Localizer["CommentsList"]

@if (@Model.Count == 0) {
-
There are no comments to show!
+
@Localizer["NoComments"]
diff --git a/CoreWiki/Pages/Create.cshtml b/CoreWiki/Pages/Create.cshtml index b92fa706..20591c12 100644 --- a/CoreWiki/Pages/Create.cshtml +++ b/CoreWiki/Pages/Create.cshtml @@ -2,10 +2,10 @@ @model CoreWiki.Pages.CreateModel @{ - ViewData["Title"] = "Create"; + ViewData["Title"] = Localizer["Create"]; } -

Create New Article

+

@Localizer["CreateNewArticle"]


@@ -25,13 +25,13 @@
- +
- Upload + @Localizer["Upload"]
- +
@@ -41,7 +41,7 @@
diff --git a/CoreWiki/Pages/CreateArticleFromLink.cshtml b/CoreWiki/Pages/CreateArticleFromLink.cshtml index 8d690f7f..4dd0cc94 100644 --- a/CoreWiki/Pages/CreateArticleFromLink.cshtml +++ b/CoreWiki/Pages/CreateArticleFromLink.cshtml @@ -4,14 +4,14 @@ ViewData["Title"] = "CreateArticleFromLink"; } -

Found links to articles that do not yet exist

+

@Localizer["FoundLinksText"]


-
The following links to CoreWiki articles that do not yet exist were found in the Article:
+
@Localizer["FoundLinksDetail"]:

@if (Model.LinksToCreate != null && Model.LinksToCreate.Count > 0) { @@ -24,14 +24,14 @@ }

-
Would you link to create these articles now?
+
@Localizer["FoundLinksQuestion"]

- +   - +
diff --git a/CoreWiki/Pages/Delete.cshtml b/CoreWiki/Pages/Delete.cshtml index 6aa7ce4a..e7cfe936 100644 --- a/CoreWiki/Pages/Delete.cshtml +++ b/CoreWiki/Pages/Delete.cshtml @@ -2,12 +2,12 @@ @model CoreWiki.Pages.DeleteModel @{ - ViewData["Title"] = "Delete"; + ViewData["Title"] = Localizer["Delete"]; } -

Delete

+

@Localizer["Delete"]

-

Are you sure you want to delete this article?

+

@Localizer["DeleteQuestion"]


@@ -34,10 +34,10 @@
- +
diff --git a/CoreWiki/Pages/Details.cshtml b/CoreWiki/Pages/Details.cshtml index ba7547f4..3c4a0722 100644 --- a/CoreWiki/Pages/Details.cshtml +++ b/CoreWiki/Pages/Details.cshtml @@ -1,26 +1,29 @@ @page "{Slug?}" @model DetailsModel @{ - var title = "Details"; + var title = Localizer["Details"]; if (!string.IsNullOrEmpty(Model.Article.Topic)) { - title = Model.Article.Topic; + ViewData["Title"] = Model.Article.Topic; + } + else + { + ViewData["Title"] = title; } - ViewData["Title"] = title; }

@Model.Article.Topic

-
Last Published: @Model.Article.Published
-
View Count: @Model.Article.ViewCount
-
Estimated Reading Time:
+
@Localizer["Published"]: @Model.Article.Published
+
@Localizer["ViewCount"]: @Model.Article.ViewCount
+
@Localizer["ReadingTime"]:
- Edit + @Localizer["Edit"] @if (Model.Article.Slug != "home-page") { - | Back to Home + | @Localizer["GoHome"] }
diff --git a/CoreWiki/Pages/Edit.cshtml b/CoreWiki/Pages/Edit.cshtml index 5e9d3c0d..c3a4a2fe 100644 --- a/CoreWiki/Pages/Edit.cshtml +++ b/CoreWiki/Pages/Edit.cshtml @@ -2,10 +2,10 @@ @model CoreWiki.Pages.EditModel @{ - ViewData["Title"] = "Edit"; + ViewData["Title"] = Localizer["Edit"]; } -

Edit Article

+

@Localizer["EditArticle"]


@@ -26,13 +26,13 @@
- +
- Upload + @Localizer["Upload"]
- +
@@ -41,7 +41,7 @@
@section Scripts { diff --git a/CoreWiki/Pages/LatestChanges.cshtml b/CoreWiki/Pages/LatestChanges.cshtml index 3e7f712c..cc8f3597 100644 --- a/CoreWiki/Pages/LatestChanges.cshtml +++ b/CoreWiki/Pages/LatestChanges.cshtml @@ -2,13 +2,13 @@ @model CoreWiki.Pages.LatestChangesModel @{ - ViewData["Title"] = "Latest Changes"; + ViewData["Title"] = Localizer["LatestChanges"]; } -

Latest Changes

+

@Localizer["LatestChanges"]

- New article + @Localizer["NewArticle"]

diff --git a/CoreWiki/Pages/Privacy.cshtml b/CoreWiki/Pages/Privacy.cshtml index f3787bac..3b54bc90 100644 --- a/CoreWiki/Pages/Privacy.cshtml +++ b/CoreWiki/Pages/Privacy.cshtml @@ -1,8 +1,8 @@ @page @model PrivacyModel @{ - ViewData["Title"] = "Privacy Policy"; + ViewData["Title"] = Localizer["PrivacyPolicy"]; }

@ViewData["Title"]

-

Use this page to detail your site's privacy policy.

\ No newline at end of file +

@Localizer["PrivacyPolicyText"]

diff --git a/CoreWiki/Pages/Search.cshtml b/CoreWiki/Pages/Search.cshtml index e4d64005..ddc452e0 100644 --- a/CoreWiki/Pages/Search.cshtml +++ b/CoreWiki/Pages/Search.cshtml @@ -4,21 +4,21 @@ @using Humanizer; @model SearchModel @{ - ViewData["Title"] = "Search"; + ViewData["Title"] = Localizer["Search"]; var searchResult = Model.SearchResult; var urlParams = new Dictionary { {"Query", searchResult?.Query ?? ""} }; } -

Search CoreWiki

+

@Localizer["SearchText"]

- +
- +
diff --git a/CoreWiki/Pages/Shared/_CookieConsentPartial.cshtml b/CoreWiki/Pages/Shared/_CookieConsentPartial.cshtml index bd8c1e13..faf45ade 100644 --- a/CoreWiki/Pages/Shared/_CookieConsentPartial.cshtml +++ b/CoreWiki/Pages/Shared/_CookieConsentPartial.cshtml @@ -18,10 +18,10 @@

- Use this space to summarize your privacy and cookie use policy. + @Localizer["CookiePolicyText"]

- Learn More + @Localizer["LearnMore"]
diff --git a/CoreWiki/Pages/Shared/_Layout.cshtml b/CoreWiki/Pages/Shared/_Layout.cshtml index 865c1340..490960d8 100644 --- a/CoreWiki/Pages/Shared/_Layout.cshtml +++ b/CoreWiki/Pages/Shared/_Layout.cshtml @@ -1,4 +1,5 @@ @using System.IO + @inject Microsoft.AspNetCore.Hosting.IHostingEnvironment env @inject Microsoft.AspNetCore.Http.IHttpContextAccessor context @inject IOptionsSnapshot settings @@ -56,8 +57,8 @@
@@ -84,7 +85,7 @@