i18n

diff --git a/TODO b/TODO
index 5478707..0e5c89b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.45 2000-06-23 12:25:59 ivan Exp $
+$Id: TODO,v 1.46 2000-06-27 12:15:50 ivan Exp $
 
 If you are interested in helping with any of these, please join the mailing
 list (send a blank message to ivan-freeside-subscribe@sisd.com) to avoid 
@@ -6,6 +6,11 @@ duplication of effort.
 
 ---
 
+zip code i18n is not very good :( but at least US, CA, HU, ?
+
+ut_phonen doesn't check data length.  several
+orthogonal cleanup projects here.  *sigh*
+
 update the cybercash links in config.html and in the homepage.  add more explicit support for other payment types.  etc.
 
 From "Tim Jung" <tjung@igateway.net>

diff --git a/htdocs/docs/config.html b/htdocs/docs/config.html
index fe1cce2..730a1c9 100644 (file)
--- a/htdocs/docs/config.html
+++ b/htdocs/docs/config.html
@@ -28,6 +28,7 @@ All further configuration files and directories are located in
   <li>bindprimary - Your BIND primary nameserver.  This enables export of /var/named/named.conf and zone files into /var/named
   <li>bindsecondaries - Your BIND secondary nameservers, one per line.  This enables export of /var/named/named.conf
   <li>bsdshellmachines - Your BSD flavored shell (and mail) machines, one per line.  This enables export of `/etc/passwd' and `/etc/master.passwd'.
+  <li>countrydefault - Default two-letter country code (if not supplied, the default is `US')
   <li>cybercash2 - <a href="http://www.cybercash.com/cybercash/services/cashreg214.html">CyberCash v2</a> support, four lines: paymentserverhost, paymentserverport, paymentserversecret, and transaction type (`mauthonly' or `mauthcapture').  CCLib.pm is required.
   <li>cybercash3.2 - <a href="http://www.cybercash.com/cybercash/services/technology.html">CyberCash v3.2</a> support.  Two lines: the full path and name of your merchant_conf file, and the transaction type (`mauthonly' or `mauthcapture').  CCMckLib3_2.pm, CCMckDirectLib3_2.pm and CCMckErrno3_2 are required.
   <li>deletecustomers - The existance of this file will enable customer deletions.  Be very careful!  Deleting a customer will remove all traces that this customer ever existed!  It should probably only be used when auditing a legacy database.  Normally, you cancel all of a customers' packages if they cancel service.

diff --git a/htdocs/edit/cust_main.cgi b/htdocs/edit/cust_main.cgi
index 6356a4d..0cde76b 100755 (executable)
--- a/htdocs/edit/cust_main.cgi
+++ b/htdocs/edit/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main.cgi,v 1.25 2000-03-02 08:09:38 ivan Exp $
+# $Id: cust_main.cgi,v 1.26 2000-06-27 12:15:50 ivan Exp $
 #
 # Usage: cust_main.cgi custnum
 #        http://server.name/path/cust_main.cgi?custnum
@@ -38,7 +38,10 @@
 # fixed one missed day->daytime ivan@sisd.com 98-jul-13
 #
 # $Log: cust_main.cgi,v $
-# Revision 1.25  2000-03-02 08:09:38  ivan
+# Revision 1.26  2000-06-27 12:15:50  ivan
+# i18n
+#
+# Revision 1.25  2000/03/02 08:09:38  ivan
 # still need to allow blank expiration dates
 #
 # Revision 1.24  2000/01/30 06:54:50  ivan
@@ -260,7 +263,8 @@ print "<BR><BR>Contact information", &itable("#c0c0c0"), <<END;
 <TR><TH ALIGN="right">${r}City</TH><TD><INPUT TYPE="text" NAME="city" VALUE="$city"></TD><TH ALIGN="right">${r}State/Country</TH><TD><SELECT NAME="state" SIZE="1">
 END
 
-$cust_main->country('US') unless $cust_main->country; #eww
+$cust_main->country( $conf->config('countrydefault') || 'US' )
+  unless $cust_main->country;
 foreach ( qsearch('cust_main_county',{}) ) {
   print "<OPTION";
   print " SELECTED" if ( $cust_main->state eq $_->state