diff --git a/Content.Client/Voting/VoteCallMenu.xaml b/Content.Client/Voting/VoteCallMenu.xaml
index 7fa7f2ade0..11e2cc4fb4 100644
--- a/Content.Client/Voting/VoteCallMenu.xaml
+++ b/Content.Client/Voting/VoteCallMenu.xaml
@@ -6,7 +6,7 @@
-
+
-
+
-
+
diff --git a/Content.Client/Voting/VoteCallMenu.xaml.cs b/Content.Client/Voting/VoteCallMenu.xaml.cs
index abc8a5bfaa..cb17a694b8 100644
--- a/Content.Client/Voting/VoteCallMenu.xaml.cs
+++ b/Content.Client/Voting/VoteCallMenu.xaml.cs
@@ -20,8 +20,8 @@ namespace Content.Client.Voting
public static readonly (string name, string id, (string name, string id)[]? secondaries)[] AvailableVoteTypes =
{
- ("Restart round", "restart", null),
- ("Next gamemode", "preset", null)
+ ("ui-vote-type-restart", "restart", null),
+ ("ui-vote-type-gamemode", "preset", null)
};
public VoteCallMenu()
diff --git a/Content.Client/Voting/VoteCallMenuButton.cs b/Content.Client/Voting/VoteCallMenuButton.cs
index 5ec4b76d18..74c6a65de8 100644
--- a/Content.Client/Voting/VoteCallMenuButton.cs
+++ b/Content.Client/Voting/VoteCallMenuButton.cs
@@ -16,7 +16,7 @@ namespace Content.Client.Voting
{
IoCManager.InjectDependencies(this);
- Text = Loc.GetString("Call vote");
+ Text = Loc.GetString("ui-vote-menu-button");
OnPressed += OnOnPressed;
}
diff --git a/Content.Client/Voting/VotePopup.xaml.cs b/Content.Client/Voting/VotePopup.xaml.cs
index 4427ef3fdc..0a4258446f 100644
--- a/Content.Client/Voting/VotePopup.xaml.cs
+++ b/Content.Client/Voting/VotePopup.xaml.cs
@@ -50,12 +50,12 @@ namespace Content.Client.Voting
public void UpdateData()
{
VoteTitle.Text = _vote.Title;
- VoteCaller.Text = Loc.GetString("{0} called a vote:", _vote.Initiator);
+ VoteCaller.Text = Loc.GetString("ui-vote-created", ("initiator", _vote.Initiator));
for (var i = 0; i < _voteButtons.Length; i++)
{
var entry = _vote.Entries[i];
- _voteButtons[i].Text = Loc.GetString("{0} ({1})", entry.Text, entry.Votes);
+ _voteButtons[i].Text = Loc.GetString("ui-vote-button", ("text", entry.Text), ("votes", entry.Votes));
if (_vote.OurVote == i)
_voteButtons[i].Pressed = true;
diff --git a/Content.Server/Voting/IVoteHandle.cs b/Content.Server/Voting/IVoteHandle.cs
index a47958b3a5..b4d653f193 100644
--- a/Content.Server/Voting/IVoteHandle.cs
+++ b/Content.Server/Voting/IVoteHandle.cs
@@ -1,4 +1,5 @@
-using Robust.Server.Player;
+using System.Collections.Generic;
+using Robust.Server.Player;
namespace Content.Server.Voting
{
@@ -10,6 +11,8 @@ namespace Content.Server.Voting
bool Finished { get; }
bool Cancelled { get; }
+ IReadOnlyDictionary