Handle missing CurrentCulture

vrcx-team · Jan 31, 2025 · a7c400f · a7c400f
1 parent e426a0c
commit a7c400f
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/Dotnet/AppApi/Common/AppApiCommon.cs b/Dotnet/AppApi/Common/AppApiCommon.cs
@@ -14,25 +14,25 @@ public partial class AppApi
     {
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
         private static readonly MD5 _hasher = MD5.Create();
-        
+
         public void Init()
         {
         }
-        
+
         public string MD5File(string blob)
         {
             var fileData = Convert.FromBase64CharArray(blob.ToCharArray(), 0, blob.Length);
             using var md5 = MD5.Create();
             var md5Hash = md5.ComputeHash(fileData);
             return Convert.ToBase64String(md5Hash);
         }
-        
+
         public int GetColourFromUserID(string userId)
         {
             var hash = _hasher.ComputeHash(Encoding.UTF8.GetBytes(userId));
             return (hash[3] << 8) | hash[4];
         }
-        
+
         public string SignFile(string blob)
         {
             var fileData = Convert.FromBase64String(blob);
@@ -42,13 +42,13 @@ public string SignFile(string blob)
             var sigBytes = memoryStream.ToArray();
             return Convert.ToBase64String(sigBytes);
         }
-        
+
         public string FileLength(string blob)
         {
             var fileData = Convert.FromBase64String(blob);
             return fileData.Length.ToString();
         }
-        
+
         public void OpenLink(string url)
         {
             if (url.StartsWith("http://") ||
@@ -60,7 +60,7 @@ public void OpenLink(string url)
                 });
             }
         }
-        
+
         public void IPCAnnounceStart()
         {
             IPCServer.Send(new IPCPacket
@@ -69,7 +69,7 @@ public void IPCAnnounceStart()
                 MsgType = "VRCXLaunch"
             });
         }
-        
+
         public void SendIpc(string type, string data)
         {
             IPCServer.Send(new IPCPacket
@@ -79,7 +79,7 @@ public void SendIpc(string type, string data)
                 Data = data
             });
         }
-        
+
         public string CustomCssPath()
         {
             var output = string.Empty;
@@ -100,7 +100,11 @@ public string CustomScriptPath()
 
         public string CurrentCulture()
         {
-            return CultureInfo.CurrentCulture.ToString();
+            var culture = CultureInfo.CurrentCulture.ToString();
+            if (string.IsNullOrEmpty(culture))
+                culture = "en-US";
+
+            return culture;
         }
 
         public string CurrentLanguage()
@@ -128,13 +132,13 @@ public Dictionary<string, int> GetColourBulk(List<object> userIds)
 
             return output;
         }
-        
+
         public void SetAppLauncherSettings(bool enabled, bool killOnExit)
         {
             AutoAppLaunchManager.Instance.Enabled = enabled;
             AutoAppLaunchManager.Instance.KillChildrenOnExit = killOnExit;
         }
-        
+
         public string GetFileBase64(string path)
         {
             if (File.Exists(path))