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

Allow empty translation keys

Browse Source
This commit is contained in:
Gustas
2023-04-13 17:51:49 +03:00
committed by Matthias Mailänder
parent 2867334c00
commit 8f5d8de1c2
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Translation.cs
View File

@@ -88,8 +88,8 @@ namespace OpenRA
public bool TryGetString(string key, out string value, IDictionary<string, object> arguments = null) public bool TryGetString(string key, out string value, IDictionary<string, object> arguments = null)
{ {
if (string.IsNullOrEmpty(key)) if (key == null)
throw new ArgumentException("A translation key must not be null or empty.", nameof(key)); throw new ArgumentNullException(nameof(key));
try try
{ {

10
mods/common/scripts/utils.lua
View File

@@ -38,10 +38,7 @@ end
---@param description string key of the translation string ---@param description string key of the translation string
---@return number id used to query for the objective later ---@return number id used to query for the objective later
AddPrimaryObjective = function(player, description) AddPrimaryObjective = function(player, description)
local translation = description local translation = UserInterface.Translate(description)
if translation ~= "" then
translation = UserInterface.Translate(description)
end
Media.DisplayMessageToPlayer(player, translation, UserInterface.Translate("new-primary-objective")) Media.DisplayMessageToPlayer(player, translation, UserInterface.Translate("new-primary-objective"))
return player.AddObjective(translation, UserInterface.Translate("primary"), true) return player.AddObjective(translation, UserInterface.Translate("primary"), true)
@@ -52,10 +49,7 @@ end
---@param description string key of the translation string ---@param description string key of the translation string
---@return number id used to query for the objective later ---@return number id used to query for the objective later
AddSecondaryObjective = function(player, description) AddSecondaryObjective = function(player, description)
local translation = description local translation = UserInterface.Translate(description)
if translation ~= "" then
translation = UserInterface.Translate(description)
end
Media.DisplayMessageToPlayer(player, translation, UserInterface.Translate("new-secondary-objective")) Media.DisplayMessageToPlayer(player, translation, UserInterface.Translate("new-secondary-objective"))
return player.AddObjective(translation, UserInterface.Translate("secondary"), false) return player.AddObjective(translation, UserInterface.Translate("secondary"), false)