fix local file path asset name parsing locale codes in rare cases (#766)

Mod file paths can't be localized through the content pipeline. Normally the locale would be ignored anyway due to the file extension, but it'd be incorrectly parsed if the file name ended with a locale and no file extension (like "assets/example.fr-FR").

2 files changed, 6 insertions, 6 deletions

diff --git a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
index 2d921cc3..31199b3a 100644
--- a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
@@ -119,7 +119,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
         public sealed override T Load<T>(string assetName, LanguageCode language)
         {
             assetName = this.PrenormalizeRawAssetName(assetName);
-            IAssetName parsedName = this.Coordinator.ParseAssetName(assetName);
+            IAssetName parsedName = this.Coordinator.ParseAssetName(assetName, allowLocales: this.TryLocalizeKeys);
             return this.LoadLocalized<T>(parsedName, language, useCache: true);
         }
 
@@ -161,7 +161,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             // use cached key
             string rawName = LocalizedContentManager.localizedAssetNames[assetName.Name];
             if (assetName.Name != rawName)
-                assetName = this.Coordinator.ParseAssetName(rawName);
+                assetName = this.Coordinator.ParseAssetName(rawName, allowLocales: this.TryLocalizeKeys);
             return this.LoadExact<T>(assetName, useCache: useCache);
         }
 
@@ -213,7 +213,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             IDictionary<string, object> removeAssets = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
             this.Cache.Remove((key, asset) =>
             {
-                string baseAssetName = this.Coordinator.ParseAssetName(key).BaseName;
+                string baseAssetName = this.Coordinator.ParseAssetName(key, allowLocales: this.TryLocalizeKeys).BaseName;
 
                 // check if asset should be removed
                 bool remove = removeAssets.ContainsKey(baseAssetName);
diff --git a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
index 63b40d66..9ed989da 100644
--- a/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/ModContentManager.cs
@@ -111,7 +111,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
                         {
                             // the underlying content manager adds a .xnb extension implicitly, so
                             // we need to strip it here to avoid trying to load a '.xnb.xnb' file.
-                            IAssetName loadName = this.Coordinator.ParseAssetName(assetName.Name[..^".xnb".Length]);
+                            IAssetName loadName = this.Coordinator.ParseAssetName(assetName.Name[..^".xnb".Length], allowLocales: false);
 
                             // load asset
                             asset = this.RawLoad<T>(loadName, useCache: false);
@@ -201,7 +201,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             string relativePath = PathUtilities.GetRelativePath(this.RootDirectory, file.FullName);
             string internalKey = Path.Combine(this.Name, relativePath);
 
-            return this.Coordinator.ParseAssetName(internalKey);
+            return this.Coordinator.ParseAssetName(internalKey, allowLocales: false);
         }
 
 
@@ -343,7 +343,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
             }
 
             // get from game assets
-            IAssetName contentKey = this.Coordinator.ParseAssetName(this.GetContentKeyForTilesheetImageSource(relativePath));
+            IAssetName contentKey = this.Coordinator.ParseAssetName(this.GetContentKeyForTilesheetImageSource(relativePath), allowLocales: false);
             try
             {
                 this.GameContentManager.LoadLocalized<Texture2D>(contentKey, this.GameContentManager.Language, useCache: true); // no need to bypass cache here, since we're not storing the asset