Add per-player menu localization and refactor menus

Introduces per-player localization for menu categories and items using translation keys and IStringLocalizer, allowing modules and the main plugin to display menu names in the player's language. Refactors menu registration and builder logic to use translation keys, updates API and documentation, and adds database provider upsert query abstraction for player IPs. Also updates version to 1.7.8-beta-4 and corrects a translation string typo.

Author: daffyyyy

CS2-SimpleAdmin/Api/CS2_SimpleAdminApi.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Commands;
+using CounterStrikeSharp.API.Core.Translations;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Commands.Targeting;
 using CounterStrikeSharp.API.Modules.Entities;
@@ -205,6 +206,14 @@ public void RegisterMenuCategory(string categoryId, string categoryName, string
         Menus.MenuManager.Instance.RegisterCategory(categoryId, categoryName, permission);
     }
 
+    public void RegisterMenuCategory(string categoryId, string categoryNameKey, string permission, object moduleLocalizer)
+    {
+        if (moduleLocalizer is not IStringLocalizer localizer)
+            throw new InvalidOperationException("moduleLocalizer must be an IStringLocalizer instance");
+
+        Menus.MenuManager.Instance.RegisterCategory(categoryId, categoryNameKey, permission, localizer);
+    }
+
     public void RegisterMenu(string categoryId, string menuId, string menuName,
         Func<CCSPlayerController, object> menuFactory, string? permission = null, string? commandName = null)
     {
@@ -263,6 +272,39 @@ MenuBuilder BuilderFactory(CCSPlayerController player)
         }
     }
 
+    public void RegisterMenu(string categoryId, string menuId, string menuNameKey,
+        Func<CCSPlayerController, MenuContext, object> menuFactory, string? permission, string? commandName, object moduleLocalizer)
+    {
+        if (moduleLocalizer is not IStringLocalizer localizer)
+            throw new InvalidOperationException("moduleLocalizer must be an IStringLocalizer instance");
+
+        Menus.MenuManager.Instance.RegisterMenu(categoryId, menuId, menuNameKey, BuilderFactory, permission, commandName, localizer);
+        return;
+
+        MenuBuilder BuilderFactory(CCSPlayerController player)
+        {
+            var context = new MenuContext(categoryId, menuId, menuNameKey, permission, commandName);
+
+            if (menuFactory(player, context) is not MenuBuilder menuBuilder)
+                throw new InvalidOperationException("Menu factory must return MenuBuilder");
+
+            // Dodaj automatyczną obsługę przycisku 'Wróć'
+            menuBuilder.WithBackAction(p =>
+            {
+                if (Menus.MenuManager.Instance.GetMenuCategories().TryGetValue(categoryId, out var category))
+                {
+                    Menus.MenuManager.Instance.CreateCategoryMenuPublic(category, p).OpenMenu(p);
+                }
+                else
+                {
+                    Menus.MenuManager.Instance.OpenMainMenu(p);
+                }
+            });
+
+            return menuBuilder;
+        }
+    }
+
 
     public void UnregisterMenu(string categoryId, string menuId)
     {
@@ -289,7 +331,30 @@ public object CreateMenuWithBack(string title, string categoryId, CCSPlayerContr
 
     public object CreateMenuWithBack(MenuContext context, CCSPlayerController player)
     {
-        return CreateMenuWithBack(context.MenuTitle, context.CategoryId, player);
+        // Get translated title if module has localizer
+        string title = context.MenuTitle;
+
+        if (Menus.MenuManager.Instance.GetMenuCategories().TryGetValue(context.CategoryId, out var category))
+        {
+            // Check if this specific menu has a localizer
+            if (category.MenuLocalizers.TryGetValue(context.MenuId, out var menuLocalizer))
+            {
+                using (new WithTemporaryCulture(player.GetLanguage()))
+                {
+                    title = menuLocalizer[context.MenuTitle] ?? context.MenuTitle;
+                }
+            }
+            // Fallback to category localizer
+            else if (category.ModuleLocalizer != null)
+            {
+                using (new WithTemporaryCulture(player.GetLanguage()))
+                {
+                    title = category.ModuleLocalizer[context.MenuTitle] ?? context.MenuTitle;
+                }
+            }
+        }
+
+        return CreateMenuWithBack(title, context.CategoryId, player);
     }
 
     public List<CCSPlayerController> GetValidPlayers()
@@ -321,7 +386,30 @@ public object CreateMenuWithPlayers(string title, string categoryId, CCSPlayerCo
     public object CreateMenuWithPlayers(MenuContext context, CCSPlayerController admin,
         Func<CCSPlayerController, bool> filter, Action<CCSPlayerController, CCSPlayerController> onSelect)
     {
-        return CreateMenuWithPlayers(context.MenuTitle, context.CategoryId, admin, filter, onSelect);
+        // Get translated title if module has localizer
+        string title = context.MenuTitle;
+
+        if (Menus.MenuManager.Instance.GetMenuCategories().TryGetValue(context.CategoryId, out var category))
+        {
+            // Check if this specific menu has a localizer
+            if (category.MenuLocalizers.TryGetValue(context.MenuId, out var menuLocalizer))
+            {
+                using (new WithTemporaryCulture(admin.GetLanguage()))
+                {
+                    title = menuLocalizer[context.MenuTitle] ?? context.MenuTitle;
+                }
+            }
+            // Fallback to category localizer
+            else if (category.ModuleLocalizer != null)
+            {
+                using (new WithTemporaryCulture(admin.GetLanguage()))
+                {
+                    title = category.ModuleLocalizer[context.MenuTitle] ?? context.MenuTitle;
+                }
+            }
+        }
+
+        return CreateMenuWithPlayers(title, context.CategoryId, admin, filter, onSelect);
     }
 
     public void AddMenuOption(object menu, string name, Action<CCSPlayerController> action, bool disabled = false,

CS2-SimpleAdmin/CS2-SimpleAdmin.cs

@@ -22,7 +22,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
     public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
     public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
     public override string ModuleAuthor => "daffyy & Dliix66";
-    public override string ModuleVersion => "1.7.8-beta-3";
+    public override string ModuleVersion => "1.7.8-beta-4";
 
     public override void Load(bool hotReload)
     {

CS2-SimpleAdmin/Database/IDatabaseProvider.cs

@@ -12,6 +12,9 @@ public interface IDatabaseProvider
     string GetBanSelectQuery(bool multiServer);
     string GetIpHistoryQuery();
     string GetBanUpdateQuery(bool multiServer);
+
+    // PlayerManager
+    string GetUpsertPlayerIpQuery();
 
     // PermissionManager
     string GetAdminsQuery();

CS2-SimpleAdmin/Database/Migrations/Sqlite/009_BanAllUsedIpAddress.sql

@@ -1,6 +1,6 @@
 CREATE TABLE IF NOT EXISTS `sa_players_ips` (
                                                 `steamid` INTEGER NOT NULL,
-                                                `address` INTEGER NOT NULL
+                                                `address` INTEGER NOT NULL,
                                                 `used_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
                                                 PRIMARY KEY (`steamid`, `address`)
 );

CS2-SimpleAdmin/Database/MysqlDatabaseProvider.cs

@@ -86,6 +86,17 @@ public string GetIpHistoryQuery()
         return "SELECT steamid, name, address, used_at FROM sa_players_ips ORDER BY used_at DESC";
     }
 
+    public string GetUpsertPlayerIpQuery()
+    {
+        return """
+            INSERT INTO `sa_players_ips` (steamid, name, address, used_at)
+            VALUES (@SteamID, @playerName, @IPAddress, CURRENT_TIMESTAMP)
+            ON DUPLICATE KEY UPDATE
+                used_at = CURRENT_TIMESTAMP,
+                name = @playerName;
+            """;
+    }
+
     public string GetBanUpdateQuery(bool multiServer)
     {
         return multiServer ? """

CS2-SimpleAdmin/Database/SqliteDatabaseProvider.cs

@@ -83,6 +83,17 @@ ORDER BY updated_at DESC
     public string GetIpHistoryQuery() =>
         "SELECT steamid, name, address, used_at FROM sa_players_ips ORDER BY used_at DESC";
 
+    public string GetUpsertPlayerIpQuery()
+    {
+        return """
+            INSERT INTO sa_players_ips (steamid, name, address, used_at)
+            VALUES (@SteamID, @playerName, @IPAddress, CURRENT_TIMESTAMP)
+            ON CONFLICT(steamid, address) DO UPDATE SET
+                used_at = CURRENT_TIMESTAMP,
+                name = @playerName;
+            """;
+    }
+
     public string GetBanUpdateQuery(bool multiServer) =>
         multiServer
             ? """

CS2-SimpleAdmin/Helper.cs

@@ -426,7 +426,7 @@ private static void SendDiscordLogMessage(CCSPlayerController? caller, CommandIn
 
         var communityUrl = caller != null ? "<" + new SteamID(caller.SteamID).ToCommunityUrl() + ">" : "<https://steamcommunity.com/profiles/0>";
         var callerName = caller != null ? caller.PlayerName : CS2_SimpleAdmin._localizer?["sa_console"] ?? "Console";
-        _ = CS2_SimpleAdmin.DiscordWebhookClientLog.SendMessageAsync(Helper.GenerateMessageDiscord(localizer["sa_discord_log_command", $"[{callerName}]({communityUrl})", command.GetCommandString]));
+        _ = CS2_SimpleAdmin.DiscordWebhookClientLog.SendMessageAsync(GenerateMessageDiscord(localizer["sa_discord_log_command", $"[{callerName}]({communityUrl})", command.GetCommandString]));
     }
 
     private static void SendDiscordLogMessage(CCSPlayerController? caller, string command, IStringLocalizer? localizer)
@@ -1026,7 +1026,9 @@ public static class Time
 {
     public static DateTime ActualDateTime()
     {
-        return DateTime.UtcNow;
+        if (CS2_SimpleAdmin.Instance.Config.DatabaseConfig.DatabaseType.ToLower().Equals("sqlite"))
+            return DateTime.UtcNow;
+        
         string timezoneId = CS2_SimpleAdmin.Instance.Config.Timezone;
         DateTime utcNow = DateTime.UtcNow;
 

CS2-SimpleAdmin/Managers/PlayerManager.cs

@@ -99,14 +99,8 @@ await Server.NextWorldUpdateAsync(() =>
                             var steamId64 = CS2_SimpleAdmin.PlayersInfo[steamId].SteamId.SteamId64;
                             var ipUint = IpHelper.IpToUint(ipAddress);
 
-                            // MySQL: INSERT ... ON DUPLICATE KEY UPDATE pattern
-                            const string upsertQuery = """
-                                INSERT INTO `sa_players_ips` (steamid, name, address, used_at)
-                                VALUES (@SteamID, @playerName, @IPAddress, CURRENT_TIMESTAMP)
-                                ON DUPLICATE KEY UPDATE
-                                    used_at = CURRENT_TIMESTAMP,
-                                    name = @playerName;
-                                """;
+                            // Use database-specific UPSERT query (handles MySQL vs SQLite syntax differences)
+                            var upsertQuery = CS2_SimpleAdmin.DatabaseProvider.GetUpsertPlayerIpQuery();
 
                             await connection.ExecuteAsync(upsertQuery, new
                             {