- Patch #517542 by David Strauss: renamed functions for clarity. We say 'yay' to clarity!

2 files changed, 3 insertions, 3 deletions

diff --git a/modules/locale/locale.install b/modules/locale/locale.install
index d33d25ba7..96b3b8c77 100644
--- a/modules/locale/locale.install
+++ b/modules/locale/locale.install
@@ -81,7 +81,7 @@ function locale_uninstall() {
   // Switch back to English: with a $language->language value different from 'en'
   // successive calls of t() might result in calling locale(), which in turn might
   // try to query the unexisting {locales_source} and {locales_target} tables.
-  drupal_init_language();
+  drupal_language_initialize();
 
   // Remove tables.
   drupal_uninstall_schema('locale');
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index f3cabe4c2..3eb7b30fb 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -934,7 +934,7 @@ class LocaleUninstallFunctionalTest extends DrupalWebTestCase {
     locale_add_language('fr', 'French', 'Français', LANGUAGE_LTR, '', '', TRUE, $this->ui_language == 'fr');
 
     // Check the UI language.
-    drupal_init_language();
+    drupal_language_initialize();
     global $language;
     $this->assertEqual($language->language, $this->ui_language, t('Current language: %lang', array('%lang' => $language->language)));
 
@@ -973,7 +973,7 @@ class LocaleUninstallFunctionalTest extends DrupalWebTestCase {
     $this->drupalGet('');
 
     // Check the init language logic.
-    drupal_init_language();
+    drupal_language_initialize();
     $this->assertEqual($language->language, 'en', t('Language after uninstall: %lang', array('%lang' => $language->language)));
 
     // Check JavaScript files deletion.