diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php b/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php
index 84ee847..6ab01af 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Form/TranslatableForm.php
@@ -132,7 +132,7 @@ public function submitForm(array &$form, array &$form_state) {
       array(
         'content_translation_translatable_switch', array(
           !$translatable,
-          $this->fieldInfo->entity_type,
+          $this->field['entity_type'],
           $this->fieldName,
         ),
       ),
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
index b26d5d9..129d46a 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
@@ -40,7 +40,7 @@ function setUp() {
       'create page content',
       'create url aliases',
       'edit any page content',
-      'translate any entity'
+      'translate any entity',
     );
     // Create and login user.
     $this->web_user = $this->drupalCreateUser($permissions);
@@ -57,7 +57,12 @@ function setUp() {
     $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
 
     // Enable translation for page node.
-    $edit = array('entity_types[node]' => 1, 'settings[node][page][translatable]' => 1, 'settings[node][page][fields][body]' => 1, 'settings[node][page][settings][language][language_show]' => 1);
+    $edit = array(
+      'entity_types[node]' => 1,
+      'settings[node][page][translatable]' => 1,
+      'settings[node][page][fields][body]' => 1,
+      'settings[node][page][settings][language][language_show]' => 1,
+    );
     $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save'));
 
   }