epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Localized to Fluent.

Browse Source
This commit is contained in:
Paul Chote
2024-10-02 22:43:57 +01:00
committed by Gustas
parent d6285affec
commit 464e0dc7d2
11 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Map/MapPreview.cs
View File

@@ -227,7 +227,7 @@ namespace OpenRA
/// Functionality mirrors <see cref="FluentProvider.GetString"/>, except instead of using
/// loaded <see cref="Map"/>'s fluent bundle as backup, we use this <see cref="MapPreview"/>'s.
/// </summary>
public string GetLocalisedString(string key, object[] args = null)
public string GetString(string key, object[] args = null)
{
// PERF: instead of loading mod level strings per each MapPreview, reuse the already loaded one in FluentProvider.
if (FluentProvider.TryGetModString(key, out var message, args))

12
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -65,13 +65,13 @@ namespace OpenRA.Network
var yaml = MiniYaml.FromString(order.TargetString, order.OrderString);
foreach (var node in yaml)
{
var localizedMessage = new FluentMessage(node.Value);
if (localizedMessage.Key == Joined)
TextNotificationsManager.AddPlayerJoinedLine(localizedMessage.Key, localizedMessage.Arguments);
else if (localizedMessage.Key == Left)
TextNotificationsManager.AddPlayerLeftLine(localizedMessage.Key, localizedMessage.Arguments);
var message = new FluentMessage(node.Value);
if (message.Key == Joined)
TextNotificationsManager.AddPlayerJoinedLine(message.Key, message.Arguments);
else if (message.Key == Left)
TextNotificationsManager.AddPlayerLeftLine(message.Key, message.Arguments);
else
TextNotificationsManager.AddSystemLine(localizedMessage.Key, localizedMessage.Arguments);
TextNotificationsManager.AddSystemLine(message.Key, message.Arguments);
}
break;

10
OpenRA.Game/Server/PlayerMessageTracker.cs
View File

@@ -22,16 +22,16 @@ namespace OpenRA.Server
readonly Dictionary<int, List<long>> messageTracker = new();
readonly Server server;
readonly Action<Connection, int, int, byte[]> dispatchOrdersToClient;
readonly Action<Connection, string, object[]> sendLocalizedMessageTo;
readonly Action<Connection, string, object[]> sendFluentMessageTo;
public PlayerMessageTracker(
Server server,
Action<Connection, int, int, byte[]> dispatchOrdersToClient,
Action<Connection, string, object[]> sendLocalizedMessageTo)
Action<Connection, string, object[]> sendFluentMessageTo)
{
this.server = server;
this.dispatchOrdersToClient = dispatchOrdersToClient;
this.sendLocalizedMessageTo = sendLocalizedMessageTo;
this.sendFluentMessageTo = sendFluentMessageTo;
}
public void DisableChatUI(Connection conn, int time)
@@ -56,7 +56,7 @@ namespace OpenRA.Server
if (!isAdmin && time < settings.FloodLimitJoinCooldown)
{
var remaining = CalculateRemaining(settings.FloodLimitJoinCooldown);
sendLocalizedMessageTo(conn, ChatTemporaryDisabled, new object[] { "remaining", remaining });
sendFluentMessageTo(conn, ChatTemporaryDisabled, new object[] { "remaining", remaining });
return true;
}
@@ -64,7 +64,7 @@ namespace OpenRA.Server
if (tracker.Count >= settings.FloodLimitMessageCount)
{
var remaining = CalculateRemaining(tracker[0] + settings.FloodLimitInterval);
sendLocalizedMessageTo(conn, ChatTemporaryDisabled, new object[] { "remaining", remaining });
sendFluentMessageTo(conn, ChatTemporaryDisabled, new object[] { "remaining", remaining });
return true;
}

26
OpenRA.Game/Server/Server.cs
View File

@@ -319,7 +319,7 @@ namespace OpenRA.Server
MapStatusCache = new MapStatusCache(modData, MapStatusChanged, type == ServerType.Dedicated && settings.EnableLintChecks);
playerMessageTracker = new PlayerMessageTracker(this, DispatchOrdersToClient, SendLocalizedMessageTo);
playerMessageTracker = new PlayerMessageTracker(this, DispatchOrdersToClient, SendFluentMessageTo);
VoteKickTracker = new VoteKickTracker(this);
LobbyInfo = new Session
@@ -580,7 +580,7 @@ namespace OpenRA.Server
Log.Write("server", $"{client.Name} ({newConn.EndPoint}) has joined the game.");
SendLocalizedMessage(Joined, "player", client.Name);
SendFluentMessage(Joined, "player", client.Name);
if (Type == ServerType.Dedicated)
{
@@ -594,12 +594,12 @@ namespace OpenRA.Server
}
if ((LobbyInfo.GlobalSettings.MapStatus & Session.MapStatus.UnsafeCustomRules) != 0)
SendLocalizedMessageTo(newConn, CustomRules);
SendFluentMessageTo(newConn, CustomRules);
if (!LobbyInfo.GlobalSettings.EnableSingleplayer)
SendLocalizedMessageTo(newConn, TwoHumansRequired);
SendFluentMessageTo(newConn, TwoHumansRequired);
else if (Map.Players.Players.Where(p => p.Value.Playable).All(p => !p.Value.AllowBots))
SendLocalizedMessageTo(newConn, BotsDisabled);
SendFluentMessageTo(newConn, BotsDisabled);
}
}
@@ -952,7 +952,7 @@ namespace OpenRA.Server
WriteLineWithTimeStamp(text);
}
public void SendLocalizedMessage(string key, params object[] args)
public void SendFluentMessage(string key, params object[] args)
{
var text = FluentMessage.Serialize(key, args);
DispatchServerOrdersToClients(Order.FromTargetString("FluentMessage", text, true));
@@ -961,7 +961,7 @@ namespace OpenRA.Server
WriteLineWithTimeStamp(FluentProvider.GetString(key, args));
}
public void SendLocalizedMessageTo(Connection conn, string key, object[] args = null)
public void SendFluentMessageTo(Connection conn, string key, object[] args = null)
{
var text = FluentMessage.Serialize(key, args);
DispatchOrdersToClient(conn, 0, 0, Order.FromTargetString("FluentMessage", text, true).Serialize());
@@ -998,7 +998,7 @@ namespace OpenRA.Server
if (!InterpretCommand(o.TargetString, conn))
{
Log.Write("server", $"Unknown server command: {o.TargetString}");
SendLocalizedMessageTo(conn, UnknownServerCommand, new object[] { "command", o.TargetString });
SendFluentMessageTo(conn, UnknownServerCommand, new object[] { "command", o.TargetString });
}
break;
@@ -1180,14 +1180,14 @@ namespace OpenRA.Server
if (State == ServerState.GameStarted)
{
if (dropClient.IsObserver)
SendLocalizedMessage(ObserverDisconnected, "player", dropClient.Name);
SendFluentMessage(ObserverDisconnected, "player", dropClient.Name);
else if (dropClient.Team > 0)
SendLocalizedMessage(PlayerTeamDisconnected, "player", dropClient.Name, "team", dropClient.Team);
SendFluentMessage(PlayerTeamDisconnected, "player", dropClient.Name, "team", dropClient.Team);
else
SendLocalizedMessage(PlayerDisconnected, "player", dropClient.Name);
SendFluentMessage(PlayerDisconnected, "player", dropClient.Name);
}
else
SendLocalizedMessage(LobbyDisconnected, "player", dropClient.Name);
SendFluentMessage(LobbyDisconnected, "player", dropClient.Name);
LobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
@@ -1204,7 +1204,7 @@ namespace OpenRA.Server
if (nextAdmin != null)
{
nextAdmin.IsAdmin = true;
SendLocalizedMessage(NewAdmin, "player", nextAdmin.Name);
SendFluentMessage(NewAdmin, "player", nextAdmin.Name);
}
}

14
OpenRA.Game/Server/VoteKickTracker.cs
View File

@@ -76,7 +76,7 @@ namespace OpenRA.Server
|| (voteInProgress && this.kickee.Client != kickee) // Disallow starting new votes when one is already ongoing.
|| !ClientHasPower(kicker))
{
server.SendLocalizedMessageTo(conn, UnableToStartAVote);
server.SendFluentMessageTo(conn, UnableToStartAVote);
return false;
}
@@ -107,7 +107,7 @@ namespace OpenRA.Server
if (!kickee.IsObserver && !server.HasClientWonOrLost(kickee))
{
// Vote kick cannot be the sole deciding factor for a game.
server.SendLocalizedMessageTo(conn, InsufficientVotes, new object[] { "kickee", kickee.Name });
server.SendFluentMessageTo(conn, InsufficientVotes, new object[] { "kickee", kickee.Name });
EndKickVote();
return false;
}
@@ -126,7 +126,7 @@ namespace OpenRA.Server
{
if (time + server.Settings.VoteKickerCooldown > kickeeConn.ConnectionTimer.ElapsedMilliseconds)
{
server.SendLocalizedMessageTo(conn, UnableToStartAVote);
server.SendFluentMessageTo(conn, UnableToStartAVote);
return false;
}
else
@@ -135,7 +135,7 @@ namespace OpenRA.Server
Log.Write("server", $"Vote kick started on {kickeeID}.");
voteKickTimer = Stopwatch.StartNew();
server.SendLocalizedMessage(VoteKickStarted, "kicker", kicker.Name, "kickee", kickee.Name);
server.SendFluentMessage(VoteKickStarted, "kicker", kicker.Name, "kickee", kickee.Name);
server.DispatchServerOrdersToClients(new Order("StartKickVote", null, false) { ExtraData = (uint)kickeeID }.Serialize());
this.kickee = (kickee, kickeeConn);
voteKickerStarter = (kicker, conn);
@@ -145,7 +145,7 @@ namespace OpenRA.Server
voteTracker[conn.PlayerIndex] = vote;
else
{
server.SendLocalizedMessageTo(conn, AlreadyVoted);
server.SendFluentMessageTo(conn, AlreadyVoted);
return false;
}
@@ -168,7 +168,7 @@ namespace OpenRA.Server
}
var votesNeeded = eligiblePlayers / 2 + 1;
server.SendLocalizedMessage(VoteKickProgress,
server.SendFluentMessage(VoteKickProgress,
"kickee", kickee.Name,
"percentage", votesFor * 100 / eligiblePlayers);
@@ -210,7 +210,7 @@ namespace OpenRA.Server
return;
if (sendMessage)
server.SendLocalizedMessage(VoteKickEnded, "kickee", kickee.Client.Name);
server.SendFluentMessage(VoteKickEnded, "kickee", kickee.Client.Name);
server.DispatchServerOrdersToClients(new Order("EndKickVote", null, false) { ExtraData = (uint)kickee.Client.Index }.Serialize());

6
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -586,11 +586,11 @@ namespace OpenRA.Traits
IReadOnlyDictionary<string, string> values, string defaultValue, bool locked)
{
Id = id;
Name = map.GetLocalisedString(name);
Description = description != null ? map.GetLocalisedString(description).Replace(@"\n", "\n") : null;
Name = map.GetString(name);
Description = description != null ? map.GetString(description).Replace(@"\n", "\n") : null;
IsVisible = visible;
DisplayOrder = displayorder;
Values = values.ToDictionary(v => v.Key, v => map.GetLocalisedString(v.Value));
Values = values.ToDictionary(v => v.Key, v => map.GetString(v.Value));
DefaultValue = defaultValue;
IsLocked = locked;
}