Index: openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl	18 Jul 2001 23:46:14 -0000	1.3
+++ openacs-4/packages/ecommerce/tcl/ecommerce-utilities-procs.tcl	22 Oct 2001 08:02:10 -0000	1.4
@@ -391,6 +391,19 @@
     return "[join $city_list " or "]"
 }
 
+ad_proc ec_country_name_from_country_code { country_code } {
+    gets country name from country code
+} {
+    if [catch {
+	db_1row country_name {
+	    select default_name from country_names where iso=:country_code
+	}
+    } errmsg] {
+	return "Country not found"
+    }
+    return $name
+}
+
 ad_proc ec_pretty_mailing_address_from_args { line1 line2 city usps_abbrev zip_code country_code full_state_name attn phone phone_time } { get Pretty Mailing Address } {
 
     set lines [list $attn]
@@ -406,7 +419,7 @@
     if { ![empty_string_p $country_code] && $country_code != "us" } {
 	lappend lines "$city, $full_state_name $zip_code"
 
-	lappend lines [ad_country_name_from_country_code $country_code]
+	lappend lines [ec_country_name_from_country_code $country_code]
     } else {
 	lappend lines "$city, $usps_abbrev $zip_code"
     }