Various localization fixes.

impworks · Apr 25, 2024 · b5a5274 · b5a5274
1 parent 1349624
commit b5a5274
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/src/Bonsai/Areas/Admin/Views/Changesets/Index.cshtml b/src/Bonsai/Areas/Admin/Views/Changesets/Index.cshtml
@@ -107,7 +107,7 @@
                         }
                     </td>
                     <td><span title="@c.Date.LocalDateTime.ToLocalizedFullDate()">@c.Date.Humanize()</span></td>
-                    <td>@c.ChangeType.GetEnumDescription()</td>
+                    <td>@c.ChangeType.GetLocaleEnumDescription()</td>
                     <td>@c.Author</td>
                     <td class="admin-row-actions">
                         @if (c.CanRevert)

diff --git a/src/Bonsai/Areas/Admin/Views/Pages/Editor.cshtml b/src/Bonsai/Areas/Admin/Views/Pages/Editor.cshtml
@@ -171,7 +171,7 @@
                 @if (data.DraftLastUpdateDate is DateTimeOffset draftDate)
                 {
                     var today = draftDate.Date == DateTimeOffset.Now.Date;
-                    <text>@string.Format(@Texts.Admin_Pages_Editor_DraftLoadedFormat, data.DraftLastUpdateDate.Value.ToString(today ? "T" : "G", LocaleProvider.GetCulture()))</text>
+                    <text>@string.Format(Texts.Admin_Pages_Editor_DraftLoadedFormat, data.DraftLastUpdateDate.Value.ToString(today ? "T" : "G", LocaleProvider.GetCulture()))</text>
                 }
             </span>
             @if (data.DraftDisplayNotification)
@@ -194,7 +194,7 @@
 @await Html.PartialAsync("~/Areas/Admin/Views/Components/PagePicker.cshtml")
 
 <script type="text/x-template" id="date-picker-template">
-    <input type="text" class="form-control" placeholder="@Texts.Datepicker_Placeholder" />
+    <input type="text" class="form-control" placeholder="@Html.Raw(Texts.Datepicker_Placeholder)" />
 </script>
 <script type="text/x-template" id="duration-picker-template">
     <div class="form-row">

diff --git a/src/Bonsai/Areas/Admin/Views/Pages/Facts/ContactsFactModel.cshtml b/src/Bonsai/Areas/Admin/Views/Pages/Facts/ContactsFactModel.cshtml
@@ -1,6 +1,6 @@
 @using Bonsai.Code.DomainModel.Facts.Models
+@using Bonsai.Code.Services
 @using Bonsai.Localization
-@using Impworks.Utils.Format
 <script type="text/x-template" data-kind="fact-template" id="ContactsFactModel">
     <div class="fact-wrapper">
         <h6>
@@ -16,7 +16,7 @@
                         <div class="form-group col-sm-4">
                             <label>@Texts.Admin_Pages_Facts_LinkType</label>
                             <select v-model="row.Type" class="form-control form-control-sm mr-2">
-                                @foreach (var prof in EnumHelper.GetEnumDescriptions<ContactType>())
+                                @foreach (var prof in LocaleProvider.GetLocaleEnumDescriptions<ContactType>())
                                 {
                                     <option value="@prof.Key">@prof.Value</option>
                                 }

diff --git a/src/Bonsai/Areas/Front/Views/Page/Facts/ContactsFactModel.cshtml b/src/Bonsai/Areas/Front/Views/Page/Facts/ContactsFactModel.cshtml
@@ -1,5 +1,5 @@
 @using Bonsai.Code.DomainModel.Facts.Models
-@using Impworks.Utils.Format
+@using Bonsai.Code.Services
 @model ContactsFactModel
 
 <tr class="fact">
@@ -9,7 +9,7 @@
     <td class="fact-value big-icons">
         @foreach (var item in Model.Values)
         {
-            <a class="big-icon" href="@item.GetLink()" target="_blank" title="@item.Type.GetEnumDescription()">
+            <a class="big-icon" href="@item.GetLink()" target="_blank" title="@item.Type.GetLocaleEnumDescription()">
                 <span class="fa @(GetIcon(item.Type))"></span>
             </a>
         }

diff --git a/src/Bonsai/Areas/Front/Views/Page/Facts/LanguageFactModel.cshtml b/src/Bonsai/Areas/Front/Views/Page/Facts/LanguageFactModel.cshtml
@@ -1,5 +1,5 @@
 @using Bonsai.Code.DomainModel.Facts.Models
-@using Impworks.Utils.Format
+@using Bonsai.Code.Services
 @model LanguageFactModel
 
 <tr class="fact">
@@ -11,7 +11,7 @@
                 <span class="fact-item-main">@item.Name</span>
                 @if (item.Proficiency != null)
                 {
-                    <span class="fact-item-extra">(@item.Proficiency.Value.GetEnumDescription())</span>
+                    <span class="fact-item-extra">(@item.Proficiency.Value.GetLocaleEnumDescription())</span>
                 }
                 @if (item.Duration != null)
                 {

diff --git a/src/Bonsai/Areas/Front/Views/Page/Facts/SkillFactModel.cshtml b/src/Bonsai/Areas/Front/Views/Page/Facts/SkillFactModel.cshtml
@@ -1,5 +1,5 @@
 @using Bonsai.Code.DomainModel.Facts.Models
-@using Impworks.Utils.Format
+@using Bonsai.Code.Services
 @model SkillFactModel
 
 <tr class="fact">
@@ -11,7 +11,7 @@
                 <span class="fact-item-main">@item.Name</span>
                 @if (item.Proficiency != null)
                 {
-                    <span class="fact-item-extra">(@item.Proficiency.Value.GetEnumDescription())</span>
+                    <span class="fact-item-extra">(@item.Proficiency.Value.GetLocaleEnumDescription())</span>
                 }
                 @if (item.Duration != null)
                 {

diff --git a/src/Bonsai/Areas/Front/Views/Page/Tree.cshtml b/src/Bonsai/Areas/Front/Views/Page/Tree.cshtml
@@ -1,7 +1,7 @@
 @using Bonsai.Areas.Front.ViewModels.Page
+@using Bonsai.Code.Services
 @using Bonsai.Data.Models
 @using Bonsai.Localization
-@using Impworks.Utils.Format
 @model PageVM<PageTreeVM>
 @{
     Layout = "~/Areas/Front/Views/Page/PageLayout.cshtml";
@@ -24,7 +24,7 @@
         <div class="float-left btn-group btn-group-toggle">
             @foreach (var kind in Model.Body.SupportedKinds)
             {
-                <a href="@GetTreeUrl(kind)" class="btn btn-sm btn-outline-primary cmd-switch-tree @(kind == Model.Body.TreeKind ? "active" : "")" data-kind="@kind">@kind.GetEnumDescription()</a>
+                <a href="@GetTreeUrl(kind)" class="btn btn-sm btn-outline-primary cmd-switch-tree @(kind == Model.Body.TreeKind ? "active" : "")" data-kind="@kind">@kind.GetLocaleEnumDescription()</a>
             }
         </div>
         <div class="float-right btn-group">

diff --git a/src/Bonsai/Localization/Texts.Designer.cs b/src/Bonsai/Localization/Texts.Designer.cs