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.8 -r1.9
--- openacs-4/packages/ams/tcl/address-widget-procs.tcl	19 Jun 2005 05:04:06 -0000	1.8
+++ openacs-4/packages/ams/tcl/address-widget-procs.tcl	28 Jul 2005 17:05:27 -0000	1.9
@@ -67,9 +67,24 @@
         }
     }
 
-    set address "$delivery_address
-$municipality, $region  $postal_code
+    # Different formats depending on the country
+    
+    switch $country_code {
+	"US" {
+	    set address "$delivery_address
+$municipality, $region $postal_code
 $country"
+	}
+	"DE" {
+	    set address "$delivery_address
+$postal_code $municipality"
+	}	    
+	default {
+	    set address "$delivery_address
+$postal_code $municipality
+$country"
+	}	    
+    }
     return [ad_text_to_html $address]
 }