Merge pull request #20443 from AlexHolly/add-string-format-no-index

Added String.format "no index" support
This commit is contained in:
Rémi Verschelde 2018-08-14 16:13:34 +02:00 committed by GitHub
commit 7718b90d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2788,7 +2788,11 @@ String String::format(const Variant &values, String placeholder) const {
val = val.substr(1, val.length() - 2);
}
new_string = new_string.replace(placeholder.replace("_", i_as_str), val);
if (placeholder.find("_") > -1) {
new_string = new_string.replace(placeholder.replace("_", i_as_str), val);
} else {
new_string = new_string.replace_first(placeholder, val);
}
}
}
} else if (values.get_type() == Variant::DICTIONARY) {