by Dave Reid: Removed call to reset locale() and added proper parameters for locale_add_language().

xmlsitemap_i18n/xmlsitemap_i18n.test

@@ -16,15 +16,14 @@ class XMLSitemapI18nWebTestCase extends XMLSitemapTestHelper {
    * Set up an administrative user account and testing keys.
    */
   function setUp() {
-    // Call parent::setUp() allowing Mollom test cases to pass further modules.
+    // Call parent::setUp() allowing test cases to pass further modules.
     $modules = func_get_args();
     $modules = array_merge(array('locale', 'translation', 'i18n', 'xmlsitemap_i18n'), $modules);
     call_user_func_array(array('parent', 'setUp'), $modules);
 
     // Add predefined language and reset the locale cache.
-    require_once './includes/locale.inc';
-    locale_add_language('fr');
-    locale(NULL, NULL, TRUE);
+    require_once DRUPAL_ROOT . '/includes/locale.inc';
+    locale_add_language('fr', NULL, NULL, LANGUAGE_LTR, '', 'fr');
 
     variable_set('xmlsitemap_languages', array('en', 'fr'));
     variable_set('language_negotiation', LANGUAGE_NEGOTIATION_PATH);