Index: openacs-4/packages/ams/tcl/address-widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ams/tcl/address-widget-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/ams/tcl/address-widget-procs.tcl 28 Jul 2005 17:05:27 -0000 1.9 +++ openacs-4/packages/ams/tcl/address-widget-procs.tcl 12 Sep 2005 22:09:17 -0000 1.10 @@ -68,7 +68,6 @@ } # Different formats depending on the country - switch $country_code { "US" { set address "$delivery_address @@ -80,9 +79,15 @@ $postal_code $municipality" } default { - set address "$delivery_address -$postal_code $municipality + if { [parameter::get_from_package_key -package_key "ams" -parameter "DefaultAdressLayoutP" -default 1] } { + set address "$delivery_address +$municipality $region $postal_code $country" + } else { + set address "$delivery_address +$postal_code $municipality $region +$country" + } } } return [ad_text_to_html $address] @@ -457,16 +462,32 @@