Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always use Upper/Lower Invariant to avoid issues with other languages

Browse Source
This commit is contained in:
Nick 2024-04-27 19:59:09 -04:00
parent cb4f9c57a2
commit ea47da32e7
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewHorizons/Builder/StarSystem/SkyboxBuilder.cs
View File

@ -51,7 +51,7 @@ namespace NewHorizons.Builder.StarSystem
{ {
if (!tex) if (!tex)
{ {
NHLogger.LogError($"Failed to load texture for skybox {name.ToLower()} face"); NHLogger.LogError($"Failed to load texture for skybox {name.ToLowerInvariant()} face");
return null; return null;
} }

2
NewHorizons/Components/ShipLog/ShipLogStarChartMode.cs
View File

@ -282,7 +282,7 @@ namespace NewHorizons.Components.ShipLog
var name = UniqueIDToName(shipLogEntryCard.name); var name = UniqueIDToName(shipLogEntryCard.name);
var warpNotificationDataText = TranslationHandler.GetTranslation("WARP_LOCKED", TranslationHandler.TextType.UI).Replace("{0}", name.ToUpper()); var warpNotificationDataText = TranslationHandler.GetTranslation("WARP_LOCKED", TranslationHandler.TextType.UI).Replace("{0}", name.ToUpperInvariant());
_warpNotificationData = new NotificationData(warpNotificationDataText); _warpNotificationData = new NotificationData(warpNotificationDataText);
NotificationManager.SharedInstance.PostNotification(_warpNotificationData, true); NotificationManager.SharedInstance.PostNotification(_warpNotificationData, true);

10
NewHorizons/Handlers/PlanetGraphHandler.cs
View File

@ -126,11 +126,11 @@ namespace NewHorizons.Handlers
private static bool DetermineIfChildOfFocal(NewHorizonsBody body, FocalPointNode node) private static bool DetermineIfChildOfFocal(NewHorizonsBody body, FocalPointNode node)
{ {
var name = body.Config.name.ToLower(); var name = body.Config.name.ToLowerInvariant();
var primary = (body.Config.Orbit?.primaryBody ?? "").ToLower(); var primary = (body.Config.Orbit?.primaryBody ?? "").ToLowerInvariant();
var primaryName = node.primary.body.Config.name.ToLower(); var primaryName = node.primary.body.Config.name.ToLowerInvariant();
var secondaryName = node.secondary.body.Config.name.ToLower(); var secondaryName = node.secondary.body.Config.name.ToLowerInvariant();
return name != primaryName && name != secondaryName && (primary == node.body.Config.name.ToLower() || primary == primaryName || primary == secondaryName); return name != primaryName && name != secondaryName && (primary == node.body.Config.name.ToLowerInvariant() || primary == primaryName || primary == secondaryName);
} }

2
NewHorizons/Handlers/TranslationHandler.cs
View File

@ -189,7 +189,7 @@ namespace NewHorizons.Handlers
{ {
var uiTable = TextTranslation.Get().m_table.theUITable; var uiTable = TextTranslation.Get().m_table.theUITable;
var text = GetTranslation(rawText, TextType.UI).ToUpper(); var text = GetTranslation(rawText, TextType.UI).ToUpperInvariant();
var key = uiTable.Keys.Max() + 1; var key = uiTable.Keys.Max() + 1;
try try

2
NewHorizons/Main.cs
View File

@ -787,7 +787,7 @@ namespace NewHorizons
{ {
if (language is TextTranslation.Language.UNKNOWN or TextTranslation.Language.TOTAL) continue; if (language is TextTranslation.Language.UNKNOWN or TextTranslation.Language.TOTAL) continue;
var relativeFile = Path.Combine("translations", language.ToString().ToLower() + ".json"); var relativeFile = Path.Combine("translations", language.ToString().ToLowerInvariant() + ".json");
if (File.Exists(Path.Combine(folder, relativeFile))) if (File.Exists(Path.Combine(folder, relativeFile)))
{ {

4
NewHorizons/Patches/SignalPatches/AudioSignalPatches.cs
View File

@ -17,7 +17,7 @@ namespace NewHorizons.Patches.SignalPatches
var customSignalName = SignalBuilder.GetCustomSignalName(name); var customSignalName = SignalBuilder.GetCustomSignalName(name);
if (!string.IsNullOrEmpty(customSignalName)) if (!string.IsNullOrEmpty(customSignalName))
{ {
__result = TranslationHandler.GetTranslation(customSignalName, TranslationHandler.TextType.UI, false).ToUpper(); __result = TranslationHandler.GetTranslation(customSignalName, TranslationHandler.TextType.UI, false).ToUpperInvariant();
return false; return false;
} }
return true; return true;
@ -68,7 +68,7 @@ namespace NewHorizons.Patches.SignalPatches
var customName = SignalBuilder.GetCustomFrequencyName(frequency); var customName = SignalBuilder.GetCustomFrequencyName(frequency);
if (!string.IsNullOrEmpty(customName)) if (!string.IsNullOrEmpty(customName))
{ {
if (NewHorizonsData.KnowsFrequency(customName)) __result = TranslationHandler.GetTranslation(customName, TranslationHandler.TextType.UI, false).ToUpper(); if (NewHorizonsData.KnowsFrequency(customName)) __result = TranslationHandler.GetTranslation(customName, TranslationHandler.TextType.UI, false).ToUpperInvariant();
else __result = UITextLibrary.GetString(UITextType.SignalFreqUnidentified); else __result = UITextLibrary.GetString(UITextType.SignalFreqUnidentified);
return false; return false;
} }

2
NewHorizons/Utility/DebugTools/DebugReload.cs
View File

@ -15,7 +15,7 @@ namespace NewHorizons.Utility.DebugTools
public static void InitializePauseMenu(IPauseMenuManager pauseMenu) public static void InitializePauseMenu(IPauseMenuManager pauseMenu)
{ {
_reloadButton = pauseMenu.MakeSimpleButton(TranslationHandler.GetTranslation("Reload Configs", TranslationHandler.TextType.UI).ToUpper(), 3, true); _reloadButton = pauseMenu.MakeSimpleButton(TranslationHandler.GetTranslation("Reload Configs", TranslationHandler.TextType.UI).ToUpperInvariant(), 3, true);
_reloadButton.OnSubmitAction += ReloadConfigs; _reloadButton.OnSubmitAction += ReloadConfigs;
UpdateReloadButton(); UpdateReloadButton();
} }

2
NewHorizons/Utility/DebugTools/Menu/DebugMenu.cs
View File

@ -89,7 +89,7 @@ namespace NewHorizons.Utility.DebugTools.Menu
public static void InitializePauseMenu(IPauseMenuManager pauseMenu) public static void InitializePauseMenu(IPauseMenuManager pauseMenu)
{ {
pauseMenuButton = pauseMenu.MakeSimpleButton(TranslationHandler.GetTranslation("Toggle Dev Tools Menu", TranslationHandler.TextType.UI).ToUpper(), 3, true); pauseMenuButton = pauseMenu.MakeSimpleButton(TranslationHandler.GetTranslation("Toggle Dev Tools Menu", TranslationHandler.TextType.UI).ToUpperInvariant(), 3, true);
_instance?.InitMenu(); _instance?.InitMenu();
} }

4
NewHorizons/Utility/NewHorizonExtensions.cs
View File

@ -72,14 +72,14 @@ namespace NewHorizons.Utility
public static string ToCamelCase(this string str) public static string ToCamelCase(this string str)
{ {
StringBuilder strBuilder = new StringBuilder(str); StringBuilder strBuilder = new StringBuilder(str);
strBuilder[0] = strBuilder[0].ToString().ToLower().ToCharArray()[0]; strBuilder[0] = strBuilder[0].ToString().ToLowerInvariant().ToCharArray()[0];
return strBuilder.ToString(); return strBuilder.ToString();
} }
public static string ToTitleCase(this string str) public static string ToTitleCase(this string str)
{ {
StringBuilder strBuilder = new StringBuilder(str); StringBuilder strBuilder = new StringBuilder(str);
strBuilder[0] = strBuilder[0].ToString().ToUpper().ToCharArray()[0]; strBuilder[0] = strBuilder[0].ToString().ToUpperInvariant().ToCharArray()[0];
return strBuilder.ToString(); return strBuilder.ToString();
} }

4
NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs
View File

@ -34,7 +34,7 @@ namespace NewHorizons.Utility.OuterWilds
} }
// Else check stock names // Else check stock names
var stringID = name.ToUpper(CultureInfo.InvariantCulture).Replace(" ", "_").Replace("'", ""); var stringID = name.ToUpperInvariant().Replace(" ", "_").Replace("'", "");
if (stringID.Equals("ATTLEROCK")) stringID = "TIMBER_MOON"; if (stringID.Equals("ATTLEROCK")) stringID = "TIMBER_MOON";
if (stringID.Equals("HOLLOWS_LANTERN")) stringID = "VOLCANIC_MOON"; if (stringID.Equals("HOLLOWS_LANTERN")) stringID = "VOLCANIC_MOON";
if (stringID.Equals("ASH_TWIN")) stringID = "TOWER_TWIN"; if (stringID.Equals("ASH_TWIN")) stringID = "TOWER_TWIN";
@ -43,7 +43,7 @@ namespace NewHorizons.Utility.OuterWilds
if (stringID.Equals("EYE") || stringID.Equals("EYEOFTHEUNIVERSE")) stringID = "EYE_OF_THE_UNIVERSE"; if (stringID.Equals("EYE") || stringID.Equals("EYEOFTHEUNIVERSE")) stringID = "EYE_OF_THE_UNIVERSE";
string key; string key;
if (stringID.ToUpper(CultureInfo.InvariantCulture).Replace("_", "").Equals("MAPSATELLITE")) if (stringID.ToUpperInvariant().Replace("_", "").Equals("MAPSATELLITE"))
{ {
key = AstroObject.Name.MapSatellite.ToString(); key = AstroObject.Name.MapSatellite.ToString();
} }