Index: docs/xmlsitemap.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/docs/xmlsitemap.php,v retrieving revision 1.2.2.2.2.10 diff -u -r1.2.2.2.2.10 xmlsitemap.php --- docs/xmlsitemap.php 15 Jun 2008 06:37:48 -0000 1.2.2.2.2.10 +++ docs/xmlsitemap.php 20 Dec 2008 12:08:38 -0000 @@ -209,7 +209,7 @@ break; case 'access': if (strpos($_SERVER['HTTP_USER_AGENT'], 'Googlebot') !== FALSE) { - return t('!sitemap downloaded by Google.', array('!sitemap' => $type)); + return t('@sitemap downloaded by Google.', array('@sitemap' => $type)); } break; } Index: xmlsitemap.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap.module,v retrieving revision 1.1.2.20.2.31 diff -u -r1.1.2.20.2.31 xmlsitemap.module --- xmlsitemap.module 15 Dec 2008 21:57:35 -0000 1.1.2.20.2.31 +++ xmlsitemap.module 20 Dec 2008 12:08:38 -0000 @@ -18,38 +18,38 @@ switch ($section) { case 'admin/settings/xmlsitemap': case 'admin/settings/xmlsitemap/settings': - $output = t('Configure the site map. Your site map is at !url.', array('!url' => l(xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE), xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE)))); + $output = t('Configure the site map. Your site map is at @xmlsitemap-url.', array('@xmlsitemap-url' => xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE)); break; case 'admin/settings/xmlsitemap/engines': $output = t('Configure behavior for search engines.'); break; case 'admin/help#xmlsitemap': - $output = '

'. t('XML Sitemap automatically creates a site map that conforms to the !sitemaps.org specification. This helps search engines keep their search results up to date.', array('!sitemaps.org' => l('sitemaps.org', 'http://www.sitemaps.org'))) ."

\n"; - $output .= '

'. t('Your site map is at !sitemap.xml.', array('!sitemap.xml' => l(xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE), xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE)))) .'

'; + $output = '

'. t('XML Sitemap automatically creates a site map that conforms to the sitemaps.org specification. This helps search engines keep their search results up to date.', array('@sitemaps-org' => 'http://www.sitemaps.org')) ."

\n"; + $output .= '

'. t('Your site map is at @xmlsitemap-url.', array('@xmlsitemap-url' => xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE))) .'

'; $output .= '

'. t('Supporting modules') ."

\n"; $output .= '

'. t('By itself, the XML Sitemap module adds only the front page of your site to the site map. Other types of links are handled by supporting modules.') ."

\n"; $optional = ''; if (module_exists('xmlsitemap_menu')) { $optional .= '
'. t('XML Sitemap: Menu') ."
\n"; - $optional .= '
'. t('XML Sitemap: Menu allows menu items to be added to the site map. You can choose the menus to include on the XML Sitemap administration page and can add and remove menu items on the !menu administration page. The priority of a menu item is determined by its weight.', array('!menu administration' => l('menu administration', 'admin/build/menu'))) ."
\n"; + $optional .= '
'. t('XML Sitemap: Menu allows menu items to be added to the site map. You can choose the menus to include on the XML Sitemap administration page and can add and remove menu items on the menu administration page. The priority of a menu item is determined by its weight.', array('@menu-administration' => url('admin/build/menu'))) ."
\n"; } if (module_exists('xmlsitemap_node')) { $optional .= '
'. t('XML Sitemap: Node') ."
\n"; - $optional .= '
'. t('XML Sitemap: Node adds nodes (content) to the site map. The default priority of a node is determined by a combination of its !content type priority, whether it appears on the front page of your site, and the number of comments it has received. You can override the default priority for individual nodes when you add or edit a node.', array('!content type' => l('content type', 'admin/content/types'))) ."
\n"; + $optional .= '
'. t('XML Sitemap: Node adds nodes (content) to the site map. The default priority of a node is determined by a combination of its content type priority, whether it appears on the front page of your site, and the number of comments it has received. You can override the default priority for individual nodes when you add or edit a node.', array('@content type' => url('admin/content/types'))) ."
\n"; } if (module_exists('xmlsitemap_term')) { $optional .= '
'. t('XML Sitemap: Term') ."
\n"; - $optional .= '
'. t('XML Sitemap: Term adds !taxonomy terms (categories) to the site map. You can change the default priority when you add or edit a vocabulary, and you can override the default priority when you add or edit individual terms.', array('!taxonomy terms' => l('taxonomy terms', 'admin/content/taxonomy'))) ."
\n"; + $optional .= '
'. t('XML Sitemap: Term adds taxonomy terms (categories) to the site map. You can change the default priority when you add or edit a vocabulary, and you can override the default priority when you add or edit individual terms.', array('@taxonomy-terms' => url('admin/content/taxonomy'))) ."
\n"; } if (module_exists('xmlsitemap_user')) { $optional .= '
'. t('XML Sitemap: User') ."
\n"; - $optional .= '
'. t('XML Sitemap: User adds user profiles to the site map. The anonymous user role must be given permission to access user profiles on the !access control page. You can change the default user priority on the !user settings page. The !user role priority will override the default user priority. You can override both the default priority and the role priority when you add or edit a user.', array('!access control' => l('access control', 'admin/user/access'), '!user settings' => l('user settings', 'admin/user/settings'), '!user role' => l('user role', 'admin/user/roles'))) ."
\n"; + $optional .= '
'. t('XML Sitemap: User adds user profiles to the site map. The anonymous user role must be given permission to access user profiles on the access control page. You can change the default user priority on the user settings page. The user role priority will override the default user priority. You can override both the default priority and the role priority when you add or edit a user.', array('@access-control' => url('admin/user/access'), '@user-settings' => url('admin/user/settings'), '@user-role' => url('admin/user/roles'))) ."
\n"; } if (!empty($optional)) { $output .= "
\n$optional
\n"; } $output .= '

'. t('Links may be assigned a priority between 0.0 and 1.0. The default priority is 0.5. A priority of Not in site map excludes a link from the site map.') .'

'; - $output .= '

'. t('More information is available in the !XML Sitemap documentation.', array('!sitemaps.org' => l('sitemaps.org', 'http://www.sitemaps.org'), '!XML Sitemap documentation' => l('XML Sitemap documentation', 'http://drupal.org/handbook/modules/gsitemap'))) ."

\n"; + $output .= '

'. t('More information is available in the XML Sitemap documentation.', array('@link' => 'http://drupal.org/handbook/modules/gsitemap')) ."

\n"; break; default: $output = ''; @@ -109,7 +109,7 @@ for ($chunk = 0; $chunk < _xmlsitemap_link_count() / $chunk_size + count(_xmlsitemap_xml()); ++$chunk) { $items[] = array( 'path' => "sitemap$chunk.xml", - 'title' => t('Site map !number', array('!number' => $chunk)), + 'title' => t('Site map @number', array('@number' => $chunk)), 'callback' => '_xmlsitemap_output', 'callback arguments' => array($chunk), 'type' => MENU_CALLBACK, @@ -674,11 +674,11 @@ drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); $message = array_shift(module_invoke_all('xmlsitemap_engines', 'access')); if (!isset($message)) { - $message = '!sitemap downloaded by @user-agent at @address.'; + $message = '@sitemap downloaded by @user-agent at @address.'; } watchdog('xmlsitemap', t($message, array( - '!sitemap' => $type, + '@sitemap' => $type, '@user-agent' => $_SERVER['HTTP_USER_AGENT'], '@address' => $_SERVER['REMOTE_ADDR'], ) Index: xmlsitemap_engines/xmlsitemap_engines.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/xmlsitemap_engines.module,v retrieving revision 1.1.2.5.2.6 diff -u -r1.1.2.5.2.6 xmlsitemap_engines.module --- xmlsitemap_engines/xmlsitemap_engines.module 1 Dec 2008 14:00:06 -0000 1.1.2.5.2.6 +++ xmlsitemap_engines/xmlsitemap_engines.module 20 Dec 2008 12:08:38 -0000 @@ -78,7 +78,7 @@ } break; case 'access': - return '!sitemap downloaded by Google.'; + return '@sitemap downloaded by Google.'; } }