Commit b2bc9af0 authored by Volker Krause's avatar Volker Krause
Browse files

Don't attempt to resolve ISO 3166-1 country codes for the address formatter

That will revert that again anyway, and that seems to be less reliable
on Android than it is on Linux.

BUG: 452979
FIXED-IN: 20.04.1
parent 21db2624
Pipeline #168735 passed with stage
in 1 minute and 20 seconds
......@@ -58,14 +58,14 @@ QString Localizer::formatAddress(const QVariant &obj) const
address.setPostalCode(a.postalCode());
address.setLocality(a.addressLocality());
address.setRegion(a.addressRegion());
address.setCountry(KCountry::fromAlpha2(a.addressCountry()).name());
address.setCountry(a.addressCountry());
} else if (std::strcmp(obj.typeName(), "KOSMIndoorMap::OSMAddress") == 0) {
const auto mo = QMetaType::metaObjectForType(obj.userType());
address.setStreet(readFromGadget(mo, obj, "street") + QLatin1Char(' ') + readFromGadget(mo, obj, "houseNumber"));
address.setPostalCode(readFromGadget(mo, obj, "postalCode"));
address.setLocality(readFromGadget(mo, obj, "city"));
address.setRegion(readFromGadget(mo, obj, "state"));
address.setCountry(KCountry::fromAlpha2(readFromGadget(mo, obj, "country")).name());
address.setCountry(readFromGadget(mo, obj, "country"));
} else {
return {};
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment