gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-06 01:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63632 from dsnopek/fix-locale-remap-with-binary-resources-4.x

Browse source 
[4.x] Fix locale resource remapping with binary conversion on export
This commit is contained in:
Rémi Verschelde 2022-08-08 20:03:23 +02:00 committed by GitHub
parent 862dedcefe 6bbc126c34
commit 9b19a02f31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/io/resource_loader.cpp
View file

@ -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.");
@ -829,12 +831,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<FileAccess> f = FileAccess::open(p_path + ".remap", FileAccess::READ, &err);
Ref<FileAccess> f = FileAccess::open(new_path + ".remap", FileAccess::READ, &err);
if (f.is_valid()) {
VariantParser::StreamFile stream;
stream.f = f;