Index: site_map.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/site_map/site_map.admin.inc,v
retrieving revision 1.1.2.7
diff -u -r1.1.2.7 site_map.admin.inc
--- site_map.admin.inc	29 Jun 2009 19:12:54 -0000	1.1.2.7
+++ site_map.admin.inc	17 Sep 2009 18:33:46 -0000
@@ -12,36 +12,15 @@
  */
 function site_map_admin_settings() {
 
-  if (module_exists('locale')) {
-    $langs = locale_language_list();
-  }
-  // Field to set site map message. Nifty language support from the catcha module, thanks.
-  if ($langs) {
-    $form['site_map_message'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Site map message'),
-      '#description' => t('Define a message to be displayed above the site map.'),
-    );
-    foreach ($langs as $lang_code => $lang_name) {
-      $form['site_map_message']["site_map_message_$lang_code"] = array(
-        '#type' => 'textarea',
-        '#title' => t('For language %lang_name (code %lang_code)', array('%lang_name' => $lang_name, '%lang_code' => $lang_code)),
-        '#default_value' => _sitemap_get_message($lang_code),
-        '#cols' => 60,
-        '#rows' => 5,
-      );
-    }
-  }
-  else {
-    $form['site_map_message'] = array(
-      '#type' => 'textarea',
-      '#title' => t('Site map message'),
-      '#default_value' => _sitemap_get_message(),
-      '#cols' => 60,
-      '#rows' => 5,
-      '#description' => t('Define a message to be displayed above the site map.'),
-    );
-  }
+  // Field to set site map message.
+  $form['site_map_message'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Site map message'),
+    '#default_value' => variable_get('site_map_message', ''),
+    '#cols' => 60,
+    '#rows' => 5,
+    '#description' => t('Define a message to be displayed above the site map.'),
+  );
 
   $form['site_map_content'] = array(
     '#type' => 'fieldset',
@@ -83,28 +62,14 @@
   $menu_options = array();
   $menu_options = menu_get_menus();
 
-  if ($langs) {
-    foreach ($langs as $lang_code => $lang_name) {
-      $form['site_map_content']["site_map_show_menus_$lang_code"] = array(
-        '#type' => 'select',
-        '#title' => t('Menus to include in the site map for !lang (code !code)', array('!lang' => $lang_name, '!code' => $lang_code)),
-        '#default_value' => variable_get("site_map_show_menus_$lang_code", array()),
-        '#options' => $menu_options,
-        '#multiple' => TRUE,
-        '#description' => t('Ctrl-click (Windows) or Command-click (Mac) to select more than one value.'),
-      );
-    }
-  }
-  else {
-    $form['site_map_content']['site_map_show_menus'] = array(
-      '#type' => 'select',
-      '#title' => t('Menus to include in the site map'),
-      '#default_value' => variable_get('site_map_show_menus', array()),
-      '#options' => $menu_options,
-      '#multiple' => TRUE,
-      '#description' => t('Ctrl-click (Windows) or Command-click (Mac) to select more than one value.'),
-    );
-  }
+  $form['site_map_content']['site_map_show_menus'] = array(
+    '#type' => 'select',
+    '#title' => t('Menus to include in the site map'),
+    '#default_value' => variable_get('site_map_show_menus', array()),
+    '#options' => $menu_options,
+    '#multiple' => TRUE,
+    '#description' => t('Ctrl-click (Windows) or Command-click (Mac) to select more than one value.'),
+  );
   $form['site_map_content']['site_map_show_faq'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show FAQ content'),
Index: site_map.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/site_map/site_map.install,v
retrieving revision 1.3.2.3
diff -u -r1.3.2.3 site_map.install
--- site_map.install	29 Jun 2009 19:12:54 -0000	1.3.2.3
+++ site_map.install	17 Sep 2009 18:33:46 -0000
@@ -20,11 +20,16 @@
   variable_del('site_map_css');
   variable_del('site_map_term_threshold');
   variable_del('site_map_forum_threshold');
+}
+
+/**
+ * Delete no longer used variables.
+ */
+function site_map_update_6000() {
+  $ret = array();
+
+  $ret[] = update_sql("DELETE FROM {variable} WHERE name LIKE 'site_map_message_%'");
+  $ret[] = update_sql("DELETE FROM {variable} WHERE name LIKE 'site_map_show_menus_%'");
 
-  if (function_exists('locale')) {
-    $langs = locale_language_list();
-    foreach ($langs as $lang_code => $lang_name) {
-      variable_del("site_map_message_$lang_code");
-    }
-  }
+  return $ret;
 }
Index: site_map.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/site_map/site_map.module,v
retrieving revision 1.39.2.17
diff -u -r1.39.2.17 site_map.module
--- site_map.module	21 Aug 2009 06:58:49 -0000	1.39.2.17
+++ site_map.module	17 Sep 2009 18:33:46 -0000
@@ -13,7 +13,7 @@
 function site_map_help($path, $arg) {
   switch ($path) {
     case 'sitemap':
-      $output = _sitemap_get_message();
+      $output = variable_get('site_map_message', '');
       return $output ? '<p>'. $output .'</p>' : '';
   }
 }
@@ -347,14 +347,7 @@
  * Render menus
  */
 function _site_map_menus() {
-  global $language;
-
-  if (module_exists('locale')) {
-    $mids = variable_get('site_map_show_menus_'. $language->language, array());
-  }
-  else {
-    $mids = variable_get('site_map_show_menus', array());
-  }
+  $mids = variable_get('site_map_show_menus', array());
 
   $output = '';
   if ($mids) {
@@ -515,22 +508,3 @@
 
   return $output;
 }
-
-/**
- * Get the message which appears above the site map.
- * If the locale module is enabled, an optional language code can be given
- */
-function _sitemap_get_message($lang_code = NULL) {
-  if (module_exists('locale')) {
-    if ($lang_code == NULL) {
-      global $language;
-      $lang_code = $language->language;
-    }
-    $message = variable_get("site_map_message_$lang_code", '');
-  }
-  else {
-    $message = variable_get('site_map_message', '');
-  }
-
-  return $message;
-}