Merge pull request #103838 from ebeem/master

Repiteo · Repiteo · commit c2202d36c106 · 2025-08-01T11:45:22.000-05:00
Core: Fix translation remaps incorrectly falling back
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
@@ -1269,7 +1269,9 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem
 		}
 
 		// Fallback to p_path if new_path does not exist.
-		if (!FileAccess::exists(new_path + ".import") && !FileAccess::exists(new_path)) {
+		if (!FileAccess::exists(new_path + ".import") &&
+				!FileAccess::exists(new_path + ".remap") &&
+				!FileAccess::exists(new_path)) {
 			WARN_PRINT(vformat("Translation remap '%s' does not exist. Falling back to '%s'.", new_path, p_path));
 			new_path = p_path;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1269,7 +1269,9 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem`
`1269`	`1269`	`}`
`1270`	`1270`
`1271`	`1271`	`// Fallback to p_path if new_path does not exist.`
`1272`		`- if (!FileAccess::exists(new_path + ".import") && !FileAccess::exists(new_path)) {`
	`1272`	`+ if (!FileAccess::exists(new_path + ".import") &&`
	`1273`	`+ !FileAccess::exists(new_path + ".remap") &&`
	`1274`	`+ !FileAccess::exists(new_path)) {`
`1273`	`1275`	`WARN_PRINT(vformat("Translation remap '%s' does not exist. Falling back to '%s'.", new_path, p_path));`
`1274`	`1276`	`new_path = p_path;`
`1275`	`1277`	`}`