]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Show customvote title in chat on finish (#39137)
authorlzk <124214523+lzk228@users.noreply.github.com>
Wed, 23 Jul 2025 14:15:29 +0000 (16:15 +0200)
committerGitHub <noreply@github.com>
Wed, 23 Jul 2025 14:15:29 +0000 (10:15 -0400)
* Show customvote title in chat on finish

* update the text

Content.Server/Voting/VoteCommands.cs
Resources/Locale/en-US/voting/vote-commands.ftl

index e526829d272afa9dceb3d0691580a211de121d48..8688c665a3b5a9fbe24f8527d1cd7c949fdcd097 100644 (file)
@@ -114,12 +114,12 @@ namespace Content.Server.Voting
                 {
                     var ties = string.Join(", ", eventArgs.Winners.Select(c => args[(int) c]));
                     _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Custom vote {options.Title} finished as tie: {ties}");
-                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-tie", ("ties", ties)));
+                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-tie", ("title", options.Title), ("ties", ties)));
                 }
                 else
                 {
                     _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Custom vote {options.Title} finished: {args[(int) eventArgs.Winner]}");
-                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-win", ("winner", args[(int) eventArgs.Winner])));
+                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-win", ("title", options.Title), ("winner", args[(int) eventArgs.Winner])));
                 }
 
                 _voteWebhooks.UpdateWebhookIfConfigured(webhookState, eventArgs);
index 94320294c81a237ab93e898028b92466a00e9f56..4ad19e7070a2d319b12e013829a170e196c52d4e 100644 (file)
@@ -12,8 +12,8 @@ cmd-createvote-arg-vote-type = <vote type>
 
 cmd-customvote-desc = Creates a custom vote
 cmd-customvote-help = Usage: customvote <title> <option1> <option2> [option3...]
-cmd-customvote-on-finished-tie = Tie between {$ties}!
-cmd-customvote-on-finished-win = {$winner} wins!
+cmd-customvote-on-finished-tie = The vote '{$title}' has finished: tie between {$ties}!
+cmd-customvote-on-finished-win = The vote '{$title}' has finished: {$winner} wins!
 cmd-customvote-arg-title = <title>
 cmd-customvote-arg-option-n = <option{ $n }>