Merge branch 'master' into upstream

WWhiteDreamProject · Oct 19, 2024 · 404a6dd · 404a6dd
2 parents 526211b + b7ddc51
commit 404a6dd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs
@@ -39,7 +39,8 @@ public void Initialize()
             var fallbackCulture = new CultureInfo(FallbackCulture);
 
             _loc.LoadCulture(culture);
-            _loc.LoadCulture(fallbackCulture);
+            if (_culture != FallbackCulture)
+                _loc.LoadCulture(fallbackCulture);
             _loc.SetFallbackCluture(fallbackCulture);
 
             _loc.AddFunction(culture, "PRESSURE", FormatPressure);