From f43739879b908dcba573d4122f70e615eaf79d45 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Fri, 13 Dec 2019 23:34:15 +0300 Subject: [PATCH] Added localization base for contact links --- .../Areas/Admin/Views/Contacts/Create.cshtml | 11 ++++++++--- .../Areas/Admin/Views/Contacts/Delete.cshtml | 2 ++ .../Areas/Admin/Views/Contacts/Edit.cshtml | 11 ++++++++--- .../Areas/Admin/Views/Contacts/Index.cshtml | 8 ++++++-- MyWebsite/MyWebsite/Models/Link.cs | 13 +++++++++++-- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Create.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Create.cshtml index 20ad646..c9cd439 100644 --- a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Create.cshtml +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Create.cshtml @@ -23,9 +23,14 @@
- - - + + + +
+
+ + +
diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Delete.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Delete.cshtml index 4c96856..daf7593 100644 --- a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Delete.cshtml +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Delete.cshtml @@ -14,6 +14,8 @@

@Html.DisplayNameFor(model => model.Name): @Model.Name
@Html.DisplayNameFor(model => model.Order): @Model.Order
+ @Html.DisplayNameFor(model => model.EnglishTitle): @Model.EnglishTitle
+ @Html.DisplayNameFor(model => model.RussianTitle): @Model.RussianTitle
@Html.DisplayNameFor(model => model.Title): @Model.Title
@Html.DisplayNameFor(model => model.Username): @Model.Username
@Html.DisplayNameFor(model => model.Url): @Model.Url
diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Edit.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Edit.cshtml index 132e6d5..7282932 100644 --- a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Edit.cshtml +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Edit.cshtml @@ -22,9 +22,14 @@

- - - + + + +
+
+ + +
diff --git a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Index.cshtml b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Index.cshtml index 230c95e..f55e445 100644 --- a/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Index.cshtml +++ b/MyWebsite/MyWebsite/Areas/Admin/Views/Contacts/Index.cshtml @@ -22,7 +22,10 @@ @Html.DisplayNameFor(model => model.Name) - @Html.DisplayNameFor(model => model.Title) + @Html.DisplayNameFor(model => model.EnglishTitle) + + + @Html.DisplayNameFor(model => model.RussianTitle) @Html.DisplayNameFor(model => model.Username) @@ -45,7 +48,8 @@ @item.Order @item.Name - @item.Title + @item.EnglishTitle + @item.RussianTitle @item.Username @item.Url diff --git a/MyWebsite/MyWebsite/Models/Link.cs b/MyWebsite/MyWebsite/Models/Link.cs index b539d6b..f13630c 100644 --- a/MyWebsite/MyWebsite/Models/Link.cs +++ b/MyWebsite/MyWebsite/Models/Link.cs @@ -1,6 +1,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Globalization; namespace MyWebsite.Models { @@ -14,10 +15,18 @@ namespace MyWebsite.Models [Required] [DisplayName("Order")] public int Order { get; set; } + + [DisplayName("Title")] + public string Title => CultureInfo.CurrentUICulture.TwoLetterISOLanguageName == "ru" && !string.IsNullOrWhiteSpace(RussianTitle) ? RussianTitle : EnglishTitle; + [Required] [Column(TypeName = "varchar(20)")] - [DisplayName("Title")] - public string Title { get; set; } + [DisplayName("Title (en)")] + public string EnglishTitle { get; set; } + [Column(TypeName = "varchar(20)")] + [DisplayName("Title (ru)")] + public string RussianTitle { get; set; } + [Required] [Column(TypeName = "varchar(50)")] [DisplayName("Username")]