From 8b2260544a44229b4a522aff992ef320af6d0e02 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Mon, 13 Nov 2023 21:25:41 +0200
Subject: [PATCH] Fix remapped font reloading on locale change.

---
 core/string/translation.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/string/translation.cpp b/core/string/translation.cpp
index 02380c92bb0..a443ed308d6 100644
--- a/core/string/translation.cpp
+++ b/core/string/translation.cpp
@@ -520,11 +520,11 @@ String TranslationServer::get_country_name(const String &p_country) const {
 void TranslationServer::set_locale(const String &p_locale) {
 	locale = standardize_locale(p_locale);
 
+	ResourceLoader::reload_translation_remaps();
+
 	if (OS::get_singleton()->get_main_loop()) {
 		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_TRANSLATION_CHANGED);
 	}
-
-	ResourceLoader::reload_translation_remaps();
 }
 
 String TranslationServer::get_locale() const {
@@ -816,10 +816,11 @@ bool TranslationServer::is_pseudolocalization_enabled() const {
 void TranslationServer::set_pseudolocalization_enabled(bool p_enabled) {
 	pseudolocalization_enabled = p_enabled;
 
+	ResourceLoader::reload_translation_remaps();
+
 	if (OS::get_singleton()->get_main_loop()) {
 		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_TRANSLATION_CHANGED);
 	}
-	ResourceLoader::reload_translation_remaps();
 }
 
 void TranslationServer::set_editor_pseudolocalization(bool p_enabled) {
@@ -836,10 +837,11 @@ void TranslationServer::reload_pseudolocalization() {
 	pseudolocalization_suffix = GLOBAL_GET("internationalization/pseudolocalization/suffix");
 	pseudolocalization_skip_placeholders_enabled = GLOBAL_GET("internationalization/pseudolocalization/skip_placeholders");
 
+	ResourceLoader::reload_translation_remaps();
+
 	if (OS::get_singleton()->get_main_loop()) {
 		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_TRANSLATION_CHANGED);
 	}
-	ResourceLoader::reload_translation_remaps();
 }
 
 StringName TranslationServer::pseudolocalize(const StringName &p_message) const {