asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

[3.x, macOS / iOS Export] Fix generation of duplicate locale property list files.

Browse source
This commit is contained in:
bruvzg 2022-08-30 08:16:49 +03:00
parent b0ab7ac446
commit 3a24839cb2
No known key found for this signature in database
GPG key ID: 7960FCF39844EC38
2 changed files with 45 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
platform/iphone/export/export.cpp
View file

@ -666,26 +666,37 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
String locale_files; String locale_files;
Vector<String> translations = ProjectSettings::get_singleton()->get("locale/translations"); Vector<String> translations = ProjectSettings::get_singleton()->get("locale/translations");
if (translations.size() > 0) { if (translations.size() > 0) {
Set<String> languages;
for (int j = 0; j < translations.size(); j++) { for (int j = 0; j < translations.size(); j++) {
Ref<Translation> tr = ResourceLoader::load(translations[j]); Ref<Translation> tr = ResourceLoader::load(translations[j]);
if (tr.is_valid()) { if (tr.is_valid() && tr->get_locale() != "en") {
String lang = tr->get_locale(); languages.insert(tr->get_locale());
locale_files += "D0BCFE4518AEBDA2004A" + itos(j).pad_zeros(4) + " /* " + lang + " */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = " + lang + "; path = " + lang + ".lproj/InfoPlist.strings; sourceTree = \"<group>\"; };";
} }
} }
int index = 0;
for (const Set<String>::Element *E = languages.front(); E; E = E->next()) {
const String &lang = E->get();
locale_files += "D0BCFE4518AEBDA2004A" + itos(index).pad_zeros(4) + " /* " + lang + " */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = " + lang + "; path = " + lang + ".lproj/InfoPlist.strings; sourceTree = \"<group>\"; };\n";
index++;
}
} }
strnew += lines[i].replace("$pbx_locale_file_reference", locale_files); strnew += lines[i].replace("$pbx_locale_file_reference", locale_files);
} else if (lines[i].find("$pbx_locale_build_reference") != -1) { } else if (lines[i].find("$pbx_locale_build_reference") != -1) {
String locale_files; String locale_files;
Vector<String> translations = ProjectSettings::get_singleton()->get("locale/translations"); Vector<String> translations = ProjectSettings::get_singleton()->get("locale/translations");
if (translations.size() > 0) { if (translations.size() > 0) {
Set<String> languages;
for (int j = 0; j < translations.size(); j++) { for (int j = 0; j < translations.size(); j++) {
Ref<Translation> tr = ResourceLoader::load(translations[j]); Ref<Translation> tr = ResourceLoader::load(translations[j]);
if (tr.is_valid()) { if (tr.is_valid() && tr->get_locale() != "en") {
String lang = tr->get_locale(); languages.insert(tr->get_locale());
locale_files += "D0BCFE4518AEBDA2004A" + itos(j).pad_zeros(4) + " /* " + lang + " */,";
} }
} }
int index = 0;
for (const Set<String>::Element *E = languages.front(); E; E = E->next()) {
locale_files += "D0BCFE4518AEBDA2004A" + itos(index).pad_zeros(4) + " /* " + E->get() + " */,\n";
index++;
}
} }
strnew += lines[i].replace("$pbx_locale_build_reference", locale_files); strnew += lines[i].replace("$pbx_locale_build_reference", locale_files);
} else if (lines[i].find("$swift_runtime_migration") != -1) { } else if (lines[i].find("$swift_runtime_migration") != -1) {
@ -1957,19 +1968,23 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
f->store_line("CFBundleDisplayName = \"" + ProjectSettings::get_singleton()->get("application/config/name").operator String() + "\";"); f->store_line("CFBundleDisplayName = \"" + ProjectSettings::get_singleton()->get("application/config/name").operator String() + "\";");
} }
for (int i = 0; i < translations.size(); i++) { Set<String> languages;
Ref<Translation> tr = ResourceLoader::load(translations[i]); for (int j = 0; j < translations.size(); j++) {
if (tr.is_valid()) { Ref<Translation> tr = ResourceLoader::load(translations[j]);
String fname = dest_dir + binary_name + "/" + tr->get_locale() + ".lproj"; if (tr.is_valid() && tr->get_locale() != "en") {
languages.insert(tr->get_locale());
}
}
for (const Set<String>::Element *E = languages.front(); E; E = E->next()) {
String fname = dest_dir + binary_name + "/" + E->get() + ".lproj";
tmp_app_path->make_dir_recursive(fname); tmp_app_path->make_dir_recursive(fname);
FileAccessRef f = FileAccess::open(fname + "/InfoPlist.strings", FileAccess::WRITE); FileAccessRef f = FileAccess::open(fname + "/InfoPlist.strings", FileAccess::WRITE);
String prop = "application/config/name_" + tr->get_locale(); String prop = "application/config/name_" + E->get();
if (ProjectSettings::get_singleton()->has_setting(prop)) { if (ProjectSettings::get_singleton()->has_setting(prop)) {
f->store_line("CFBundleDisplayName = \"" + ProjectSettings::get_singleton()->get(prop).operator String() + "\";"); f->store_line("CFBundleDisplayName = \"" + ProjectSettings::get_singleton()->get(prop).operator String() + "\";");
} }
} }
} }
}
// Copy project static libs to the project // Copy project static libs to the project
Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins(); Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();

16
platform/osx/export/export.cpp
View file

@ -897,19 +897,23 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
f->store_line("CFBundleDisplayName = \"" + ProjectSettings::get_singleton()->get("application/config/name").operator String() + "\";"); f->store_line("CFBundleDisplayName = \"" + ProjectSettings::get_singleton()->get("application/config/name").operator String() + "\";");
} }
for (int i = 0; i < translations.size(); i++) { Set<String> languages;
Ref<Translation> tr = ResourceLoader::load(translations[i]); for (int j = 0; j < translations.size(); j++) {
if (tr.is_valid()) { Ref<Translation> tr = ResourceLoader::load(translations[j]);
String fname = tmp_app_path_name + "/Contents/Resources/" + tr->get_locale() + ".lproj"; if (tr.is_valid() && tr->get_locale() != "en") {
languages.insert(tr->get_locale());
}
}
for (const Set<String>::Element *E = languages.front(); E; E = E->next()) {
String fname = tmp_app_path_name + "/Contents/Resources/" + E->get() + ".lproj";
tmp_app_dir->make_dir_recursive(fname); tmp_app_dir->make_dir_recursive(fname);
FileAccessRef f = FileAccess::open(fname + "/InfoPlist.strings", FileAccess::WRITE); FileAccessRef f = FileAccess::open(fname + "/InfoPlist.strings", FileAccess::WRITE);
String prop = "application/config/name_" + tr->get_locale(); String prop = "application/config/name_" + E->get();
if (ProjectSettings::get_singleton()->has_setting(prop)) { if (ProjectSettings::get_singleton()->has_setting(prop)) {
f->store_line("CFBundleDisplayName = \"" + ProjectSettings::get_singleton()->get(prop).operator String() + "\";"); f->store_line("CFBundleDisplayName = \"" + ProjectSettings::get_singleton()->get(prop).operator String() + "\";");
} }
} }
} }
}
// Now process our template. // Now process our template.
bool found_binary = false; bool found_binary = false;