Fixed #6409 -- Unbreak compound locale name parsing (e.g. zh-cn).