diff --git a/core/string/translation_server.cpp b/core/string/translation_server.cpp index db37b375170..41c51db4475 100644 --- a/core/string/translation_server.cpp +++ b/core/string/translation_server.cpp @@ -424,28 +424,6 @@ StringName TranslationServer::translate_plural(const StringName &p_message, cons return main_domain->translate_plural(p_message, p_message_plural, p_n, p_context); } -bool TranslationServer::_load_translations(const String &p_from) { - if (ProjectSettings::get_singleton()->has_setting(p_from)) { - const Vector &translation_names = GLOBAL_GET(p_from); - - int tcount = translation_names.size(); - - if (tcount) { - const String *r = translation_names.ptr(); - - for (int i = 0; i < tcount; i++) { - Ref tr = ResourceLoader::load(r[i]); - if (tr.is_valid()) { - add_translation(tr); - } - } - } - return true; - } - - return false; -} - bool TranslationServer::has_domain(const StringName &p_domain) const { if (p_domain == StringName()) { return true; @@ -641,11 +619,16 @@ void TranslationServer::_bind_methods() { } void TranslationServer::load_translations() { - _load_translations("internationalization/locale/translations"); //all - _load_translations("internationalization/locale/translations_" + locale.substr(0, 2)); - - if (locale.substr(0, 2) != locale) { - _load_translations("internationalization/locale/translations_" + locale); + const String prop = "internationalization/locale/translations"; + if (!ProjectSettings::get_singleton()->has_setting(prop)) { + return; + } + const Vector &translations = GLOBAL_GET(prop); + for (const String &path : translations) { + Ref tr = ResourceLoader::load(path); + if (tr.is_valid()) { + add_translation(tr); + } } } diff --git a/core/string/translation_server.h b/core/string/translation_server.h index c8755716130..ea7cadd6f26 100644 --- a/core/string/translation_server.h +++ b/core/string/translation_server.h @@ -50,7 +50,6 @@ class TranslationServer : public Object { bool enabled = true; static inline TranslationServer *singleton = nullptr; - bool _load_translations(const String &p_from); static void _bind_methods();