Index: opensearch.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/opensearch/Attic/opensearch.pages.inc,v
retrieving revision 1.1.2.13
diff -u -p -r1.1.2.13 opensearch.pages.inc
--- opensearch.pages.inc	29 Dec 2009 01:42:54 -0000	1.1.2.13
+++ opensearch.pages.inc	29 Dec 2009 02:11:00 -0000
@@ -39,7 +39,7 @@ function opensearch_view($module) {
  * Menu callback; return an open search description feed.
  */
 function opensearch_description($module) {
-  global $base_path, $locale;
+  global $base_path;
 
   // Some modules do not provide search keywords in order to get a results page
   // so double check if the current request is a search result page.
@@ -50,7 +50,7 @@ function opensearch_description($module)
   extract(opensearch_get_description_defaults(), EXTR_SKIP);
 
   $search_type = check_plain(module_invoke($module, 'search', 'name'));
-  $site_name = check_plain(variable_get('site_name', 'drupal'));
+  $site_name = check_plain(variable_get('site_name', 'Drupal'));
   $opensearch_shortname = t($opensearch_shortname, array('@type' => $search_type));
   $opensearch_description = t($opensearch_description, array('@site' => $site_name, '@type' => $search_type));
   $opensearch_longname = t($opensearch_longname, array('@site' => $site_name, '@type' => $search_type));
@@ -80,15 +80,11 @@ DOC;
   }
   $output .= "\n  <AdultContent>$opensearch_adult_content</AdultContent>";
 
-  // Locales
-  if (module_exists('locale')) {
-    $locales = locale_language_list();
-  }
-  else {
-    $locales = array($locale => $locale);
-  }
-  foreach (array_keys($locales) as $language) {
-    $output .= "\n  <Language>$language</Language>";
+  $languages = language_list('enabled');
+  $languages = $languages[1];
+
+  foreach ($languages as $language) {
+    $output .= "\n  <Language>" . $language->language . '</Language>';
   }
 
   init_theme();