--- location_views.module[1].bak 2007-02-09 19:13:06.204726500 +0100 +++ location_views.module 2007-02-09 19:16:29.762015300 +0100 @@ -6,7 +6,7 @@ * */ -define('LOCATION_VIEWS_UNKNOWN', t('unknown')); +define('LOCATION_VIEWS_UNKNOWN', 'unknown'); /** * Implementation of hook_help(). @@ -720,7 +721,7 @@ $fieldinfo['field'] = "IF ($table.city='' OR $table.city IS NULL, '" . t(LOCATION_VIEWS_UNKNOWN) . "', $table.city)"; } else { - $fieldinfo['field'] = "IF ($table.city='' OR $table.city IS NULL, '" . LOCATION_VIEWS_UNKNOWN . "', LEFT($table.city, $len))"; + $fieldinfo['field'] = "IF ($table.city='' OR $table.city IS NULL, '" . t(LOCATION_VIEWS_UNKNOWN) . "', LEFT($table.city, $len))"; } $fieldinfo['fieldname'] = 'city'; return $fieldinfo; @@ -735,17 +736,17 @@ // adjust the search based on whether you are looking for the full city name or the first $len letters $len = intval($argtype['options']); if ($len <= 0) { - $query->add_where("$table.city = '%s'", strcasecmp($arg, LOCATION_VIEWS_UNKNOWN) ? $arg : ''); + $query->add_where("$table.city = '%s'", strcasecmp($arg, t(LOCATION_VIEWS_UNKNOWN)) ? $arg : ''); } else { - $query->add_where("LEFT($table.city, $len) = '%s'", strcasecmp($arg, LOCATION_VIEWS_UNKNOWN) ? $arg : ''); + $query->add_where("LEFT($table.city, $len) = '%s'", strcasecmp($arg, t(LOCATION_VIEWS_UNKNOWN)) ? $arg : ''); } break; case 'link': // if using first letter directory, use strtoupper on the link if ($len) { - return l($query->city == LOCATION_VIEWS_UNKNOWN ? LOCATION_VIEWS_UNKNOWN : strtoupper($query->city), "$arg/$query->city"); + return l($query->city == t(LOCATION_VIEWS_UNKNOWN) ? t(LOCATION_VIEWS_UNKNOWN) : strtoupper($query->city), "$arg/$query->city"); } else { - return l($query->city == LOCATION_VIEWS_UNKNOWN ? LOCATION_VIEWS_UNKNOWN : $query->city, "$arg/$query->city"); + return l($query->city == t(LOCATION_VIEWS_UNKNOWN) ? t(LOCATION_VIEWS_UNKNOWN) : $query->city, "$arg/$query->city"); } case 'title': return $query; @@ -763,7 +764,7 @@ switch($op) { case 'summary': $query->ensure_table($table, true); - $fieldinfo['field'] = "IF($table.province='' OR $table.province IS NULL,'" . LOCATION_VIEWS_UNKNOWN . "',$table.province)"; + $fieldinfo['field'] = "IF($table.province='' OR $table.province IS NULL,'" . t(LOCATION_VIEWS_UNKNOWN) . "',$table.province)"; $fieldinfo['fieldname'] = 'province'; // Make sure the country gets added so we can do a lookup on the province name. @@ -777,12 +778,12 @@ case 'filter': $query->ensure_table($table); $query->add_field('province', $table); - $query->add_where("$table.province = '%s'", strcasecmp($arg, LOCATION_VIEWS_UNKNOWN) ? $arg : ''); + $query->add_where("$table.province = '%s'", strcasecmp($arg, t(LOCATION_VIEWS_UNKNOWN)) ? $arg : ''); break; case 'link': - return l($query->province == LOCATION_VIEWS_UNKNOWN ? LOCATION_VIEWS_UNKNOWN : $provinces[$query->country .'-'. $query->province], "$arg/$query->province"); + return l($query->province == t(LOCATION_VIEWS_UNKNOWN) ? t(LOCATION_VIEWS_UNKNOWN) : $provinces[$query->country .'-'. $query->province], "$arg/$query->province"); case 'title': - return empty($query) ? LOCATION_VIEWS_UNKNOWN : $provinces[$country .'-'. $query]; + return empty($query) ? t(LOCATION_VIEWS_UNKNOWN) : $provinces[$country .'-'. $query]; } } @@ -800,7 +801,7 @@ switch($op) { case 'summary': $query->ensure_table($table, true); - $fieldinfo['field'] = "IF($table.country='' OR $table.country IS NULL,'" . LOCATION_VIEWS_UNKNOWN . "',$table.country)"; + $fieldinfo['field'] = "IF($table.country='' OR $table.country IS NULL,'" . t(LOCATION_VIEWS_UNKNOWN) . "',$table.country)"; $fieldinfo['fieldname'] = 'country'; return $fieldinfo; break; @@ -814,9 +815,9 @@ $query->add_where("$table.country = '%s'", $arg); break; case 'link': - return l($query->country == LOCATION_VIEWS_UNKNOWN ? LOCATION_VIEWS_UNKNOWN : $country_name, "$arg/$query->country"); + return l($query->country == t(LOCATION_VIEWS_UNKNOWN) ? t(LOCATION_VIEWS_UNKNOWN) : $country_name, "$arg/$query->country"); case 'title': - return $query == LOCATION_VIEWS_UNKNOWN ? LOCATION_VIEWS_UNKNOWN : $country_name; + return $query == t(LOCATION_VIEWS_UNKNOWN) ? t(LOCATION_VIEWS_UNKNOWN) : $country_name; } }