Fix http API for environments (broken by localization)

IxxyXR · Dec 6, 2023 · f5b9b33 · f5b9b33
1 parent ed09461
commit f5b9b33
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Assets/Scripts/API/ApiManager.cs b/Assets/Scripts/API/ApiManager.cs
@@ -573,8 +573,8 @@ private string ScriptTemplateSubstitution(string html)
             string wallpaperGroups = JsonConvert.SerializeObject(Enum.GetNames(typeof(PointSymmetry.Family)));
             html = html.Replace("{{wallpaperGroupsJson}}", wallpaperGroups);
 
-            string[] environmentNameList = EnvironmentCatalog.m_Instance.AllEnvironments
-                .Select(x => x.Description.Replace(" ", ""))
+            string[] environmentNameList = EnvironmentCatalog.m_Instance.m_EnvironmentDescriptions
+                .Select(x => x.Replace(" ", ""))
                 .ToArray();
 
             string environmentsJson = JsonConvert.SerializeObject(environmentNameList);

diff --git a/Assets/Scripts/EnvironmentCatalog.cs b/Assets/Scripts/EnvironmentCatalog.cs
@@ -15,6 +15,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Localization.Settings;
 
 namespace TiltBrush
 {
@@ -30,6 +31,9 @@ public class EnvironmentCatalog : MonoBehaviour
         private bool m_IsLoading;
         private Dictionary<Guid, Environment> m_GuidToEnvironment;
 
+        // Used by the HTTP API because you can't GetLocalizedString in a background thread.
+        public List<string> m_EnvironmentDescriptions;
+
         public IEnumerable<Environment> AllEnvironments
         {
             get { return m_GuidToEnvironment.Values; }
@@ -43,6 +47,7 @@ void Awake()
         {
             m_Instance = this;
             m_GuidToEnvironment = new Dictionary<Guid, Environment>();
+            m_EnvironmentDescriptions = new List<string>();
         }
 
         public bool IsLoading { get { return m_IsLoading; } }
@@ -63,6 +68,10 @@ public void BeginReload()
                     continue;
                 }
                 m_GuidToEnvironment[env.m_Guid] = env;
+                // TODO - do we want the API to always use English?
+                // env.m_EnvironmentDescription.LocaleOverride = LocalizationSettings.AvailableLocales.GetLocale(SystemLanguage.English);
+                m_EnvironmentDescriptions.Add(env.Description);
+                // env.m_EnvironmentDescription.LocaleOverride = null;
             }
 
             Resources.UnloadUnusedAssets();