maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix format ignores case in placeholder

Browse source
This commit is contained in:
Alexander Holland 2018-07-25 12:14:48 +02:00
parent f8e8ac2c66
commit 84db7056b7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/ustring.cpp
View file

@ -2768,7 +2768,7 @@ String String::format(const Variant &values, String placeholder) const {
val = val.substr(1, val.length() - 2); val = val.substr(1, val.length() - 2);
} }
new_string = new_string.replacen(placeholder.replace("_", key), val); new_string = new_string.replace(placeholder.replace("_", key), val);
} else { } else {
ERR_PRINT(String("STRING.format Inner Array size != 2 ").ascii().get_data()); ERR_PRINT(String("STRING.format Inner Array size != 2 ").ascii().get_data());
} }
@ -2781,7 +2781,7 @@ String String::format(const Variant &values, String placeholder) const {
val = val.substr(1, val.length() - 2); val = val.substr(1, val.length() - 2);
} }
new_string = new_string.replacen(placeholder.replace("_", i_as_str), val); new_string = new_string.replace(placeholder.replace("_", i_as_str), val);
} }
} }
} else if (values.get_type() == Variant::DICTIONARY) { } else if (values.get_type() == Variant::DICTIONARY) {
@ -2801,7 +2801,7 @@ String String::format(const Variant &values, String placeholder) const {
val = val.substr(1, val.length() - 2); val = val.substr(1, val.length() - 2);
} }
new_string = new_string.replacen(placeholder.replace("_", key), val); new_string = new_string.replace(placeholder.replace("_", key), val);
} }
} else { } else {
ERR_PRINT(String("Invalid type: use Array or Dictionary.").ascii().get_data()); ERR_PRINT(String("Invalid type: use Array or Dictionary.").ascii().get_data());