From d1bec61b90d142f5d3efbe452210a8955a0bbfe5 Mon Sep 17 00:00:00 2001 From: jvyden Date: Mon, 1 Aug 2022 18:41:52 -0400 Subject: [PATCH] Fix BaseLayout not using translations --- ProjectLighthouse.Localization/LocalizationManager.cs | 2 ++ .../Pages/Layouts/BaseLayout.cshtml | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ProjectLighthouse.Localization/LocalizationManager.cs b/ProjectLighthouse.Localization/LocalizationManager.cs index a47abdad..5e1e9a1f 100644 --- a/ProjectLighthouse.Localization/LocalizationManager.cs +++ b/ProjectLighthouse.Localization/LocalizationManager.cs @@ -11,6 +11,8 @@ public static class LocalizationManager public static string GetLocalizedString(TranslationAreas translationArea, string language, string key) { +// return $"{translationArea.ToString()}.{language}.{key}"; + // ASP.NET requires specific names for certain languages (like ja for japanese as opposed to the standard ja-JP) // We map that value back here. language = mapLanguageBack(language); diff --git a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml index 5f9ca7f8..b921f08d 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml @@ -133,6 +133,7 @@ + @* ReSharper disable once CSharpWarnings::CS0162 *@ @if (!ServerStatics.IsDebug && VersionHelper.IsDirty) {
@@ -161,10 +162,10 @@
-

Page generated by @VersionHelper.FullVersion.

+

@Model.Translate(BaseLayoutStrings.GeneratedModified, VersionHelper.FullVersion)

@if (VersionHelper.IsDirty) { -

This page was generated using a modified version of Project Lighthouse. Please make sure you are properly disclosing the source code to any users who may be using this instance.

+

@Model.Translate(BaseLayoutStrings.GeneratedModified)

}