Index: openacs-4/packages/ams/ams.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ams/ams.info,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/ams/ams.info	10 Feb 2006 01:25:55 -0000	1.20
+++ openacs-4/packages/ams/ams.info	17 Feb 2006 20:06:25 -0000	1.21
@@ -8,14 +8,14 @@
     <singleton-p>t</singleton-p>
     <auto-mount>ams</auto-mount>
 
-    <version name="1.1d13" url="http://openacs.org/repository/download/apm/ams-1.1d13.apm">
+    <version name="1.1d14" url="http://openacs.org/repository/download/apm/ams-1.1d14.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>Store attributes via the Content Repository, and auto generate input forms</summary>
-        <release-date>2005-11-21</release-date>
+        <release-date>2006-02-17</release-date>
         <description format="text/html">AMS (Attribute Management System) helps in customizing your website. It lets you adjust what information is collected and displayed for any package that is integrated with it. AMS allows you to easily and dynamically add attributes to forms and display pages, using a Tcl API or an admin interface. AMS uses the content repository to store attribute history for any object on the system.</description>
         <maturity>0</maturity>
 
-        <provides url="ams" version="1.1d13"/>
+        <provides url="ams" version="1.1d14"/>
         <requires url="acs-lang" version="5.1.5d1"/>
         <requires url="postal-address" version="0.1d"/>
         <requires url="ref-countries" version="0.1d"/>
@@ -32,6 +32,7 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DefaultStreetLines"  default="3" description="Maximum number of lines of text the street address may have" section_name="address-widget"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="DefaultStreetSize"  default="100" description="Maximum number of characters the street address might have" section_name="address-widget"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ForceCountryCodeOneFormatting"  default="0" description="If set to &quot;1&quot; AMS will force phone numbers to follow the country zone code 1 rules (US, Canada, etc.), all phone numbers will need to follow the 'three digit area code'-'three digits - 4 digits'x'Extension' format. All &quot;international&quot; numbers will need to have the format &quot;011-'Country_Code'-'Area_Code'-'Subscriber_number'x'Extension' format. If set to &quot;0&quot; telecom numbers will not be seperated into these elements, and the whole number will be entered in the DB as the subscriber number just as input in the form." section_name="telecom-number-widget"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="HideISOCountryCode"  description="Specify the country names to hide when displaying addresses. Specify they ISO Country Code(s) here as a space seperated list for all countries that apply. If all your workers mail letters from one country you will likely not want to or need to print that country's name on letters, envelopes, reports, etc." section_name="address-widget"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PhoneURL"  description="If this is set, all phone numbers will be underlined with a URL, so you could click on the phone number and your Windows application starts a Phone Connection to the number you clicked on. Usually this is done using the phone protocol, so a save value is 'phone:$telecom_number'" section_name="telecom-number-widget"/>
         </parameters>
 
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.13 -r1.14
--- openacs-4/packages/ams/tcl/address-widget-procs.tcl	30 Jan 2006 22:44:59 -0000	1.13
+++ openacs-4/packages/ams/tcl/address-widget-procs.tcl	17 Feb 2006 20:06:25 -0000	1.14
@@ -51,32 +51,39 @@
         # There is no HTTP connection - resort to system locale
         set locale [lang::system::locale]
     }
-    set key "ams.country_${country_code}"
-    if { [string is true [lang::message::message_exists_p $locale $key]] } {
-        set country [lang::message::lookup $locale $key]
-    } else {
-        # cache the country codes
-        template::util::address::country_options_not_cached -locale $locale
 
-        if { [string is true [lang::message::message_exists_p $locale $key]] } {
-            set country [lang::message::lookup $locale $key]
-        } else {
-            # we get the default en_US key which was created with the
-            # template::util::address::country_options_not_cached proc
-            set country [lang::message::lookup "en_US" $key]
-        }
+    if { [lsearch [parameter::get_from_package_key -package_key "ams" -parameter "HideISOCountryCode" -default {}] $country_code] >= 0 } {
+	set country ""
+    } else {
+	set key "ams.country_${country_code}"
+	if { [string is true [lang::message::message_exists_p $locale $key]] } {
+	    set country [lang::message::lookup $locale $key]
+	} else {
+	    # cache the country codes
+	    template::util::address::country_options_not_cached -locale $locale
+	    
+	    if { [string is true [lang::message::message_exists_p $locale $key]] } {
+		set country [lang::message::lookup $locale $key]
+	    } else {
+		# we get the default en_US key which was created with the
+		# template::util::address::country_options_not_cached proc
+		set country [lang::message::lookup "en_US" $key]
+	    }
+	}
     }
 
+
     # Different formats depending on the country
     switch $country_code {
-	"US" {
+	"US" - "CA" {
 	    set address "$delivery_address
 $municipality, $region $postal_code
 $country"
 	}
 	"DE" {
 	    set address "$delivery_address
-$postal_code $municipality"
+$postal_code $municipality
+$country"
 	}	    
 	default {
 	    if { [parameter::get_from_package_key -package_key "ams" -parameter "DefaultAdressLayoutP" -default 1] } {
@@ -90,6 +97,8 @@
 	    }
 	}	    
     }
+    # now we remove the ending country line if no country exists
+    set address [string trim $address]
     return [ad_text_to_html $address]
 }