godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #106295 from timothyqiu/legacy-l10n

Browse Source 
Remove translation loading logic that was never used
This commit is contained in:
Rémi Verschelde
2025-05-13 01:05:31 +02:00
parent cc07dc4273 bbc6643e4c
commit 03cae12314
2 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/string/translation_server.cpp
View File

@@ -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); 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<String> &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<Translation> 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 { bool TranslationServer::has_domain(const StringName &p_domain) const {
if (p_domain == StringName()) { if (p_domain == StringName()) {
return true; return true;
@@ -641,11 +619,16 @@ void TranslationServer::_bind_methods() {
} }
void TranslationServer::load_translations() { void TranslationServer::load_translations() {
_load_translations("internationalization/locale/translations"); //all const String prop = "internationalization/locale/translations";
_load_translations("internationalization/locale/translations_" + locale.substr(0, 2)); if (!ProjectSettings::get_singleton()->has_setting(prop)) {
return;
if (locale.substr(0, 2) != locale) { }
_load_translations("internationalization/locale/translations_" + locale); const Vector<String> &translations = GLOBAL_GET(prop);
for (const String &path : translations) {
Ref<Translation> tr = ResourceLoader::load(path);
if (tr.is_valid()) {
add_translation(tr);
}
} }
} }

1
core/string/translation_server.h
View File

@@ -50,7 +50,6 @@ class TranslationServer : public Object {
bool enabled = true; bool enabled = true;
static inline TranslationServer *singleton = nullptr; static inline TranslationServer *singleton = nullptr;
bool _load_translations(const String &p_from);
static void _bind_methods(); static void _bind_methods();