Issue #1512308 by August1914, Rob Loach, cosmicdreams: Replace...

Issue #1512308 by August1914, Rob Loach, cosmicdreams: Replace $language_content() with Dependency Injection.

core/includes/bootstrap.inc

@@ -2626,7 +2626,6 @@ function drupal_language_initialize() {
   //   Remove after these issues:
   //   - $language_interface: http://drupal.org/node/1510686
   //   - $language_url: http://drupal.org/node/1512310
-  //   - $language_content: http://drupal.org/node/1512308
   foreach ($types as $type) {
     $GLOBALS[$type] = $container->get($type);
   }

core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php

@@ -24,5 +24,8 @@ public function __construct() {
     // functions. This default is overridden by drupal_language_initialize()
     // during language negotiation.
     $this->register(LANGUAGE_TYPE_INTERFACE, 'Drupal\\Core\\Language\\Language');
+
+    // Register the default language content.
+    $this->register(LANGUAGE_TYPE_CONTENT, 'Drupal\\Core\\Language\\Language');
   }
 }

core/modules/comment/comment.module

@@ -1675,7 +1675,8 @@ function comment_forms() {
  * @ingroup forms
  */
 function comment_form($form, &$form_state, Comment $comment) {
-  global $user, $language_content;
+  global $user;
+  $language_content = drupal_container()->get(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

core/modules/field/field.multilingual.inc

@@ -247,8 +247,7 @@ function field_valid_language($langcode, $default = TRUE) {
   if (in_array($langcode, $enabled_languages)) {
     return $langcode;
   }
-  global $language_content;
-  return $default ? language_default()->langcode : $language_content->langcode;
+  return $default ? language_default()->langcode : drupal_container()->get(LANGUAGE_TYPE_CONTENT)->langcode;
 }
 
 /**

core/modules/node/node.module

@@ -2384,7 +2384,8 @@ function node_block_list_alter(&$blocks) {
  * @see node_menu()
  */
 function node_feed($nids = FALSE, $channel = array()) {
-  global $base_url, $language_content;
+  global $base_url;
+  $language_content = drupal_container()->get(LANGUAGE_TYPE_CONTENT);
 
   if ($nids === FALSE) {
     $nids = db_select('node', 'n')