Merge pull request #3056 from sgkoishi/pr3056

Automatic language detection
Pryaxis · Jan 26, 2025 · f71f3b8 · f71f3b8
2 parents c6dfb97 + c4a1413
commit f71f3b8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/TShockAPI/I18n.cs b/TShockAPI/I18n.cs
@@ -60,6 +60,12 @@ static CultureInfo Redirect(CultureInfo cultureInfo)
 					}
 				}
 
+				if (LanguageManager.Instance.ActiveCulture == GameCulture.DefaultCulture)
+				{
+					var bf = System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static;
+					// LanguageManager.SetLanguage will change this so we need to reset it back to null
+					typeof(CultureInfo).GetField("s_currentThreadUICulture", bf)?.SetValue(null, null);
+				}
 				return CultureInfo.CurrentUICulture;
 			}
 		}