Remove FluentBundle.Arguments helper method.

This commit is contained in:
Paul Chote
2024-10-02 22:40:05 +01:00
committed by Gustas
parent b29b685058
commit d6285affec
71 changed files with 273 additions and 283 deletions

View File

@@ -10,7 +10,6 @@
#endregion
using System;
using System.Collections.Generic;
using OpenRA.FileFormats;
namespace OpenRA.Mods.Common.Widgets.Logic
@@ -48,32 +47,32 @@ namespace OpenRA.Mods.Common.Widgets.Logic
onCancel ??= DoNothing;
if (replayMeta == null)
return IncompatibleReplayDialog(IncompatibleReplayPrompt, null, modData, onCancel);
return IncompatibleReplayDialog(modData, onCancel, IncompatibleReplayPrompt);
var version = replayMeta.GameInfo.Version;
if (version == null)
return IncompatibleReplayDialog(UnknownVersion, null, modData, onCancel);
return IncompatibleReplayDialog(modData, onCancel, UnknownVersion);
var mod = replayMeta.GameInfo.Mod;
if (mod == null)
return IncompatibleReplayDialog(UnknownMod, null, modData, onCancel);
return IncompatibleReplayDialog(modData, onCancel, UnknownMod);
if (!Game.Mods.ContainsKey(mod))
return IncompatibleReplayDialog(UnvailableMod, FluentBundle.Arguments("mod", mod), modData, onCancel);
return IncompatibleReplayDialog(modData, onCancel, UnvailableMod, "mod", mod);
if (Game.Mods[mod].Metadata.Version != version)
return IncompatibleReplayDialog(IncompatibleVersion, FluentBundle.Arguments("version", version), modData, onCancel);
return IncompatibleReplayDialog(modData, onCancel, IncompatibleVersion, "version", version);
if (replayMeta.GameInfo.MapPreview.Status != MapStatus.Available)
return IncompatibleReplayDialog(UnvailableMap, FluentBundle.Arguments("map", replayMeta.GameInfo.MapUid), modData, onCancel);
return IncompatibleReplayDialog(modData, onCancel, UnvailableMap, "map", replayMeta.GameInfo.MapUid);
return true;
}
static bool IncompatibleReplayDialog(string text, Dictionary<string, object> textArguments, ModData modData, Action onCancel)
static bool IncompatibleReplayDialog(ModData modData, Action onCancel, string text, params object[] args)
{
ConfirmationDialogs.ButtonPrompt(
modData, IncompatibleReplayTitle, text, textArguments: textArguments, onCancel: onCancel, cancelText: IncompatibleReplayAccept);
modData, IncompatibleReplayTitle, text, textArguments: args, onCancel: onCancel, cancelText: IncompatibleReplayAccept);
return false;
}
}