Welcome to @ServerConfiguration.Instance.Customization.ServerName!
+@Model.Translate(LandingPageStrings.Welcome, ServerConfiguration.Instance.Customization.ServerName)
@if (Model.User != null) { -You are currently logged in as @Model.User.Username.
- if (ServerConfiguration.Instance.Authentication.UseExternalAuth && Model.AuthenticationAttemptsCount > 0) +@Model.Translate(LandingPageStrings.LoggedInAs, Model.User.Username)
+ if (ServerConfiguration.Instance.Authentication.UseExternalAuth && Model.PendingAuthAttempts > 0) {- You have @Model.AuthenticationAttemptsCount authentication attempts pending. Click here to view them. + @Model.Translate(LandingPageStrings.AuthAttemptsPending, Model.PendingAuthAttempts)
} } @if (Model.PlayersOnlineCount == 1) { -There is 1 user currently online:
+@Model.Translate(LandingPageStrings.UsersSingle)
@foreach (User user in Model.PlayersOnline) { @user.Username @@ -34,11 +35,11 @@ else if (Model.PlayersOnlineCount == 0) { -There are no users online. Why not hop on?
+@Model.Translate(LandingPageStrings.UsersNone)
} else { -There are currently @Model.PlayersOnlineCount users online:
+@Model.Translate(LandingPageStrings.UsersMultiple, Model.PlayersOnlineCount)
@foreach (User user in Model.PlayersOnline) { @user.Username @@ -50,7 +51,7 @@ else
-
Latest Team Picks
+@Model.Translate(LandingPageStrings.LatestTeamPicks)
@foreach (Slot slot in Model.LatestTeamPicks!) @* Can't reach a point where this is null *@
@@ -67,7 +68,7 @@ else
}
-
Newest Levels
+@Model.Translate(LandingPageStrings.NewestLevels)
@foreach (Slot slot in Model.NewestLevels!) @* Can't reach a point where this is null *@
diff --git a/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs
index 20b13dbc..fecee91b 100644
--- a/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/LandingPage.cshtml.cs
@@ -15,7 +15,7 @@ public class LandingPage : BaseLayout
public LandingPage(Database database) : base(database)
{}
- public int AuthenticationAttemptsCount;
+ public int PendingAuthAttempts;
public List PlayersOnline = new();
public int PlayersOnlineCount;
@@ -32,7 +32,7 @@ public class LandingPage : BaseLayout
this.PlayersOnlineCount = await StatisticsHelper.RecentMatches();
if (user != null)
- this.AuthenticationAttemptsCount = await this.Database.AuthenticationAttempts.Include
+ this.PendingAuthAttempts = await this.Database.AuthenticationAttempts.Include
(a => a.GameToken)
.CountAsync(a => a.GameToken.UserId == user.UserId);
diff --git a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml
index 5b65cd09..5f9ca7f8 100644
--- a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml
@@ -1,27 +1,28 @@
@using LBPUnion.ProjectLighthouse.Configuration
@using LBPUnion.ProjectLighthouse.Extensions
@using LBPUnion.ProjectLighthouse.Helpers
+@using LBPUnion.ProjectLighthouse.Localization.StringLists
@using LBPUnion.ProjectLighthouse.Types
@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts.BaseLayout
@{
if (Model!.User == null)
{
- Model.NavigationItemsRight.Add(new PageNavigationItem("Login / Register", "/login", "sign in"));
+ Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderLoginRegister, "/login", "sign in"));
}
else
{
if (ServerConfiguration.Instance.Authentication.UseExternalAuth)
{
- Model.NavigationItems.Add(new PageNavigationItem("Authentication", "/authentication", "key"));
+ Model.NavigationItems.Add(new PageNavigationItem(BaseLayoutStrings.HeaderAuthentication, "/authentication", "key"));
}
- Model.NavigationItemsRight.Add(new PageNavigationItem("Profile", "/user/" + Model.User.UserId, "user alternate"));
+ Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderProfile, "/user/" + Model.User.UserId, "user alternate"));
@if (Model.User.IsAdmin)
{
- Model.NavigationItemsRight.Add(new PageNavigationItem("Admin Panel", "/admin", "cogs"));
+ Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderAdminPanel, "/admin", "cogs"));
}
- Model.NavigationItemsRight.Add(new PageNavigationItem("Log out", "/logout", "user alternate slash")); // should always be last
+ Model.NavigationItemsRight.Add(new PageNavigationItem(BaseLayoutStrings.HeaderLogout, "/logout", "user alternate slash")); // should always be last
}
Model.IsMobile = Model.Request.IsMobile();
@@ -95,7 +96,7 @@
@if (!Model.IsMobile)
{
- @navigationItem.Name
+ @Model.Translate(navigationItem.Name)
}
}
@@ -110,7 +111,7 @@
@if (!Model.IsMobile)
{
- @navigationItem.Name
+ @Model.Translate(navigationItem.Name)
}
}
diff --git a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs
index 991692da..3537e4cb 100644
--- a/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs
+++ b/ProjectLighthouse.Servers.Website/Pages/Layouts/BaseLayout.cshtml.cs
@@ -1,22 +1,21 @@
#nullable enable
+using System;
+using System.Collections.Generic;
+using LBPUnion.ProjectLighthouse.Configuration;
+using LBPUnion.ProjectLighthouse.Localization;
+using LBPUnion.ProjectLighthouse.Localization.StringLists;
using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
using LBPUnion.ProjectLighthouse.Types;
+using Microsoft.AspNetCore.Localization;
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
public class BaseLayout : PageModel
{
-
public readonly Database Database;
- public readonly List NavigationItems = new()
- {
- new PageNavigationItem("Home", "/", "home"),
- new PageNavigationItem("Users", "/users/0", "user friends"),
- new PageNavigationItem("Photos", "/photos/0", "camera"),
- new PageNavigationItem("Levels", "/slots/0", "certificate"),
- };
+ public readonly List NavigationItems = new();
public readonly List NavigationItemsRight = new();
public string Description = string.Empty;
@@ -31,6 +30,11 @@ public class BaseLayout : PageModel
public BaseLayout(Database database)
{
this.Database = database;
+
+ this.NavigationItems.Add(new PageNavigationItem(BaseLayoutStrings.HeaderHome, "/", "home"));
+ this.NavigationItems.Add(new PageNavigationItem(BaseLayoutStrings.HeaderUsers, "/users/0", "user friends"));
+ this.NavigationItems.Add(new PageNavigationItem(BaseLayoutStrings.HeaderPhotos, "/photos/0", "camera"));
+ this.NavigationItems.Add(new PageNavigationItem(BaseLayoutStrings.HeaderSlots, "/slots/0", "certificate"));
}
public new User? User {
@@ -41,4 +45,17 @@ public class BaseLayout : PageModel
}
set => this.user = value;
}
+
+ private string getLanguage()
+ {
+ if (ServerStatics.IsUnitTesting) return "en-US";
+
+ IRequestCultureFeature? requestCulture = Request.HttpContext.Features.Get();
+
+ if (requestCulture == null) return LocalizationManager.DefaultLang;
+ return requestCulture.RequestCulture.UICulture.Name;
+ }
+
+ public string Translate(TranslatableString translatableString) => translatableString.Translate(this.getLanguage());
+ public string Translate(TranslatableString translatableString, params object?[] format) => translatableString.Translate(this.getLanguage(), format);
}
\ No newline at end of file
diff --git a/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml
index fbebba49..cedbbdc7 100644
--- a/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/LoginForm.cshtml
@@ -1,10 +1,11 @@
@page "/login"
@using LBPUnion.ProjectLighthouse.Configuration
+@using LBPUnion.ProjectLighthouse.Localization.StringLists
@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LoginForm
@{
Layout = "Layouts/BaseLayout";
- Model.Title = "Log in";
+ Model.Title = Model.Translate(GeneralStrings.LogIn);
}
@@ -29,7 +30,7 @@
{
@@ -40,17 +41,17 @@
-
+
-
+
-
+
-
+
@@ -62,13 +63,13 @@
}
-
+
@if (ServerConfiguration.Instance.Authentication.RegistrationEnabled)
{
}
@@ -76,7 +77,7 @@
\ No newline at end of file diff --git a/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml index 62f902c1..8854bcb0 100644 --- a/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml @@ -1,10 +1,16 @@ @page "/logout" +@using LBPUnion.ProjectLighthouse.Localization.StringLists @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LogoutPage @{ Layout = "Layouts/BaseLayout"; - Model.Title = "Logged out"; + Model.Title = Model.Translate(LoggedOutStrings.LoggedOut); } - OnGet([FromRoute] int reportId)
+ {
+ User? user = this.Database.UserFromWebRequest(this.Request);
+ if (user == null) return this.Redirect("~/login");
+ if (!user.IsAdmin) return this.NotFound();
+
+ GriefReport? report = await this.Database.Reports
+ .Include(r => r.ReportingPlayer)
+ .FirstOrDefaultAsync(r => r.ReportId == reportId);
+ if (report == null) return this.NotFound();
+
+ report.XmlPlayers = (ReportPlayer[])JsonSerializer.Deserialize(report.Players,
+ typeof(ReportPlayer[]))!;
+
+ report.XmlBounds = new Marqee
+ {
+ Rect = (Rectangle)JsonSerializer.Deserialize(report.Bounds,
+ typeof(Rectangle))!,
+ };
+
+ this.Report = report;
+
+ return this.Page();
+ }
+}
\ No newline at end of file
diff --git a/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml
index c413b58a..8193a398 100644
--- a/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml
+++ b/ProjectLighthouse.Servers.Website/Pages/ReportsPage.cshtml
@@ -28,214 +28,10 @@
@foreach (GriefReport report in Model.Reports)
{
-
+
diff --git a/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs b/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
index 97b813cc..f1f80025 100644
--- a/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
+++ b/ProjectLighthouse.Servers.Website/Startup/WebsiteStartup.cs
@@ -1,5 +1,8 @@
+using System.Globalization;
+using LBPUnion.ProjectLighthouse.Localization;
using LBPUnion.ProjectLighthouse.Middlewares;
using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.AspNetCore.Localization;
#if !DEBUG
using Microsoft.Extensions.Hosting.Internal;
@@ -38,6 +41,16 @@ public class WebsiteStartup
}
);
+ services.Configure(config =>
+ {
+ List languages = LocalizationManager.GetAvailableLanguages().Select(l => new CultureInfo(LocalizationManager.MapLanguage(l))).ToList();
+
+ config.DefaultRequestCulture = new RequestCulture(new CultureInfo("en-US"));
+
+ config.SupportedCultures = languages;
+ config.SupportedUICultures = languages;
+ });
+
#if DEBUG
services.AddSingleton();
#else
@@ -63,6 +76,8 @@ public class WebsiteStartup
ServeUnknownFileTypes = true,
});
+ app.UseRequestLocalization();
+
app.UseEndpoints(endpoints => endpoints.MapControllers());
app.UseEndpoints(endpoints => endpoints.MapRazorPages());
}
diff --git a/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs b/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs
index 35a20bb4..af4c9af2 100644
--- a/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs
+++ b/ProjectLighthouse.Tests.WebsiteTests/Tests/AuthenticationTests.cs
@@ -78,7 +78,7 @@ public class AuthenticationTests : LighthouseWebTest
[DatabaseFact]
public async Task ShouldLoginWithInjectedCookie()
{
- const string loggedInAsUsernameTextXPath = "/html/body/div/div/div/p[1]/b";
+ const string loggedInAsUsernameTextXPath = "/html/body/div/div/div/p[1]";
await using Database database = new();
Random random = new();
@@ -96,10 +96,10 @@ public class AuthenticationTests : LighthouseWebTest
INavigation navigation = this.Driver.Navigate();
navigation.GoToUrl(this.BaseAddress + "/");
+ Assert.DoesNotContain(user.Username, this.Driver.FindElement(By.XPath(loggedInAsUsernameTextXPath)).Text);
this.Driver.Manage().Cookies.AddCookie(new Cookie("LighthouseToken", webToken.UserToken));
- Assert.Throws(() => this.Driver.FindElement(By.XPath(loggedInAsUsernameTextXPath)));
navigation.Refresh();
- Assert.True(this.Driver.FindElement(By.XPath(loggedInAsUsernameTextXPath)).Text == user.Username);
+ Assert.Contains(user.Username, this.Driver.FindElement(By.XPath(loggedInAsUsernameTextXPath)).Text);
await database.RemoveUser(user);
}
diff --git a/ProjectLighthouse.sln b/ProjectLighthouse.sln
index b2f58bdc..4f163398 100644
--- a/ProjectLighthouse.sln
+++ b/ProjectLighthouse.sln
@@ -20,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Servers", "Servers", "{1DE7
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source Code", "Source Code", "{7805B410-9260-4907-A7C6-D739369B2F25}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.Localization", "ProjectLighthouse.Localization\ProjectLighthouse.Localization.csproj", "{18B76DAC-5DCB-44EA-B74D-0B4554BB161C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -51,6 +53,10 @@ Global
{FA9AEA06-D6B5-4E68-8370-DB9188108635}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA9AEA06-D6B5-4E68-8370-DB9188108635}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FA9AEA06-D6B5-4E68-8370-DB9188108635}.Release|Any CPU.Build.0 = Release|Any CPU
+ {18B76DAC-5DCB-44EA-B74D-0B4554BB161C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {18B76DAC-5DCB-44EA-B74D-0B4554BB161C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {18B76DAC-5DCB-44EA-B74D-0B4554BB161C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {18B76DAC-5DCB-44EA-B74D-0B4554BB161C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{AFC74569-B289-4ACC-B21C-313A3A62C017} = {D360C08E-EA47-43AC-A566-FDF413442980}
@@ -61,5 +67,6 @@ Global
{FA9AEA06-D6B5-4E68-8370-DB9188108635} = {1DE7A758-1F4F-4BA5-BE1C-74F9D0AB9EA3}
{1DE7A758-1F4F-4BA5-BE1C-74F9D0AB9EA3} = {7805B410-9260-4907-A7C6-D739369B2F25}
{C6CFD4AD-47ED-4C86-B0C4-A4216D82E0DC} = {7805B410-9260-4907-A7C6-D739369B2F25}
+ {18B76DAC-5DCB-44EA-B74D-0B4554BB161C} = {7805B410-9260-4907-A7C6-D739369B2F25}
EndGlobalSection
EndGlobal
diff --git a/ProjectLighthouse/Configuration/ConfigurationCategories/DiscordIntegrationConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/DiscordIntegrationConfiguration.cs
index 92246899..1454338d 100644
--- a/ProjectLighthouse/Configuration/ConfigurationCategories/DiscordIntegrationConfiguration.cs
+++ b/ProjectLighthouse/Configuration/ConfigurationCategories/DiscordIntegrationConfiguration.cs
@@ -8,4 +8,6 @@ public class DiscordIntegrationConfiguration
public bool DiscordIntegrationEnabled { get; set; }
public string Url { get; set; } = "";
+
+ public string ModerationUrl { get; set; } = "";
}
\ No newline at end of file
diff --git a/ProjectLighthouse/Configuration/ServerConfiguration.cs b/ProjectLighthouse/Configuration/ServerConfiguration.cs
index 30c5ee41..41618860 100644
--- a/ProjectLighthouse/Configuration/ServerConfiguration.cs
+++ b/ProjectLighthouse/Configuration/ServerConfiguration.cs
@@ -23,7 +23,7 @@ public class ServerConfiguration
// You can use an ObsoleteAttribute instead. Make sure you set it to error, though.
//
// Thanks for listening~
- public const int CurrentConfigVersion = 7;
+ public const int CurrentConfigVersion = 8;
#region Meta
diff --git a/ProjectLighthouse/Helpers/LocalizationHelper.cs b/ProjectLighthouse/Helpers/LocalizationHelper.cs
new file mode 100644
index 00000000..e22f91d8
--- /dev/null
+++ b/ProjectLighthouse/Helpers/LocalizationHelper.cs
@@ -0,0 +1,4 @@
+namespace LBPUnion.ProjectLighthouse.Helpers;
+
+public static class LocalizationHelper
+{}
\ No newline at end of file
diff --git a/ProjectLighthouse/Helpers/WebhookHelper.cs b/ProjectLighthouse/Helpers/WebhookHelper.cs
index 031a79de..d54026c2 100644
--- a/ProjectLighthouse/Helpers/WebhookHelper.cs
+++ b/ProjectLighthouse/Helpers/WebhookHelper.cs
@@ -1,3 +1,4 @@
+using System;
using System.Threading.Tasks;
using Discord;
using Discord.Webhook;
@@ -7,17 +8,44 @@ namespace LBPUnion.ProjectLighthouse.Helpers;
public static class WebhookHelper
{
- private static readonly DiscordWebhookClient client = (ServerConfiguration.Instance.DiscordIntegration.DiscordIntegrationEnabled
+ ///
+ /// The destination of the webhook post.
+ ///
+ public enum WebhookDestination : byte
+ {
+ ///
+ /// A channel intended for public viewing; where new levels and photos are sent.
+ ///
+ Public,
+ ///
+ /// A channel intended for moderators; where grief reports are sent.
+ ///
+ Moderation,
+ }
+
+ private static readonly DiscordWebhookClient publicClient = (ServerConfiguration.Instance.DiscordIntegration.DiscordIntegrationEnabled
? new DiscordWebhookClient(ServerConfiguration.Instance.DiscordIntegration.Url)
: null);
+ private static readonly DiscordWebhookClient moderationClient = (ServerConfiguration.Instance.DiscordIntegration.DiscordIntegrationEnabled
+ ? new DiscordWebhookClient(ServerConfiguration.Instance.DiscordIntegration.ModerationUrl)
+ : null);
+
public static readonly Color UnionColor = new(0, 140, 255);
- public static Task SendWebhook(EmbedBuilder builder) => SendWebhook(builder.Build());
+ public static Task SendWebhook(EmbedBuilder builder, WebhookDestination dest = WebhookDestination.Public)
+ => SendWebhook(builder.Build(), dest);
- public static async Task SendWebhook(Embed embed)
+ public static async Task SendWebhook(Embed embed, WebhookDestination dest = WebhookDestination.Public)
{
if (!ServerConfiguration.Instance.DiscordIntegration.DiscordIntegrationEnabled) return;
+
+ DiscordWebhookClient client = dest switch
+ {
+ WebhookDestination.Public => publicClient,
+ WebhookDestination.Moderation => moderationClient,
+ _ => throw new ArgumentOutOfRangeException(nameof(dest), dest, null),
+ };
await client.SendMessageAsync
(
@@ -28,7 +56,7 @@ public static class WebhookHelper
);
}
- public static Task SendWebhook(string title, string description)
+ public static Task SendWebhook(string title, string description, WebhookDestination dest = WebhookDestination.Public)
=> SendWebhook
(
new EmbedBuilder
@@ -36,6 +64,7 @@ public static class WebhookHelper
Title = title,
Description = description,
Color = UnionColor,
- }
+ },
+ dest
);
}
\ No newline at end of file
diff --git a/ProjectLighthouse/ProjectLighthouse.csproj b/ProjectLighthouse/ProjectLighthouse.csproj
index 73572f6e..b2df14d8 100644
--- a/ProjectLighthouse/ProjectLighthouse.csproj
+++ b/ProjectLighthouse/ProjectLighthouse.csproj
@@ -59,18 +59,7 @@
-
- True
- True
- Resources.resx
-
-
-
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
+
diff --git a/ProjectLighthouse/Types/PageNavigationItem.cs b/ProjectLighthouse/Types/PageNavigationItem.cs
index 11068c0a..c7ad4c5d 100644
--- a/ProjectLighthouse/Types/PageNavigationItem.cs
+++ b/ProjectLighthouse/Types/PageNavigationItem.cs
@@ -1,16 +1,18 @@
+using LBPUnion.ProjectLighthouse.Localization;
+
#nullable enable
namespace LBPUnion.ProjectLighthouse.Types;
public class PageNavigationItem
{
- public PageNavigationItem(string name, string url, string? icon = null)
+ public PageNavigationItem(TranslatableString name, string url, string? icon = null)
{
this.Name = name;
this.Url = url;
this.Icon = icon;
}
- public string Name { get; set; }
+ public TranslatableString Name { get; set; }
public string Url { get; set; }
public string? Icon { get; set; }
}
\ No newline at end of file
diff --git a/README.md b/README.md
index 903e3baf..a91d5d3d 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ environment until release**.
This is because we have not entirely nailed security down yet, and **your instance WILL get attacked** as a result. It's
happened before, and it'll happen again.
-Simply put, **Project Lighthouse is not ready for the general public yet**.
+Simply put, **Project Lighthouse is not ready for the public yet**.
In addition, we're not responsible if someone hacks your machine and wipes your database, so make frequent backups, and
be sure to report any vulnerabilities. Thank you in advance.
@@ -61,12 +61,12 @@ information.
## Compatibility across games and platforms
-| Game | Console (PS3/Vita/PSP) | Emulator (RPCS3/Vita3k/PPSSPP) | Next-Gen (PS4/PS5/Vita) |
-|----------|-------------------------------------|--------------------------------------------------------------|-------------------------|
-| LBP1 | Compatible | Compatible with patched RPCS3 build | No next-gen equivalent |
-| LBP2 | Compatible | Compatible with patched RPCS3 build | No next-gen equivalent |
-| LBP3 | Mostly compatible, frequent crashes | Mostly compatible with patched RPCS3 build, frequent crashes | Incompatible |
-| LBP Vita | Compatible | Incompatible, marked as "Intro" on Vita3k | No next-gen equivalent |
-| LBP PSP | Potentially compatible | Incompatible, PSN not supported on PPSSPP | Potentially Compatible |
+| Game | Console (PS3/Vita/PSP) | Emulator (RPCS3/Vita3k/PPSSPP) | Next-Gen (PS4/PS5/Adrenaline) |
+|----------|------------------------|-------------------------------------------|-------------------------------|
+| LBP1 | Compatible | Compatible | No next-gen equivalent |
+| LBP2 | Compatible | Compatible | No next-gen equivalent |
+| LBP3 | Mostly compatible | Mostly compatible | Incompatible |
+| LBP Vita | Compatible | Incompatible, PSN not supported on Vita3k | No next-gen equivalent |
+| LBP PSP | Potentially compatible | Incompatible, PSN not supported on PPSSPP | Potentially Compatible |
Project Lighthouse is mostly a work in progress, so this chart is subject to change at any point.
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 00000000..2e6c5d14
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,6 @@
+preserve_hierarchy: true
+files:
+ - source: /ProjectLighthouse.Localization/*.resx
+ translation: /ProjectLighthouse.Localization/%file_name%.lang-%locale%.%file_extension%
+ ignore:
+ - /ProjectLighthouse.Localization/%file_name%.*.%file_extension%
\ No newline at end of file diff --git a/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml index 62f902c1..8854bcb0 100644 --- a/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/LogoutPage.cshtml @@ -1,10 +1,16 @@ @page "/logout" +@using LBPUnion.ProjectLighthouse.Localization.StringLists @model LBPUnion.ProjectLighthouse.Servers.Website.Pages.LogoutPage @{ Layout = "Layouts/BaseLayout"; - Model.Title = "Logged out"; + Model.Title = Model.Translate(LoggedOutStrings.LoggedOut); } -
You have been successfully logged out. You will be redirected in 5 seconds, or you may click here to do so manually.
+@Model.Translate(LoggedOutStrings.LoggedOutInfo)
+ + + @Model.Translate(LoggedOutStrings.Redirect) + + \ No newline at end of file diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/RenderReportBoundsPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/RenderReportBoundsPartial.cshtml new file mode 100644 index 00000000..19387632 --- /dev/null +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/RenderReportBoundsPartial.cshtml @@ -0,0 +1,147 @@ + \ No newline at end of file diff --git a/ProjectLighthouse.Servers.Website/Pages/Partials/ReportPartial.cshtml b/ProjectLighthouse.Servers.Website/Pages/Partials/ReportPartial.cshtml new file mode 100644 index 00000000..7059919e --- /dev/null +++ b/ProjectLighthouse.Servers.Website/Pages/Partials/ReportPartial.cshtml @@ -0,0 +1,63 @@ +@using LBPUnion.ProjectLighthouse.Administration.Reports +@model LBPUnion.ProjectLighthouse.Administration.Reports.GriefReport + +
+
+
+ + + + Dismiss + + + + Remove all related assets + +
+
+
diff --git a/ProjectLighthouse.Servers.Website/Pages/ReportPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/ReportPage.cshtml
new file mode 100644
index 00000000..738d1dd1
--- /dev/null
+++ b/ProjectLighthouse.Servers.Website/Pages/ReportPage.cshtml
@@ -0,0 +1,18 @@
+@page "/admin/report/{reportId:int}"
+@model LBPUnion.ProjectLighthouse.Servers.Website.Pages.ReportPage
+
+@{
+ Layout = "Layouts/BaseLayout";
+ Model.Title = $"Report {Model.Report.ReportId}";
+}
+
+
+
+@await Html.PartialAsync("Partials/ReportPartial", Model.Report)
+@await Html.PartialAsync("Partials/RenderReportBoundsPartial")
\ No newline at end of file
diff --git a/ProjectLighthouse.Servers.Website/Pages/ReportPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/ReportPage.cshtml.cs
new file mode 100644
index 00000000..20f5cb4f
--- /dev/null
+++ b/ProjectLighthouse.Servers.Website/Pages/ReportPage.cshtml.cs
@@ -0,0 +1,42 @@
+using System.Text.Json;
+using LBPUnion.ProjectLighthouse.Administration.Reports;
+using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.Servers.Website.Pages.Layouts;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.EntityFrameworkCore;
+
+namespace LBPUnion.ProjectLighthouse.Servers.Website.Pages;
+
+public class ReportPage : BaseLayout
+{
+ public ReportPage(Database database) : base(database)
+ {}
+
+ public GriefReport Report;
+
+ public async Task
+
+ 
+
+ + + Report submitted by + + @Model.ReportingPlayer.Username + + +
+ Report contains @Model.XmlPlayers.Length @(Model.XmlPlayers.Length == 1 ? "player" : "players") + @foreach (ReportPlayer player in Model.XmlPlayers) + { +
+ @player.Name
+
+ }
+
+ +
+ Report time: @(DateTimeOffset.FromUnixTimeMilliseconds(Model.Timestamp).ToString("R"))
+
+
+ Report reason: @Model.Type
+
+
+ Level ID: @Model.LevelId
+
+
+ Level type: @Model.LevelType
+
+
+ Level owner: @Model.LevelOwner
+
+ + + + + Dismiss + + + + Remove all related assets + +
-
-
- - - - Dismiss - - - - Remove all related assets - -
-
+ @await Html.PartialAsync("Partials/ReportPartial", report)
}
-
+@await Html.PartialAsync("Partials/RenderReportBoundsPartial")
@if (Model.PageNumber != 0)
{
diff --git a/ProjectLighthouse.Servers.Website/ProjectLighthouse.Servers.Website.csproj b/ProjectLighthouse.Servers.Website/ProjectLighthouse.Servers.Website.csproj
index f94e0f90..4497d707 100644
--- a/ProjectLighthouse.Servers.Website/ProjectLighthouse.Servers.Website.csproj
+++ b/ProjectLighthouse.Servers.Website/ProjectLighthouse.Servers.Website.csproj
@@ -10,6 +10,7 @@
-
- 
-
- - - Report submitted by - - @report.ReportingPlayer.Username - - -
- Report contains @report.XmlPlayers.Length @(report.XmlPlayers.Length == 1 ? "player" : "players") - @foreach (ReportPlayer player in report.XmlPlayers) - { -
- @player.Name
-
- }
-
- -
- Report time: @(DateTimeOffset.FromUnixTimeMilliseconds(report.Timestamp).ToString("R"))
-
-
- Report reason: @report.Type
-
-
- Level ID: @report.LevelId
-
-
- Level type: @report.LevelType
-
-
- Level owner: @report.LevelOwner
-
- - - - - Dismiss - - - - Remove all related assets - -