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

Rename Fluent-related code to be more precise.

Browse Source
This commit is contained in:
Paul Chote
2024-10-01 19:34:12 +01:00
committed by Gustas
parent 771b9ddfda
commit b29b685058
176 changed files with 1349 additions and 1369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Network/LocalizedMessage.cs → OpenRA.Game/Network/FluentMessage.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Network
}
}
public class LocalizedMessage
public class FluentMessage
{
public const int ProtocolVersion = 1;
@@ -81,7 +81,7 @@ namespace OpenRA.Network
return arguments;
}
public LocalizedMessage(MiniYaml yaml)
public FluentMessage(MiniYaml yaml)
{
// Let the FieldLoader do the dirty work of loading the public fields.
FieldLoader.Load(this, yaml);
@@ -105,7 +105,7 @@ namespace OpenRA.Network
}
return new MiniYaml("", root)
.ToLines("LocalizedMessage")
.ToLines("FluentMessage")
.JoinWith("\n");
}
}

4
OpenRA.Game/Network/OrderManager.cs
View File

@@ -22,7 +22,7 @@ namespace OpenRA.Network
{
const OrderPacket ClientDisconnected = null;
[TranslationReference("frame")]
[FluentReference("frame")]
const string DesyncCompareLogs = "notification-desync-compare-logs";
readonly SyncReport syncReport;
@@ -91,7 +91,7 @@ namespace OpenRA.Network
World.OutOfSync();
IsOutOfSync = true;
TextNotificationsManager.AddSystemLine(DesyncCompareLogs, Translation.Arguments("frame", frame));
TextNotificationsManager.AddSystemLine(DesyncCompareLogs, FluentBundle.Arguments("frame", frame));
}
public void StartGame()

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

@@ -20,22 +20,22 @@ namespace OpenRA.Network
{
public const int ChatMessageMaxLength = 2500;
[TranslationReference("player")]
[FluentReference("player")]
const string Joined = "notification-joined";
[TranslationReference("player")]
[FluentReference("player")]
const string Left = "notification-lobby-disconnected";
[TranslationReference]
[FluentReference]
const string GameStarted = "notification-game-has-started";
[TranslationReference]
[FluentReference]
const string GameSaved = "notification-game-saved";
[TranslationReference("player")]
[FluentReference("player")]
const string GamePaused = "notification-game-paused";
[TranslationReference("player")]
[FluentReference("player")]
const string GameUnpaused = "notification-game-unpaused";
public static int? KickVoteTarget { get; internal set; }
@@ -56,8 +56,8 @@ namespace OpenRA.Network
TextNotificationsManager.AddSystemLine(order.TargetString);
break;
// Client side translated server message
case "LocalizedMessage":
// Client side resolved server message
case "FluentMessage":
{
if (string.IsNullOrEmpty(order.TargetString))
break;
@@ -65,7 +65,7 @@ namespace OpenRA.Network
var yaml = MiniYaml.FromString(order.TargetString, order.OrderString);
foreach (var node in yaml)
{
var localizedMessage = new LocalizedMessage(node.Value);
var localizedMessage = new FluentMessage(node.Value);
if (localizedMessage.Key == Joined)
TextNotificationsManager.AddPlayerJoinedLine(localizedMessage.Key, localizedMessage.Arguments);
else if (localizedMessage.Key == Left)
@@ -231,7 +231,7 @@ namespace OpenRA.Network
break;
if (orderManager.World.Paused != pause && world != null && world.LobbyInfo.NonBotClients.Count() > 1)
TextNotificationsManager.AddSystemLine(pause ? GamePaused : GameUnpaused, Translation.Arguments("player", client.Name));
TextNotificationsManager.AddSystemLine(pause ? GamePaused : GameUnpaused, FluentBundle.Arguments("player", client.Name));
orderManager.World.Paused = pause;
orderManager.World.PredictedPaused = pause;