--- cck_address.module	Sat Dec 15 04:16:14 2007
+++ cck_address.module	Fri Oct 03 21:41:21 2008
@@ -1398,7 +1398,7 @@
           '#type' => 'textfield',
           '#title' => t('Street number'),
           '#default_value' => isset($items[0]['street1']) ? $items[0]['street1'] : '',
-          '#required' => $field['fielddisplay']['field_display_street1'] == 'field_display_street1' && $field['required'] == TRUE ? TRUE : FALSE,
+          '#required' => $field['fielddisplay']['field_display_street1'] && $field['required'],
           '#size' => 10,
           '#maxlength' => 10,
         );
@@ -1409,7 +1409,7 @@
           '#title' => t('Street name'),
           '#description' => t('Leave off any street designators like Way, or Road, or Rd. Just use the name.'),
           '#default_value' => isset($items[0]['street2']) ? $items[0]['street2'] : '',
-          '#required' => $field['fielddisplay']['field_display_street2'] == 'field_display_street2' && $field['required'] == TRUE ? TRUE : FALSE,
+          '#required' => $field['fielddisplay']['field_display_street2'] && $field['required'],
           '#size' => 25,
           '#maxlength' => 50,
         );
@@ -1421,7 +1421,7 @@
           '#title' => t('City'),
           '#default_value' => $city,
           '#multiple' => FALSE,
-          '#required' => $field['fielddisplay']['field_display_city'] == 'field_display_city' && $field['required'] == TRUE ? TRUE : FALSE,
+          '#required' => $field['fielddisplay']['field_display_city'] && $field['required'],
           '#options' => $all_cities,
         );
         
@@ -1431,7 +1431,7 @@
           '#title' => t('Zip code'),
           '#default_value' => $zip,
           '#multiple' => FALSE,
-          '#required' => $field['fielddisplay']['field_display_zip'] == 'field_display_zip' && $field['required'] == TRUE ? TRUE : FALSE,
+          '#required' => $field['fielddisplay']['field_display_zip'] && $field['required'],
           '#options' => $all_zips,
         );
         
@@ -1446,13 +1446,13 @@
           '#title' => t('Country'),
           '#value' => $mand_country,
         );
-      }
-      else { //not using the pre-known address validation option
+      }
+      else { //not using the pre-known address validation option
         $form[$field['field_name']][0]['street1'] = array(
           '#type' => 'textfield',
-          '#title' => isset($field['field_names_street1']) ? $field['field_names_street1'] : t('Address'),
+          '#title' => isset($field['field_names_street1']) ? t($field['field_names_street1']) : t('Address'),
           '#default_value' => isset($items[0]['street1']) ? $items[0]['street1'] : $field['field_defaults_street1'],
-          '#required' => $field['fielddisplay']['field_display_street1'] == 'field_display_street1' && $field['required'] == TRUE ? TRUE : FALSE,
+          '#required' => $field['fielddisplay']['field_display_street1'] && $field['required'],
           '#size' => 20,
           '#maxlength' => $field['max_length_street1'] ? $field['max_length_street1'] : NULL,
           '#prefix' => '<div class="cck-address-street1">',
@@ -1488,7 +1488,7 @@
           '#type' => 'textfield',
           '#title' => isset($field['field_names_city']) ? $field['field_names_city'] : t('City'),
           '#default_value' => isset($items[0]['city']) ? $items[0]['city'] : $field['field_defaults_city'],
-          '#required' => $field['fielddisplay']['field_display_city'] == 'field_display_city' && $field['required'] == TRUE ? TRUE : FALSE,
+          '#required' => $field['fielddisplay']['field_display_city'] && $field['required'],
           '#size' => 20,
           '#maxlength' => $field['max_length_city'] ? $field['max_length_city'] : NULL,
           '#prefix' => '<div class="cck-address-city">',
@@ -1504,7 +1504,7 @@
             '#type' => 'textfield',
             '#title' => isset($field['field_names_state']) ? $field['field_names_state'] : t('State'),
             '#default_value' => $state,
-            '#required' => $field['fielddisplay']['field_display_state'] == 'field_display_state' && $field['required'] == TRUE ? TRUE : FALSE,
+            '#required' => $field['fielddisplay']['field_display_state'] && $field['required'],
             '#size' => 20,
             '#maxlength' => $field['max_length_city'] ? $field['max_length_city'] : NULL,
             '#prefix' => '<div class="cck-address-state">',
@@ -1518,7 +1518,7 @@
             '#title' => isset($field['field_names_state']) ? $field['field_names_state'] : t('State'),
             '#default_value' => $state,
             '#multiple' => FALSE,
-            '#required' => $field['fielddisplay']['field_display_state'] == 'field_display_state' && $field['required'] == TRUE ? TRUE : FALSE,
+            '#required' => $field['fielddisplay']['field_display_state'] && $field['required'],
             '#options' => array(),
             '#prefix' => '<div class="cck-address-state">',
             '#suffix' => '</div>',
@@ -1530,7 +1530,7 @@
           '#type' => 'textfield',
           '#title' => isset($field['field_names_zip']) ? $field['field_names_zip'] : t('ZIP'),
           '#default_value' => isset($items[0]['zip']) ? $items[0]['zip'] : $field['field_defaults_zip'],
-          '#required' => $field['fielddisplay']['field_display_zip'] == 'field_display_zip' && $field['required'] == TRUE ? TRUE : FALSE,
+          '#required' => $field['fielddisplay']['field_display_zip'] && $field['required'],
           '#size' => 10,
           '#maxlength' => 10,
           '#prefix' => '<div class="cck-address-zip">',
@@ -1543,7 +1543,7 @@
             '#type' => 'textfield',
             '#title' => isset($field['field_names_country']) ? $field['field_names_country'] : t('Country'),
             '#default_value' => isset($items[0]['country']) ? $items[0]['country'] : '',
-            '#required' => $field['fielddisplay']['field_display_country'] == 'field_display_country' && $field['required'] == TRUE ? TRUE : FALSE,
+            '#required' => $field['fielddisplay']['field_display_country'] && $field['required'],
             '#size' => 20,
             '#maxlength' => $field['max_length_city'] ? $field['max_length_city'] : NULL,
             '#prefix' => '<div class="cck-address-country">',
@@ -1560,7 +1560,7 @@
             '#title' => isset($field['field_names_country']) ? $field['field_names_country'] : t('Country'),
             '#default_value' => isset($items[0]['country']) ? array($items[0]['country']) : $country_pre_default,
             '#multiple' => FALSE,
-            '#required' => $field['fielddisplay']['field_display_country'] == 'field_display_country' && $field['required'] == TRUE ? TRUE : FALSE,
+            '#required' => $field['fielddisplay']['field_display_country'] && $field['required'],
             '#options' => $allowed_countries,
             '#prefix' => '<div class="cck-address-country">',
             '#suffix' => '</div>',