diff --git a/includes/cache.inc b/includes/cache.inc
index 2bb6493ef2e68f54e50040048bda8270f92263b6..d4ec484f5326d09c543f827d189e4d6fa0720a9a 100644
--- a/includes/cache.inc
+++ b/includes/cache.inc
@@ -132,7 +132,7 @@ function views_cache_set($cid, $data, $use_language = FALSE) {
     return;
   }
   if ($use_language) {
-    $cid .= ':' . language_manager(LANGUAGE_TYPE_INTERFACE)->langcode;
+    $cid .= ':' . language(LANGUAGE_TYPE_INTERFACE)->langcode;
   }
 
   cache('cache_views')->set($cid, $data);
@@ -156,7 +156,7 @@ function views_cache_get($cid, $use_language = FALSE) {
     return FALSE;
   }
   if ($use_language) {
-    $cid .= ':' . language_manager(LANGUAGE_TYPE_INTERFACE)->langcode;
+    $cid .= ':' . language(LANGUAGE_TYPE_INTERFACE)->langcode;
   }
 
   return cache('cache_views')->get($cid);
diff --git a/plugins/views_plugin_cache.inc b/plugins/views_plugin_cache.inc
index 01c4fec215e8e241efcce07430e7ee48354e3683..b176d802831465b1eafc09efdad43511d3d00b1d 100644
--- a/plugins/views_plugin_cache.inc
+++ b/plugins/views_plugin_cache.inc
@@ -283,7 +283,7 @@ function get_results_key() {
         'build_info' => $build_info,
         'roles' => array_keys($user->roles),
         'super-user' => $user->uid == 1, // special caching for super user.
-        'language' => language_manager(LANGUAGE_TYPE_INTERFACE)->langcode,
+        'language' => language(LANGUAGE_TYPE_INTERFACE)->langcode,
         'base_url' => $GLOBALS['base_url'],
       );
       foreach (array('exposed_info', 'page', 'sort', 'order', 'items_per_page', 'offset') as $key) {
@@ -306,7 +306,7 @@ function get_output_key() {
         'roles' => array_keys($user->roles),
         'super-user' => $user->uid == 1, // special caching for super user.
         'theme' => $GLOBALS['theme'],
-        'language' => language_manager(LANGUAGE_TYPE_INTERFACE)->langcode,
+        'language' => language(LANGUAGE_TYPE_INTERFACE)->langcode,
         'base_url' => $GLOBALS['base_url'],
       );
 
diff --git a/plugins/views_plugin_localization_core.inc b/plugins/views_plugin_localization_core.inc
index 73bddd31f54888cc2881fa9ad05ea17d3c4b20d5..7db435319ee6a9b7941b4f744a8d5e0100c0b203 100644
--- a/plugins/views_plugin_localization_core.inc
+++ b/plugins/views_plugin_localization_core.inc
@@ -39,7 +39,7 @@ function translate_string($string, $keys = array(), $format = '') {
    *   The input format of the string. This is optional.
    */
   function save_string($string, $keys = array(), $format = '') {
-    $language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
+    $language_interface = language(LANGUAGE_TYPE_INTERFACE);
 
     // If the current language is 'en', we need to reset the language
     // in order to trigger an update.
diff --git a/theme/theme.inc b/theme/theme.inc
index 8c9a62f12358b5136380444461ed56202e9026d2..e781683fb0ff5903e1ff34fb0cc8896a8baf56b9 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -886,7 +886,7 @@ function template_preprocess_views_view_rss(&$vars) {
     $vars['link'] = check_url(url($path, $url_options));
   }
 
-  $vars['langcode'] = check_plain(language_manager(LANGUAGE_TYPE_INTERFACE)->langcode);
+  $vars['langcode'] = check_plain(language(LANGUAGE_TYPE_INTERFACE)->langcode);
   $vars['namespaces'] = drupal_attributes($style->namespaces);
   $vars['items'] = $items;
   $vars['channel_elements'] = format_xml_elements($style->channel_elements);
diff --git a/views.api.php b/views.api.php
index 5319cd6fc7a9d65c7996275d01d9a1a331d9bf15..567b8ebcf82beb5603ebc656eb3819479d45f5fd 100644
--- a/views.api.php
+++ b/views.api.php
@@ -790,7 +790,7 @@ function hook_views_query_substitutions($view) {
   return array(
     '***CURRENT_VERSION***' => VERSION,
     '***CURRENT_TIME***' => REQUEST_TIME,
-    '***CURRENT_LANGUAGE***' => language_manager(LANGUAGE_TYPE_CONTENT)->langcode,
+    '***CURRENT_LANGUAGE***' => language(LANGUAGE_TYPE_CONTENT)->langcode,
     '***DEFAULT_LANGUAGE***' => language_default()->langcode,
   );
 }
diff --git a/views.module b/views.module
index 171c3821c68849c2b095cda8a87f3f7ee06f541c..52fde865d31392da37c006e9422f23e6e2e72272 100644
--- a/views.module
+++ b/views.module
@@ -2115,7 +2115,7 @@ function views_views_query_substitutions($view) {
   return array(
     '***CURRENT_VERSION***' => VERSION,
     '***CURRENT_TIME***' => REQUEST_TIME,
-    '***CURRENT_LANGUAGE***' => language_manager(LANGUAGE_TYPE_CONTENT)->langcode,
+    '***CURRENT_LANGUAGE***' => language(LANGUAGE_TYPE_CONTENT)->langcode,
     '***DEFAULT_LANGUAGE***' => language_default()->langcode,
   );
 }