internationalise (?) the order of address fields

Currently, the address fields are displayed as follows:

street
city, state zip
country

This works for US addresses, but fails for Polish; a typical Polish address should have the following pattern (we almost never use voivodship names in our addresses, but when we do, we write them on separate line):

street
zip city
[voivodship]
country

We can?t make the address field setup a localisation setting, though; we should always write US addresses the US way, Polish ones the Polish way, etc.. The only solution I can think of now is to define per-country patterns (and fall back to the US scheme when there?s no pattern defined) and use them based on the selected country.