Commit 9a0367fa authored by Dries's avatar Dries

- Patch #1719488 by effulgentsia: Rename language_manager() to language() and related cleanup.

parent 49e12de3
......@@ -7,6 +7,7 @@
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Exception\RuntimeException as DependencyInjectionRuntimeException;
use Symfony\Component\HttpFoundation\Request;
use Drupal\Core\Language\Language;
......@@ -1457,7 +1458,7 @@ function t($string, array $args = array(), array $options = array()) {
// Merge in default.
if (empty($options['langcode'])) {
$options['langcode'] = language_manager(LANGUAGE_TYPE_INTERFACE)->langcode;
$options['langcode'] = language(LANGUAGE_TYPE_INTERFACE)->langcode;
}
if (empty($options['context'])) {
$options['context'] = '';
......@@ -2600,13 +2601,13 @@ function get_t() {
/**
* Initializes all the defined language types.
*
* @see language_manager()
* @see language()
*/
function drupal_language_initialize() {
if (language_multilingual()) {
$types = language_types_get_all();
foreach ($types as $type) {
language_manager($type);
language($type);
}
// Allow modules to react on language system initialization in multilingual
// environments.
......@@ -2615,56 +2616,61 @@ function drupal_language_initialize() {
}
/**
* Initializes the passed in language type.
* Returns the language object for a given language type.
*
* The 'language_manager' service is only available within the scope of a kernel
* request. When it's not available, we return a default language object,
* regardless of the type passed in.
*
* Note that this function is provided for legacy code that needs to get e.g.
* the interface language outside the scope of a request. Code that runs within
* the scope of a request should call
* drupal_container()->get('language_manager')->getLanguage($type)
* directly.
*
* @see Drupal\Core\Language\LanguageManager
*
* @param $type
* The type of language object needed, e.g. LANGUAGE_TYPE_INTERFACE. Passing
* NULL invokes a reset of the statically stored language type objects.
*/
function language_manager($type = NULL) {
// Keep track of whether we are in a multilingual environment.
static $multilingual = FALSE;
// Keep track of whether the language_manager service is available.
static $language_manager_service = FALSE;
if ($multilingual && $language_manager_service) {
if (!$type) {
drupal_container()->get('language_manager')->reset();
return;
}
return drupal_container()->get('language_manager')->getLanguage($type);
}
if (language_multilingual()) {
$multilingual = TRUE;
* The type of language object needed, e.g. LANGUAGE_TYPE_INTERFACE.
* @param $reset
* TRUE to reset the statically cached language object for the type, or for
* all types if $type is NULL.
*/
function language($type, $reset = FALSE) {
// We don't use drupal_static() here because resetting is not a simple case of
// drupal_static_reset().
static $languages = array();
// Reset the language manager's cache and our own.
if ($reset) {
if (drupal_container()->has('language_manager')) {
$language_manager_service = TRUE;
return drupal_container()->get('language_manager')->getLanguage($type);
drupal_container()->get('language_manager')->reset($type);
}
if (!isset($type)) {
$languages = array();
}
elseif (isset($languages[$type])) {
unset($languages[$type]);
}
}
// We can't use drupal_static() here because resetting is not a simple case of
// drupal_static_reset().
static $languages;
// If no type was passed in, reset the languages array.
if (!$type) {
$languages = array();
// If no type is passed (most likely when resetting all types), return.
if (!isset($type)) {
return;
}
// When the language_manager service exists (is both defined and the 'request'
// scope is active in the container), use it to get the language. Otherwise
// return the default language.
try {
$language_manager = drupal_container()->get('language_manager', Container::NULL_ON_INVALID_REFERENCE);
}
// If this is not a multilingual environment or we have not yet entered the
// request scope, just use the default language regardless of $type.
if (!isset($languages[$type])) {
$languages[$type] = language_default();
catch (DependencyInjectionRuntimeException $e) {
}
if (isset($language_manager)) {
return $language_manager->getLanguage($type);
}
else {
if (!isset($languages[$type])) {
$languages[$type] = language_default();
}
return $languages[$type];
}
return $languages[$type];
}
/**
......
......@@ -1599,7 +1599,7 @@ function filter_xss_bad_protocol($string, $decode = TRUE) {
* Arbitrary elements may be added using the $args associative array.
*/
function format_rss_channel($title, $link, $description, $items, $langcode = NULL, $args = array()) {
$langcode = $langcode ? $langcode : language_manager(LANGUAGE_TYPE_CONTENT)->langcode;
$langcode = $langcode ? $langcode : language(LANGUAGE_TYPE_CONTENT)->langcode;
$output = "<channel>\n";
$output .= ' <title>' . check_plain($title) . "</title>\n";
......@@ -1901,7 +1901,7 @@ function format_date($timestamp, $type = 'medium', $format = '', $timezone = NUL
}
if (empty($langcode)) {
$langcode = language_manager(LANGUAGE_TYPE_INTERFACE)->langcode;
$langcode = language(LANGUAGE_TYPE_INTERFACE)->langcode;
}
switch ($type) {
......@@ -2077,7 +2077,7 @@ function _format_date_callback(array $matches = NULL, $new_langcode = NULL) {
* - 'language': An optional language object. If the path being linked to is
* internal to the site, $options['language'] is used to look up the alias
* for the URL. If $options['language'] is omitted, the language will be
* obtained from language_manager(LANGUAGE_TYPE_URL).
* obtained from language(LANGUAGE_TYPE_URL).
* - 'https': Whether this URL should point to a secure location. If not
* defined, the current scheme is used, so the user stays on http or https
* respectively. TRUE enforces HTTPS and FALSE enforces HTTP, but HTTPS can
......@@ -2322,7 +2322,7 @@ function l($text, $path, array $options = array()) {
// Append active class.
if (($path == current_path() || ($path == '<front>' && drupal_is_front_page())) &&
(empty($options['language']) || $options['language']->langcode == language_manager(LANGUAGE_TYPE_URL)->langcode)) {
(empty($options['language']) || $options['language']->langcode == language(LANGUAGE_TYPE_URL)->langcode)) {
$options['attributes']['class'][] = 'active';
}
......@@ -6017,7 +6017,7 @@ function drupal_render_cid_parts($granularity = NULL) {
// part.
if (language_multilingual()) {
foreach (language_types_get_configurable() as $language_type) {
$cid_parts[] = language_manager($language_type)->langcode;
$cid_parts[] = language($language_type)->langcode;
}
}
......
......@@ -1069,7 +1069,7 @@ function menu_tree_output($tree) {
*/
function menu_tree_all_data($menu_name, $link = NULL, $max_depth = NULL) {
$tree = &drupal_static(__FUNCTION__, array());
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Use $mlid as a flag for whether the data being loaded is for the whole tree.
$mlid = isset($link['mlid']) ? $link['mlid'] : 0;
......@@ -1180,7 +1180,7 @@ function menu_tree_get_path($menu_name) {
function menu_tree_page_data($menu_name, $max_depth = NULL, $only_active_trail = FALSE) {
$tree = &drupal_static(__FUNCTION__, array());
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Check if the active trail has been overridden for this menu tree.
$active_path = menu_tree_get_path($menu_name);
......@@ -1336,7 +1336,7 @@ function menu_build_tree($menu_name, array $parameters = array()) {
function _menu_build_tree($menu_name, array $parameters = array()) {
// Static cache of already built menu trees.
$trees = &drupal_static(__FUNCTION__, array());
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Build the cache id; sort parents to prevent duplicate storage and remove
// default parameter values.
......
......@@ -82,7 +82,7 @@ function drupal_lookup_path($action, $path = '', $langcode = NULL) {
// language. If we used a language different from the one conveyed by the
// requested URL, we might end up being unable to check if there is a path
// alias matching the URL path.
$langcode = $langcode ? $langcode : language_manager(LANGUAGE_TYPE_URL)->langcode;
$langcode = $langcode ? $langcode : language(LANGUAGE_TYPE_URL)->langcode;
if ($action == 'wipe') {
$cache = array();
......
......@@ -1627,7 +1627,7 @@ function theme_link($variables) {
* http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
*/
function theme_links($variables) {
$language_url = language_manager(LANGUAGE_TYPE_URL);
$language_url = language(LANGUAGE_TYPE_URL);
$links = $variables['links'];
$attributes = $variables['attributes'];
......@@ -2398,7 +2398,7 @@ function _template_preprocess_default_variables() {
* @see html.tpl.php
*/
function template_preprocess_html(&$variables) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Compile a list of classes that are going to be applied to the body element.
// This allows advanced theming based on context (home page, node of certain type, etc.).
......@@ -2530,7 +2530,7 @@ function template_preprocess_html(&$variables) {
* @see page.tpl.php
*/
function template_preprocess_page(&$variables) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$site_config = config('system.site');
// Move some variables to the top level for themer convenience and template cleanliness.
......@@ -2711,7 +2711,7 @@ function theme_get_suggestions($args, $base, $delimiter = '__') {
*/
function template_preprocess_maintenance_page(&$variables) {
global $theme;
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Retrieve the theme data to list all available regions.
$theme_data = list_themes();
$regions = $theme_data[$theme]->info['regions'];
......
......@@ -33,7 +33,7 @@ public function onRespond(FilterResponseEvent $event) {
// @todo Receive the LanguageManager object as a constructor argument when
// the dependency injection container allows for it performantly:
// http://drupal.org/node/1706064.
$response->headers->set('Content-language', language_manager(LANGUAGE_TYPE_INTERFACE)->langcode);
$response->headers->set('Content-language', language(LANGUAGE_TYPE_INTERFACE)->langcode);
// Because pages are highly dynamic, set the last-modified time to now
// since the page is in fact being regenerated right now.
......
......@@ -14,8 +14,8 @@
*
* This service is dependent on the 'request' service and can therefore pass the
* Request object to the code that deals with each particular language type.
* This means the Request can be used directly for things like url-based language
* negotiation.
* This means the Request can be used directly for things like url-based
* language negotiation.
*/
class LanguageManager {
......@@ -32,12 +32,22 @@ public function getLanguage($type) {
}
// @todo Objectify the language system so that we don't have to do this.
include_once DRUPAL_ROOT . '/core/includes/language.inc';
$this->languages[$type] = language_types_initialize($type, $this->request);
if (language_multilingual()) {
include_once DRUPAL_ROOT . '/core/includes/language.inc';
$this->languages[$type] = language_types_initialize($type, $this->request);
}
else {
$this->languages[$type] = language_default();
}
return $this->languages[$type];
}
function reset() {
$this->languages = array();
public function reset($type = NULL) {
if (!isset($type)) {
$this->languages = array();
}
elseif (isset($this->languages[$type])) {
unset($this->languages[$type]);
}
}
}
......@@ -329,7 +329,7 @@ function hook_block_view_MODULE_DELTA_alter(&$data, $block) {
*/
function hook_block_list_alter(&$blocks) {
global $theme_key;
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// This example shows how to achieve language specific visibility setting for
// blocks.
......
......@@ -880,7 +880,7 @@ function block_block_list_alter(&$blocks) {
continue;
}
foreach ($block_langcodes[$block->module][$block->delta] as $language_type => $langcodes) {
if (isset($langcodes[language_manager($language_type)->langcode])) {
if (isset($langcodes[language($language_type)->langcode])) {
// Found a language type - langcode combination in the configuration
// that is applicable to the current request.
continue 2;
......
......@@ -1224,7 +1224,7 @@ function book_toc($bid, $depth_limit, $exclude = array()) {
*/
function template_preprocess_book_export_html(&$variables) {
global $base_url;
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$variables['title'] = check_plain($variables['title']);
$variables['base_url'] = $base_url;
......
......@@ -959,7 +959,7 @@ function comment_prepare_thread(&$comments) {
*/
function comment_view(Comment $comment, Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
$langcode = language_manager(LANGUAGE_TYPE_CONTENT)->langcode;
$langcode = language(LANGUAGE_TYPE_CONTENT)->langcode;
}
// Populate $comment->content with a render() array.
......@@ -1025,7 +1025,7 @@ function comment_view(Comment $comment, Node $node, $view_mode = 'full', $langco
*/
function comment_build_content(Comment $comment, Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
$langcode = language_manager(LANGUAGE_TYPE_CONTENT)->langcode;
$langcode = language(LANGUAGE_TYPE_CONTENT)->langcode;
}
// Remove previously built content, if exists.
......@@ -1683,7 +1683,7 @@ function comment_forms() {
*/
function comment_form($form, &$form_state, Comment $comment) {
global $user;
$language_content = language_manager(LANGUAGE_TYPE_CONTENT);
$language_content = language(LANGUAGE_TYPE_CONTENT);
// During initial form build, add the comment entity to the form state for
// use during form building and processing. During a rebuild, use what is in
......
......@@ -23,7 +23,7 @@ public static function getInfo() {
* Creates a comment, then tests the tokens generated from it.
*/
function testCommentTokenReplacement() {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$url_options = array(
'absolute' => TRUE,
'language' => $language_interface,
......
......@@ -150,7 +150,7 @@ function contact_site_form_validate($form, &$form_state) {
*/
function contact_site_form_submit($form, &$form_state) {
global $user;
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$values = $form_state['values'];
$values['sender'] = $user;
......@@ -292,7 +292,7 @@ function contact_personal_form($form, &$form_state, $recipient) {
*/
function contact_personal_form_submit($form, &$form_state) {
global $user;
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$values = $form_state['values'];
$values['sender'] = $user;
......
......@@ -48,7 +48,7 @@ function entity_modules_disabled() {
* @see hook_entity_info_alter()
*/
function entity_get_info($entity_type = NULL) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Use the advanced drupal_static() pattern, since this is called very often.
static $drupal_static_fast;
......
......@@ -67,7 +67,7 @@ function field_info_cache_clear() {
* @see _field_info_collate_types_reset()
*/
function _field_info_collate_types() {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Use the advanced drupal_static() pattern, since this is called very often.
static $drupal_static_fast;
......
......@@ -258,7 +258,7 @@ function field_valid_language($langcode, $default = TRUE) {
if (in_array($langcode, $languages)) {
return $langcode;
}
return $default ? language_default()->langcode : language_manager(LANGUAGE_TYPE_CONTENT)->langcode;
return $default ? language_default()->langcode : language(LANGUAGE_TYPE_CONTENT)->langcode;
}
/**
......
......@@ -23,7 +23,7 @@ public static function getInfo() {
* Creates a file, then tests the tokens generated from it.
*/
function testFileTokenReplacement() {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$url_options = array(
'absolute' => TRUE,
'language' => $language_interface,
......
......@@ -399,7 +399,7 @@ function filter_modules_disabled($modules) {
* @see filter_formats_reset()
*/
function filter_formats($account = NULL) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$formats = &drupal_static(__FUNCTION__, array());
// All available formats are cached for performance.
......
......@@ -965,7 +965,7 @@ function image_style_path($style_name, $uri) {
* @see image_effect_definition_load()
*/
function image_effect_definitions() {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// hook_image_effect_info() includes translated strings, so each language is
// cached separately.
......
......@@ -243,7 +243,7 @@ function language_delete($langcode) {
* and checks to see if a related right to left CSS file should be included.
*/
function language_css_alter(&$css) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// If the current language is RTL, add the CSS file with the RTL overrides.
if ($language_interface->direction == LANGUAGE_RTL) {
......
......@@ -52,7 +52,7 @@
* The current interface language code.
*/
function language_from_interface() {
return language_manager(LANGUAGE_TYPE_INTERFACE)->langcode;
return language(LANGUAGE_TYPE_INTERFACE)->langcode;
}
/**
......@@ -304,7 +304,7 @@ function language_url_fallback($language = NULL, $request = NULL, $language_type
return $default->langcode;
}
else {
$langcode = language_manager($language_type)->langcode;
$langcode = language($language_type)->langcode;
return $langcode;
}
}
......@@ -335,7 +335,7 @@ function language_switcher_url($type, $path) {
*/
function language_switcher_session($type, $path) {
$param = variable_get('language_negotiation_session_param', 'language');
$language_query = isset($_SESSION[$param]) ? $_SESSION[$param] : language_manager($type)->langcode;
$language_query = isset($_SESSION[$param]) ? $_SESSION[$param] : language($type)->langcode;
$languages = language_list();
$links = array();
......@@ -378,7 +378,7 @@ function language_url_rewrite_url(&$path, &$options) {
// Language can be passed as an option, or we go for current URL language.
if (!isset($options['language'])) {
$language_url = language_manager(LANGUAGE_TYPE_URL);
$language_url = language(LANGUAGE_TYPE_URL);
$options['language'] = $language_url;
}
// We allow only enabled languages here.
......
......@@ -27,7 +27,7 @@ function setUp() {
parent::setUp('language');
// Ensure we are building a new Language object for each test.
language_manager();
language(NULL, TRUE);
}
......@@ -41,7 +41,7 @@ function testDependencyInjectedNewLanguage() {
drupal_language_initialize();
$expected = language_default();
$result = language_manager(LANGUAGE_TYPE_INTERFACE);
$result = language(LANGUAGE_TYPE_INTERFACE);
foreach ($expected as $property => $value) {
$this->assertEqual($expected->$property, $result->$property, t('The dependency injected language object %prop property equals the new Language object %prop property.', array('%prop' => $property)));
}
......@@ -71,7 +71,7 @@ function testDependencyInjectedNewDefaultLanguage() {
// The langauge system creates a Language object which contains the
// same properties as the new default language object.
$expected = new Language($new_language_default);
$result = language_manager(LANGUAGE_TYPE_INTERFACE);
$result = language(LANGUAGE_TYPE_INTERFACE);
foreach ($expected as $property => $value) {
$this->assertEqual($expected->$property, $result->$property, t('The dependency injected language object %prop property equals the default language object %prop property.', array('%prop' => $property)));
}
......
......@@ -22,8 +22,8 @@ function language_test_boot() {
*/
function language_test_init() {
language_test_store_language_negotiation();
if (isset(language_manager(LANGUAGE_TYPE_INTERFACE)->langcode) && isset(language_manager(LANGUAGE_TYPE_INTERFACE)->method_id)) {
drupal_set_message(t('Language negotiation method: @name', array('@name' => language_manager(LANGUAGE_TYPE_INTERFACE)->method_id)));
if (isset(language(LANGUAGE_TYPE_INTERFACE)->langcode) && isset(language(LANGUAGE_TYPE_INTERFACE)->method_id)) {
drupal_set_message(t('Language negotiation method: @name', array('@name' => language(LANGUAGE_TYPE_INTERFACE)->method_id)));
}
}
......@@ -95,7 +95,7 @@ function language_test_language_negotiation_info_alter(array &$negotiation_info)
function language_test_store_language_negotiation() {
$last = array();
foreach (language_types_get_all() as $type) {
$last[$type] = language_manager($type)->langcode;
$last[$type] = language($type)->langcode;
}
variable_set('language_test_language_negotiation_last', $last);
}
......
......@@ -46,12 +46,11 @@ function testUninstallProcess() {
'default' => $this->langcode == 'fr',
);
language_save($language);
// Reset the language_manager so that the language interface object gets
// freshly initialized.
language_manager();
// Reset statically cached language objects.
language(NULL, TRUE);
// Check the UI language.
drupal_language_initialize();
$this->assertEqual(language_manager(LANGUAGE_TYPE_INTERFACE)->langcode, $this->langcode, t('Current language: %lang', array('%lang' => language_manager(LANGUAGE_TYPE_INTERFACE)->langcode)));
$this->assertEqual(language(LANGUAGE_TYPE_INTERFACE)->langcode, $this->langcode, t('Current language: %lang', array('%lang' => language(LANGUAGE_TYPE_INTERFACE)->langcode)));
// Enable multilingual workflow option for articles.
variable_set('node_type_language_hidden_article',FALSE);
......@@ -93,12 +92,11 @@ function testUninstallProcess() {
// Visit the front page.
$this->drupalGet('');
// Reset the language_manager so that the language interface object gets
// freshly initialized.
language_manager();
// Reset statically cached language objects.
language(NULL, TRUE);
// Check the init language logic.
drupal_language_initialize();
$this->assertEqual(language_manager(LANGUAGE_TYPE_INTERFACE)->langcode, 'en', t('Language after uninstall: %lang', array('%lang' => language_manager(LANGUAGE_TYPE_INTERFACE)->langcode)));
$this->assertEqual(language(LANGUAGE_TYPE_INTERFACE)->langcode, 'en', t('Language after uninstall: %lang', array('%lang' => language(LANGUAGE_TYPE_INTERFACE)->langcode)));
// Check JavaScript files deletion.
$this->assertTrue($result = !file_exists($js_file), t('JavaScript file deleted: %file', array('%file' => $result ? $js_file : t('found'))));
......
......@@ -232,7 +232,7 @@ function locale_language_delete($language) {
* Language code to use for the lookup.
*/
function locale($string = NULL, $context = NULL, $langcode = NULL) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Use the advanced drupal_static() pattern, since this is called very often.
static $drupal_static_fast;
......@@ -280,7 +280,7 @@ function locale_reset() {
* plural formula.
*/
function locale_get_plural($count, $langcode = NULL) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Used to locally cache the plural formulas for all languages.
$plural_formulas = &drupal_static(__FUNCTION__, array());
......@@ -366,7 +366,7 @@ function locale_system_update($components) {
* file if necessary, and adds it to the page.
*/
function locale_js_alter(&$javascript) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$dir = 'public://' . variable_get('locale_js_directory', 'languages');
$parsed = variable_get('javascript_parsed', array());
......@@ -426,7 +426,7 @@ function locale_js_alter(&$javascript) {
*/
function locale_library_info_alter(&$libraries, $module) {
if ($module == 'system' && isset($libraries['jquery.ui.datepicker'])) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// locale.datepicker.js should be added in the JS_LIBRARY group, so that
// this attach behavior will execute early. JS_LIBRARY is the default for
// hook_library_info_alter(), thus does not have to be specified explicitly.
......@@ -572,7 +572,7 @@ function locale_form_system_file_system_settings_alter(&$form, $form_state) {
*/
function locale_preprocess_node(&$variables) {
if ($variables['langcode'] != LANGUAGE_NOT_SPECIFIED) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$node_language = language_load($variables['langcode']);
if ($node_language->langcode != $language_interface->langcode) {
......@@ -771,7 +771,7 @@ function _locale_invalidate_js($langcode = NULL) {
*/
function _locale_rebuild_js($langcode = NULL) {
if (!isset($langcode)) {
$language = language_manager(LANGUAGE_TYPE_INTERFACE);
$language = language(LANGUAGE_TYPE_INTERFACE);
}
else {
// Get information about the locale.
......
......@@ -103,7 +103,7 @@ function locale_translate_filters() {
}
// Pick the current interface language code for the filter.
$default_langcode = language_manager(LANGUAGE_TYPE_INTERFACE)->langcode;
$default_langcode = language(LANGUAGE_TYPE_INTERFACE)->langcode;
if (!isset($language_options[$default_langcode])) {
$available_langcodes = array_keys($language_options);
$default_langcode = array_shift($available_langcodes);
......
......@@ -23,7 +23,7 @@ public static function getInfo() {
* Creates a node, then tests the tokens generated from it.
*/
function testNodeTokenReplacement() {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$url_options = array(
'absolute' => TRUE,
'language' => $language_interface,
......
......@@ -673,7 +673,7 @@ function node_field_extra_fields() {
function node_type_get_default_langcode($node_type) {
$default_value = variable_get('node_type_language_default_' . $node_type, 'site_default');
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
if ($default_value == LANGUAGE_NOT_SPECIFIED) {
return LANGUAGE_NOT_SPECIFIED;
......@@ -763,7 +763,7 @@ function node_type_update_nodes($old_type, $type) {
* type object by $type->disabled being set to TRUE.
*/
function _node_types_build($rebuild = FALSE) {
$cid = 'node_types:' . language_manager(LANGUAGE_TYPE_INTERFACE)->langcode;
$cid = 'node_types:' . language(LANGUAGE_TYPE_INTERFACE)->langcode;
if (!$rebuild) {
$_node_types = &drupal_static(__FUNCTION__);
......@@ -1206,7 +1206,7 @@ function node_revision_delete($revision_id) {
*/
function node_view(Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
$langcode = language_manager(LANGUAGE_TYPE_CONTENT)->langcode;
$langcode = language(LANGUAGE_TYPE_CONTENT)->langcode;
}
// Populate $node->content with a render() array.
......@@ -1267,7 +1267,7 @@ function node_view(Node $node, $view_mode = 'full', $langcode = NULL) {
*/
function node_build_content(Node $node, $view_mode = 'full', $langcode = NULL) {
if (!isset($langcode)) {
$langcode = language_manager(LANGUAGE_TYPE_CONTENT)->langcode;
$langcode = language(LANGUAGE_TYPE_CONTENT)->langcode;
}
// Remove previously built content, if exists.
......@@ -2470,7 +2470,7 @@ function node_block_list_alter(&$blocks) {
*/
function node_feed($nids = FALSE, $channel = array()) {
global $base_url;
$language_content = language_manager(LANGUAGE_TYPE_CONTENT);
$language_content = language(LANGUAGE_TYPE_CONTENT);
$rss_config = config('system.rss');
if ($nids === FALSE) {
......
......@@ -83,7 +83,7 @@ function openid_redirect_http($url, $message) {
* Creates a js auto-submit redirect for (for the 2.x protocol)
*/
function openid_redirect($url, $message) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
$output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . "\n";
$output .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . $language_interface->langcode . '" lang="' . $language_interface->langcode . '">' . "\n";
......
......@@ -23,7 +23,7 @@ public static function getInfo() {
* Creates a poll, then tests the tokens generated from it.
*/
function testPollTokenReplacement() {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);
$language_interface = language(LANGUAGE_TYPE_INTERFACE);
// Craete a poll with three choices.
$title = $this->randomName();
......
......@@ -104,7 +104,7 @@ function template_preprocess_search_results(&$variables) {
* @see search-result.tpl.php
*/
function template_preprocess_search_result(&$variables) {
$language_interface = language_manager(LANGUAGE_TYPE_INTERFACE);