Index: geonames.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geonames/Attic/geonames.admin.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 geonames.admin.inc --- geonames.admin.inc 14 Sep 2009 14:18:14 -0000 1.1.2.1 +++ geonames.admin.inc 20 Oct 2009 02:46:54 -0000 @@ -24,7 +24,7 @@ function geonames_admin_settings() { ); $tvalues = array( '%num' => _geonames_cache_items(), - '!clearlink' => l('Clear cache', 'admin/settings/geonames/clear_cache'), + '!clearlink' => l(t('Clear cache'), 'admin/settings/geonames/clear_cache'), ); $form['cache']['clear_cache'] = array( '#prefix' => '
', @@ -62,7 +62,7 @@ function geonames_admin_settings() { ); $form['commercial']['leadingtext'] = array( '#prefix' => '
', - '#value' => t('You should always support developers of quality services. Increased performance is cheap, and you should afford it. Visit the !link page for more information', array('!link' => l('GeoNames Commercial Webservices', 'http://www.geonames.org/professional-webservices.html'))), + '#value' => t('You should always support developers of quality services. Increased performance is cheap, and you should afford it. Visit the !link page for more information', array('!link' => l(t('GeoNames Commercial Webservices'), 'http://www.geonames.org/professional-webservices.html'))), '#suffix' => '
' ); if (variable_get('geonames_commercial_active', FALSE) == TRUE) { @@ -71,7 +71,7 @@ function geonames_admin_settings() { $tvalues = array( '@credits' => variable_get('geonames_commercial_credits', 0), '@date' => format_date(variable_get('geonames_commercial_credits_since', 'unknown')), - '!link' => l('Reset', 'admin/settings/geonames/reset_credits'), + '!link' => l(t('Reset'), 'admin/settings/geonames/reset_credits'), ); $form['commercial']['counter'] = array( '#prefix' => '

', @@ -149,9 +149,9 @@ function geonames_admin_settings() { ); $tvalues = array( - '!geonameslink' => l('GeoNames', 'http://www.geonames.org/'), - '!theirsitelink' => l('their site', 'http://www.geonames.org/'), // should be translated - '!cclink' => l('Creative Commons Attribution Licence 3.0', 'http://creativecommons.org/licenses/by/3.0/'), + '!geonameslink' => l(t('GeoNames'), 'http://www.geonames.org/'), + '!theirsitelink' => l(t('their site'), 'http://www.geonames.org/'), // should be translated + '!cclink' => l(t('Creative Commons Attribution Licence 3.0'), 'http://creativecommons.org/licenses/by/3.0/'), ); $form['licencing'] = array( '#prefix' => '

'; + $page .= '
'. t('In the usage instructions below, bold parameters are') .' '. t('mandatory') .''. t('. Parameters that are structured like \'key=value\' are default values for parameters, and may be overridden. Items in') .' '. t('italics') .' '. t('are') .' '. t('optional parameters') .'. '. t('Services with multiple bold parameters may be one out of two types; single or all - read the instructions carefully.') .'

'. t('Usage Instructions for Installed Services') .'

'; $services = geonames_config(); // geonames_config('services', 'keys'); // This function used to return the full configuration........ look into how to fix it (fix in other version as well)! @@ -141,7 +141,7 @@ $result->standalone = if set to no 2) { + elseif ($numreqpar > 2) { $query_comments .= '
  • all bold parameters are required
    • '; } } Index: geonames.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geonames/geonames.install,v retrieving revision 1.1.2.2.2.10 diff -u -p -r1.1.2.2.2.10 geonames.install --- geonames.install 14 Sep 2009 05:05:20 -0000 1.1.2.2.2.10 +++ geonames.install 20 Oct 2009 02:46:55 -0000 @@ -275,7 +275,7 @@ function geonames_update_6002() { $oldprefix = substr($service[$key], strlen($prefix)); $result = db_query("SELECT cid FROM {". $cache ."} WHERE cid LIKE '%s%%'", $oldprefix); while ($row = db_fetch_object($result)) { - db_query("UPDATE {". $cache ."} SET cid = '%s' WHERE cid = '%s'", $prefix . $row->cid, $row->cid); + update_sql("UPDATE {". $cache ."} SET cid = '%s' WHERE cid = '%s'", $prefix . $row->cid, $row->cid); } } } Index: geonames.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geonames/geonames.module,v retrieving revision 1.1.4.1.2.20 diff -u -p -r1.1.4.1.2.20 geonames.module --- geonames.module 14 Sep 2009 14:41:29 -0000 1.1.4.1.2.20 +++ geonames.module 20 Oct 2009 02:46:55 -0000 @@ -296,7 +296,7 @@ function geonames_query($service, $query if ($query == NULL || $query == FALSE || $query == '') { $query = array(); } - else if (!is_array($query)) { + elseif (!is_array($query)) { return FALSE; } @@ -403,7 +403,7 @@ function geonames_query($service, $query $datacache = TRUE; } // if columns are not passed, get RESULT from cache (fastest) - Don't mess with the parenthesises - else if ((!$columns) && ($cache = cache_get($cache_geores, GEONAMES_CACHE_TABLE)) && (!empty($cache->data))) { + elseif ((!$columns) && ($cache = cache_get($cache_geores, GEONAMES_CACHE_TABLE)) && (!empty($cache->data))) { $result = $cache->data; if (variable_get('geonames_reveal_cache', TRUE)) { $result->request['cached'] = 'result'; @@ -977,10 +977,10 @@ function theme_geonames_table($resultobj if (empty($resultobj)) { return ''; } - else if ($resultobj->status) { + elseif ($resultobj->status) { return '
    '.'No results, response: '. $resultobj->status['message'] .'
    '; } - else if ($resultobj->results) { + elseif ($resultobj->results) { $header = array(''); $rows = array(); $pastfirst = FALSE; Index: geonames_tools.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geonames/geonames_tools.module,v retrieving revision 1.1.2.2.2.2 diff -u -p -r1.1.2.2.2.2 geonames_tools.module --- geonames_tools.module 16 Apr 2009 00:18:46 -0000 1.1.2.2.2.2 +++ geonames_tools.module 20 Oct 2009 02:46:55 -0000 @@ -11,7 +11,7 @@ */ function geonames_tools_menu() { $items['geonames/autocomplete'] = array( - 'title' => t('Autocomplete Geonames Search'), + 'title' => 'Autocomplete Geonames Search', 'page callback' => 'geonames_tools_search_autocomplete', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, Index: tests/geonames.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/geonames/tests/Attic/geonames.test,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 geonames.test --- tests/geonames.test 14 Sep 2009 15:15:09 -0000 1.1.2.4 +++ tests/geonames.test 20 Oct 2009 02:46:56 -0000 @@ -1,6 +1,11 @@