From 6bbc126c344c9b6999367e7795c8bc62a4007c21 Mon Sep 17 00:00:00 2001 From: David Snopek Date: Fri, 29 Jul 2022 09:30:29 -0500 Subject: Fix locale resource remapping with binary conversion on export --- core/io/resource_loader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index fc4177004b..f6a0da4eb1 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -794,6 +794,8 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem // To find the path of the remapped resource, we extract the locale name after // the last ':' to match the project locale. + // An extra remap may still be necessary afterwards due to the text -> binary converter on export. + String locale = TranslationServer::get_singleton()->get_locale(); ERR_FAIL_COND_V_MSG(locale.length() < 2, p_path, "Could not remap path '" + p_path + "' for translation as configured locale '" + locale + "' is invalid."); @@ -823,12 +825,10 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem if (path_remaps.has(new_path)) { new_path = path_remaps[new_path]; - } - - if (new_path == p_path) { // Did not remap. + } else { // Try file remap. Error err; - Ref f = FileAccess::open(p_path + ".remap", FileAccess::READ, &err); + Ref f = FileAccess::open(new_path + ".remap", FileAccess::READ, &err); if (f.is_valid()) { VariantParser::StreamFile stream; stream.f = f; -- cgit v1.2.3