Merge pull request #40182 from amanj120/bundle_pr_resources

Create strings.xml files for project name translations

platform/android/export/export.cpp

@@ -43,6 +43,7 @@
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
+#include "platform/android/export/gradle_export_util.h"
 #include "platform/android/logo.gen.h"
 #include "platform/android/plugin/godot_plugin_config.h"
 #include "platform/android/run_icon.gen.h"
@@ -2363,9 +2364,10 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 
 		EditorProgress ep("export", "Exporting for Android", 105, true);
 
-		if (bool(p_preset->get("custom_template/use_custom_build"))) { //custom build
-			//re-generate build.gradle and AndroidManifest.xml
+		bool use_custom_build = bool(p_preset->get("custom_template/use_custom_build"));
 
+		if (use_custom_build) {
+			//re-generate build.gradle and AndroidManifest.xml
 			{ //test that installed build version is alright
 				FileAccessRef f = FileAccess::open("res://android/.build_version", FileAccess::READ);
 				if (!f) {
@@ -2378,6 +2380,14 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 					return ERR_UNCONFIGURED;
 				}
 			}
+
+			// TODO: should we use "package/name" or "application/config/name"?
+			String project_name = get_project_name(p_preset->get("package/name"));
+			// instead of calling _fix_resources
+			Error err = _create_project_name_strings_files(p_preset, project_name);
+			if (err != OK) {
+				EditorNode::add_io_error("Unable to overwrite res://android/build/res/*.xml files with project name");
+			}
 			//build project if custom build is enabled
 			String sdk_path = EDITOR_GET("export/android/custom_build_sdk_path");
 
@@ -2566,7 +2576,9 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 			}
 
 			if (file == "resources.arsc") {
-				_fix_resources(p_preset, data);
+				if (!use_custom_build) {
+					_fix_resources(p_preset, data);
+				}
 			}
 
 			for (int i = 0; i < icon_densities_count; ++i) {

platform/android/export/gradle_export_util.h

@@ -37,6 +37,13 @@
 #include "core/os/os.h"
 #include "editor/editor_export.h"
 
+const String godot_project_name_xml_string = R"(<?xml version="1.0" encoding="utf-8"?>
+<!--WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
+<resources>
+	<string name="godot_project_name_string">%s</string>
+</resources>
+)";
+
 // Utility method used to create a directory.
 Error create_directory(const String &p_dir) {
 	if (!DirAccess::exists(p_dir)) {
@@ -98,4 +105,41 @@ Error rename_and_store_file_in_gradle_project(void *p_userdata, const String &p_
 	return err;
 }
 
+// Creates strings.xml files inside the gradle project for different locales.
+Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset, const String &project_name) {
+	// Stores the string into the default values directory.
+	String processed_default_xml_string = vformat(godot_project_name_xml_string, project_name.xml_escape(true));
+	store_string_at_path("res://android/build/res/values/godot_project_name_string.xml", processed_default_xml_string);
+
+	// Searches the Gradle project res/ directory to find all supported locales
+	DirAccessRef da = DirAccess::open("res://android/build/res");
+	if (!da) {
+		return ERR_CANT_OPEN;
+	}
+	da->list_dir_begin();
+	while (true) {
+		String file = da->get_next();
+		if (file == "") {
+			break;
+		}
+		if (!file.begins_with("values-")) {
+			// NOTE: This assumes all directories that start with "values-" are for localization.
+			continue;
+		}
+		String locale = file.replace("values-", "").replace("-r", "_");
+		String property_name = "application/config/name_" + locale;
+		String locale_directory = "res://android/build/res/" + file + "/godot_project_name_string.xml";
+		if (ProjectSettings::get_singleton()->has_setting(property_name)) {
+			String locale_project_name = ProjectSettings::get_singleton()->get(property_name);
+			String processed_xml_string = vformat(godot_project_name_xml_string, locale_project_name.xml_escape(true));
+			store_string_at_path(locale_directory, processed_xml_string);
+		} else {
+			// TODO: Once the legacy build system is deprecated we don't need to have xml files for this else branch
+			store_string_at_path(locale_directory, processed_default_xml_string);
+		}
+	}
+	da->list_dir_end();
+	return OK;
+}
+
 #endif //GODOT_GRADLE_EXPORT_UTIL_H

platform/android/java/lib/res/values-ar/strings.xml → platform/android/java/app/res/values-ar/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-ar</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-bg/strings.xml → platform/android/java/app/res/values-bg/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-bg</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-ca/strings.xml → platform/android/java/app/res/values-ca/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-ca</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-cs/strings.xml → platform/android/java/app/res/values-cs/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-cs</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-da/strings.xml → platform/android/java/app/res/values-da/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-da</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-de/strings.xml → platform/android/java/app/res/values-de/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-de</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-el/strings.xml → platform/android/java/app/res/values-el/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-el</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-en/strings.xml → platform/android/java/app/res/values-en/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-en</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-es-rES/strings.xml → platform/android/java/app/res/values-es-rES/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-es_ES</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-es/strings.xml → platform/android/java/app/res/values-es/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-es</string>
-</resources>
+</resources>

platform/android/java/app/res/values-fa/godot_project_name_string.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
+<resources>
+    <string name="godot_project_name_string">godot-project-name-fa</string>
+</resources>

platform/android/java/lib/res/values-fi/strings.xml → platform/android/java/app/res/values-fi/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-fi</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-fr/strings.xml → platform/android/java/app/res/values-fr/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-fr</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-hi/strings.xml → platform/android/java/app/res/values-hi/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-hi</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-hr/strings.xml → platform/android/java/app/res/values-hr/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-hr</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-hu/strings.xml → platform/android/java/app/res/values-hu/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-hu</string>
-</resources>
+</resources>

platform/android/java/app/res/values-in/godot_project_name_string.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
+<resources>
+    <string name="godot_project_name_string">godot-project-name-in</string>
+</resources>

platform/android/java/lib/res/values-it/strings.xml → platform/android/java/app/res/values-it/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-it</string>
-</resources>
+</resources>

platform/android/java/app/res/values-iw/godot_project_name_string.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
+<resources>
+    <string name="godot_project_name_string">godot-project-name-iw</string>
+</resources>

platform/android/java/lib/res/values-ja/strings.xml → platform/android/java/app/res/values-ja/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-ja</string>
-</resources>
+</resources>

platform/android/java/app/res/values-ko/godot_project_name_string.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
+<resources>
+    <string name="godot_project_name_string">godot-project-name-ko</string>
+</resources>

platform/android/java/lib/res/values-lt/strings.xml → platform/android/java/app/res/values-lt/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-lt</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-lv/strings.xml → platform/android/java/app/res/values-lv/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-lv</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-nb/strings.xml → platform/android/java/app/res/values-nb/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-nb</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-nl/strings.xml → platform/android/java/app/res/values-nl/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-nl</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-pl/strings.xml → platform/android/java/app/res/values-pl/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-pl</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-pt/strings.xml → platform/android/java/app/res/values-pt/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-pt</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-ro/strings.xml → platform/android/java/app/res/values-ro/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-ro</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-ru/strings.xml → platform/android/java/app/res/values-ru/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-ru</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-sk/strings.xml → platform/android/java/app/res/values-sk/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-sk</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-sl/strings.xml → platform/android/java/app/res/values-sl/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-sl</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-sr/strings.xml → platform/android/java/app/res/values-sr/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-sr</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-sv/strings.xml → platform/android/java/app/res/values-sv/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-sv</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-th/strings.xml → platform/android/java/app/res/values-th/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-th</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-tl/strings.xml → platform/android/java/app/res/values-tl/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-tl</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-tr/strings.xml → platform/android/java/app/res/values-tr/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-tr</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-uk/strings.xml → platform/android/java/app/res/values-uk/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-uk</string>
-</resources>
+</resources>

platform/android/java/lib/res/values-vi/strings.xml → platform/android/java/app/res/values-vi/godot_project_name_string.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->
 <resources>
     <string name="godot_project_name_string">godot-project-name-vi</string>
-</resources>
+</resources>