diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-11-14 12:17:39 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-11-14 12:17:39 +0100 |
| commit | 40cdd22d570024d906c9a5795fa079342dce2197 (patch) | |
| tree | 3f2c3074bfbb69471a54385134f0bed1dc8a404b | |
| parent | 70ec97aadf2be992edf7a95ecccc00f0891d82d2 (diff) | |
| parent | 8b2260544a44229b4a522aff992ef320af6d0e02 (diff) | |
| download | redot-engine-40cdd22d570024d906c9a5795fa079342dce2197.tar.gz | |
Merge pull request #84873 from bruvzg/locale_rempas
Fix remapped font reloading on locale change.
| -rw-r--r-- | core/string/translation.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/string/translation.cpp b/core/string/translation.cpp index 02380c92bb..a443ed308d 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 { |