Index: location.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/location/location.inc,v
retrieving revision 1.1
diff -u -r1.1 location.inc
--- location.inc	17 Mar 2005 05:31:34 -0000	1.1
+++ location.inc	22 Mar 2005 14:06:45 -0000
@@ -1,5 +1,7 @@
 <?php
 
+define('LOCATION_PATH', drupal_get_path('module', 'location'));
+
 /**
  * @file
  * An implementation of a universal API for location manipulation.  Provides functions for
@@ -7,7 +9,7 @@
  * some options are configured through an interface provided by location.module.
  */
 
-include_once 'modules/location/earth.inc';
+include_once LOCATION_PATH.'/earth.inc';
 _location_include_configured();
 
 /**
@@ -86,7 +88,7 @@
       if (isset($location['province']) && strlen(trim($location['province']))) {
         $city_province_postal[] = $location['province'];
       }
-      
+
       if (isset($location['postal_code']) && strlen(trim($location['postal_code']))) {
         $city_province_postal[] = $location['postal_code'];
       }
@@ -333,8 +335,9 @@
     $value = trim($value);
     if ($key == 'province') {
       if (strlen($value) && $value != 'xx') {
-        // chop off the 2-letter code and the '-' from the front of the value
-        $value = substr($value, 3);
+        // chop off the 2-letter code from the front of the value 
+        //("and the '-'" no longer applies)
+        $value = substr($value, 2);
       }
     }
     $translated[$key] = $value;
@@ -1164,10 +1167,10 @@
   // '<ISO two-letter code>' => '<English name for country>'
   $countrycodes = _location_get_iso3166_list();
   $supported_countries = array();
-  if (is_dir('modules/location/supported') && $handle = opendir('modules/location/supported')) {
+  if (is_dir(LOCATION_PATH.'/supported') && $handle = opendir(LOCATION_PATH.'/supported')) {
     $matches = array();
     while ($file = readdir($handle)) {
-      if (ereg('location.([a-z]{2}).inc', $file, $matches) && is_file('modules/location/supported/'. $file)) {
+      if (ereg('location.([a-z]{2}).inc', $file, $matches) && is_file(LOCATION_PATH.'/supported/'. $file)) {
         $supported_countries[] = $matches[1];
         $matches = array();
       }
@@ -1272,7 +1275,7 @@
     foreach ($countrycodes as $country_name => $country_code) {
       // Load country specifice code .inc file if it exists.
       // For example, if country_code for U.S. == 'us', load location.us.inc
-      $include_file = 'modules/location/supported/location.'. $country_code .'.inc';
+      $include_file = LOCATION_PATH.'/supported/location.'. $country_code .'.inc';
       $province_listing_function = 'location_province_list_'. $country_code;
       if (function_exists($province_listing_function)) {
         $province_list = $province_listing_function();
@@ -1295,7 +1298,7 @@
 function _location_include_configured() {
   $configured_country_codes = array_keys(location_configured_countries());
   foreach ($configured_country_codes as $country_code) {
-    $filename = 'modules/location/supported/location.'. $country_code .'.inc';
+    $filename = LOCATION_PATH.'/supported/location.'. $country_code .'.inc';
     if (file_exists($filename)) {
       include_once($filename);
     }