Skip to content

Commit eaa21e1

Browse files
committed
Merge pull request #115827 from bruvzg/tr_load
[Export] Load translation files to check locale for ICU data export.
2 parents 15c9d96 + 1ea927c commit eaa21e1

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

editor/export/editor_export_platform.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "core/io/resource_uid.h"
4545
#include "core/math/random_pcg.h"
4646
#include "core/os/shared_object.h"
47+
#include "core/string/translation_server.h"
4748
#include "core/version.h"
4849
#include "editor/editor_node.h"
4950
#include "editor/editor_string_names.h"
@@ -1008,13 +1009,16 @@ Dictionary EditorExportPlatform::get_internal_export_files(const Ref<EditorExpor
10081009
bool include_data = (bool)get_project_setting(p_preset, "internationalization/locale/include_text_server_data");
10091010
if (!include_data) {
10101011
Vector<String> translations = get_project_setting(p_preset, "internationalization/locale/translations");
1011-
translations.push_back(get_project_setting(p_preset, "internationalization/locale/fallback"));
10121012
for (const String &t : translations) {
1013-
if (TS->is_locale_using_support_data(t)) {
1013+
Ref<Translation> tr = ResourceLoader::load(t);
1014+
if (tr.is_valid() && TS->is_locale_using_support_data(tr->get_locale())) {
10141015
include_data = true;
10151016
break;
10161017
}
10171018
}
1019+
if (TS->is_locale_using_support_data(get_project_setting(p_preset, "internationalization/locale/fallback"))) {
1020+
include_data = true;
1021+
}
10181022
}
10191023
if (include_data) {
10201024
String ts_name = TS->get_support_data_filename();

0 commit comments

Comments
 (0)