diff --git a/ProjectLighthouse.Localization/BaseLayout.resx b/ProjectLighthouse.Localization/BaseLayout.resx
index 79aae471..0bf1a4f8 100644
--- a/ProjectLighthouse.Localization/BaseLayout.resx
+++ b/ProjectLighthouse.Localization/BaseLayout.resx
@@ -71,4 +71,22 @@
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.
+
+ While we intend to have as little JavaScript as possible, we can not guarantee everything will work without it. We recommend that you whitelist JavaScript for Project Lighthouse.
+
+
+ JavaScript is not enabled
+
+
+ Potential License Violation
+
+
+ This instance is a public-facing instance that has been modified without the changes published. You may be in violation of the {0}.
+
+
+ If you believe this is an error, please create an issue with the output of {0} ran from the root of the server source code in the description on our {1}issue tracker{2}.
+
+
+ If not, please publish the source code somewhere accessible to your users.
+
\ No newline at end of file
diff --git a/ProjectLighthouse.Localization/LocalizationManager.cs b/ProjectLighthouse.Localization/LocalizationManager.cs
index 5e1e9a1f..a29fdf16 100644
--- a/ProjectLighthouse.Localization/LocalizationManager.cs
+++ b/ProjectLighthouse.Localization/LocalizationManager.cs
@@ -49,7 +49,7 @@ public static class LocalizationManager
return $"{translationArea.ToString()}.{language}.{key}";
}
- return localizedString;
+ return localizedString.Replace("\\n", "\n");
}
// If a language isn't working, it might be because a language is using a different name than what ASP.NET expects.
diff --git a/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs b/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs
index a69781b7..32dc1895 100644
--- a/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs
+++ b/ProjectLighthouse.Localization/StringLists/BaseLayoutStrings.cs
@@ -16,5 +16,12 @@ public static class BaseLayoutStrings
public static readonly TranslatableString GeneratedBy = create("generated_by");
public static readonly TranslatableString GeneratedModified = create("generated_modified");
+ public static readonly TranslatableString JavaScriptWarnTitle = create("js_warn_title");
+ public static readonly TranslatableString JavaScriptWarn = create("js_warn");
+ public static readonly TranslatableString LicenseWarnTitle = create("license_warn_title");
+ public static readonly TranslatableString LicenseWarn1 = create("license_warn_1");
+ public static readonly TranslatableString LicenseWarn2 = create("license_warn_2");
+ public static readonly TranslatableString LicenseWarn3 = create("license_warn_3");
+
private static TranslatableString create(string key) => new(TranslationAreas.BaseLayout, key);
}
\ No newline at end of file
diff --git a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml
index a5a39c3e..cb7915ae 100644
--- a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml
@@ -123,29 +123,36 @@
- JavaScript not enabled
+ @Model.Translate(BaseLayoutStrings.JavaScriptWarnTitle)
-
- While we intend to have as little JavaScript as possible, we can not
- guarantee everything will work without it. We recommend that you whitelist JavaScript for Project Lighthouse.
- It's not too bloated, we promise.
-
+
@Model.Translate(BaseLayoutStrings.JavaScriptWarn)
- @* ReSharper disable once CSharpWarnings::CS0162 *@
- @if (!ServerStatics.IsDebug && VersionHelper.IsDirty)
- {
+ @* ReSharper disable HeuristicUnreachableCode *@
+ @* ReSharper disable CSharpWarnings::CS0162 *@
+ @* @if (!ServerStatics.IsDebug && VersionHelper.IsDirty) *@
+ @{
-
Potential License Violation
-
This instance is a public-facing instance that has been modified without the changes published. You may be in violation of the GNU Affero General Public License v3.0.
-
If you believe this is an error, please create an issue with the output of git status
ran from the root of the server source code in the description on our issue tracker.
-
If not, please publish the source code somewhere accessible to your users.
+
@Model.Translate(BaseLayoutStrings.LicenseWarnTitle)
+
+ @Html.Raw(Model.Translate(BaseLayoutStrings.LicenseWarn1,
+ "GNU Affero General Public License v3.0"))
+
+
+ @Html.Raw(Model.Translate(BaseLayoutStrings.LicenseWarn2,
+ "git status
", "", ""))
+
+
+ @Html.Raw(Model.Translate(BaseLayoutStrings.LicenseWarn3))
+
}
+ @* ReSharper restore CSharpWarnings::CS0162 *@
+ @* ReSharper restore HeuristicUnreachableCode *@