diff --git a/core/modules/language/lib/Drupal/language/Form/LanguageAddForm.php b/core/modules/language/lib/Drupal/language/Form/LanguageAddForm.php
index 3798b7e..f6b2098 100644
--- a/core/modules/language/lib/Drupal/language/Form/LanguageAddForm.php
+++ b/core/modules/language/lib/Drupal/language/Form/LanguageAddForm.php
@@ -27,20 +27,23 @@ public function getFormID() {
    * {@inheritdoc}
    */
   public function form(array $form, array &$form_state) {
+    // @todo Remove this when https://drupal.org/node/1981644 is in.
+    drupal_set_title(t('Add language'));
+
     $this->moduleHandler->loadInclude('language', 'inc', 'language.admin');
     $predefined_languages = language_admin_predefined_list();
 
-    $predefined_languages['custom'] = $this->translator->translate('Custom language...');
+    $predefined_languages['custom'] = t('Custom language...');
     $predefined_default = !empty($form_state['values']['predefined_langcode']) ? $form_state['values']['predefined_langcode'] : key($predefined_languages);
     $form['predefined_langcode'] = array(
       '#type' => 'select',
-      '#title' => $this->translator->translate('Language name'),
+      '#title' => t('Language name'),
       '#default_value' => $predefined_default,
       '#options' => $predefined_languages,
     );
     $form['predefined_submit'] = array(
       '#type' => 'submit',
-      '#value' => $this->translator->translate('Add language'),
+      '#value' => t('Add language'),
       '#limit_validation_errors' => array(array('predefined_langcode'), array('predefined_submit')),
       '#states' => array(
         'invisible' => array(
@@ -59,10 +62,10 @@ public function form(array $form, array &$form_state) {
         ),
       ),
     );
-    parent::commonForm($form['custom_language']);
+    $this->commonForm($form['custom_language']);
     $form['custom_language']['submit'] = array(
       '#type' => 'submit',
-      '#value' => $this->translator->translate('Add custom language'),
+      '#value' => t('Add custom language'),
       '#validate' => array(array($this, 'validateCustom')),
       '#submit' => array(array($this, 'submitForm')),
     );
@@ -89,11 +92,11 @@ public function submitForm(array &$form, array &$form_state) {
     }
     // Save the language and inform the user that it happened.
     $language = language_save($language);
-    drupal_set_message($this->translator->translate('The language %language has been created and can now be used.', array('%language' => $language->name)));
+    drupal_set_message(t('The language %language has been created and can now be used.', array('%language' => $language->name)));
 
     // Tell the user they have the option to add a language switcher block
     // to their theme so they can switch between the languages.
-    drupal_set_message($this->translator->translate('Use one of the language switcher blocks to allow site visitors to switch between languages. You can enable these blocks on the <a href="@block-admin">block administration page</a>.', array('@block-admin' => url('admin/structure/block'))));
+    drupal_set_message(t('Use one of the language switcher blocks to allow site visitors to switch between languages. You can enable these blocks on the <a href="@block-admin">block administration page</a>.', array('@block-admin' => url('admin/structure/block'))));
     $form_state['redirect'] = 'admin/config/regional/language';
   }
 
@@ -112,14 +115,14 @@ public function validateCustom(array $form, array &$form_state) {
     if ($form_state['values']['predefined_langcode'] == 'custom') {
       $langcode = $form_state['values']['langcode'];
       // Reuse the editing form validation routine if we add a custom language.
-      parent::validateCommon($form['custom_language'], $form_state);
+      $this->validateCommon($form['custom_language'], $form_state);
 
       if ($language = language_load($langcode)) {
-        form_error($form['custom_language']['langcode'], $this->translator->translate('The language %language (%langcode) already exists.', array('%language' => $language->name, '%langcode' => $langcode)));
+        form_error($form['custom_language']['langcode'], t('The language %language (%langcode) already exists.', array('%language' => $language->name, '%langcode' => $langcode)));
       }
     }
     else {
-      form_error($form['predefined_langcode'], $this->translator->translate('Use the <em>Add language</em> button to save a predefined language.'));
+      form_error($form['predefined_langcode'], t('Use the <em>Add language</em> button to save a predefined language.'));
     }
   }
 
@@ -129,11 +132,11 @@ public function validateCustom(array $form, array &$form_state) {
   public function validatePredefined($form, &$form_state) {
     $langcode = $form_state['values']['predefined_langcode'];
     if ($langcode == 'custom') {
-      form_error($form['predefined_langcode'], $this->translator->translate('Fill in the language details and save the language with <em>Add custom language</em>.'));
+      form_error($form['predefined_langcode'], t('Fill in the language details and save the language with <em>Add custom language</em>.'));
     }
     else {
       if ($language = language_load($langcode)) {
-        form_error($form['predefined_langcode'], $this->translator->translate('The language %language (%langcode) already exists.', array('%language' => $language->name, '%langcode' => $langcode)));
+        form_error($form['predefined_langcode'], t('The language %language (%langcode) already exists.', array('%language' => $language->name, '%langcode' => $langcode)));
       }
     }
   }
diff --git a/core/modules/language/lib/Drupal/language/Form/LanguageEditForm.php b/core/modules/language/lib/Drupal/language/Form/LanguageEditForm.php
index 993ffe7..ad35e67 100644
--- a/core/modules/language/lib/Drupal/language/Form/LanguageEditForm.php
+++ b/core/modules/language/lib/Drupal/language/Form/LanguageEditForm.php
@@ -26,7 +26,7 @@ public function getFormID() {
    * {@inheritdoc}
    */
   public function form(array $form, array &$form_state) {
-    parent::commonForm($form);
+    $this->commonForm($form);
     return parent::form($form, $form_state);
   }
 
@@ -36,7 +36,7 @@ public function form(array $form, array &$form_state) {
   public function actions(array $form, array &$form_state) {
     $actions['submit'] = array(
       '#type' => 'submit',
-      '#value' => $this->translator->translate('Save language'),
+      '#value' => t('Save language'),
       '#validate' => array(array($this, 'validateCommon')),
       '#submit' => array(array($this, 'submitForm')),
     );
diff --git a/core/modules/language/lib/Drupal/language/Form/LanguageFormBase.php b/core/modules/language/lib/Drupal/language/Form/LanguageFormBase.php
index 2ebbbea..f34af3a 100644
--- a/core/modules/language/lib/Drupal/language/Form/LanguageFormBase.php
+++ b/core/modules/language/lib/Drupal/language/Form/LanguageFormBase.php
@@ -7,47 +7,13 @@
 
 namespace Drupal\language\Form;
 
-use Drupal\Core\Entity\EntityControllerInterface;
 use Drupal\Core\Entity\EntityFormController;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Language\Language;
 
 /**
  * Base form controller for language add and edit forms.
  */
-abstract class LanguageFormBase extends EntityFormController implements EntityControllerInterface {
-
-  /**
-   * The translator service.
-   *
-   * @var \Drupal\Core\StringTranslation\Translator\TranslatorInterface
-   */
-  protected $translator;
-
-  /**
-   * Constructs a base class for language add and edit forms.
-   *
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
-   * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translator
-   *   The translator service.
-   */
-  public function __construct(ModuleHandlerInterface $module_handler, TranslatorInterface $translator) {
-    parent::__construct($module_handler);
-    $this->translator = $translator;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) {
-    return new static(
-      $container->get('module_handler'),
-      $container->get('string_translation')
-    );
-  }
+abstract class LanguageFormBase extends EntityFormController {
 
   /**
    * Common elements of the language addition and editing form.
@@ -57,7 +23,7 @@ public function commonForm(array &$form) {
     if (isset($language->id)) {
       $form['langcode_view'] = array(
         '#type' => 'item',
-        '#title' => $this->translator->translate('Language code'),
+        '#title' => t('Language code'),
         '#markup' => $language->id
       );
       $form['langcode'] = array(
@@ -68,30 +34,30 @@ public function commonForm(array &$form) {
     else {
       $form['langcode'] = array(
         '#type' => 'textfield',
-        '#title' => $this->translator->translate('Language code'),
+        '#title' => t('Language code'),
         '#maxlength' => 12,
         '#required' => TRUE,
         '#default_value' => '',
         '#disabled' => FALSE,
-        '#description' => $this->translator->translate('Use language codes as <a href="@w3ctags">defined by the W3C</a> for interoperability. <em>Examples: "en", "en-gb" and "zh-hant".</em>', array('@w3ctags' => 'http://www.w3.org/International/articles/language-tags/')),
+        '#description' => t('Use language codes as <a href="@w3ctags">defined by the W3C</a> for interoperability. <em>Examples: "en", "en-gb" and "zh-hant".</em>', array('@w3ctags' => 'http://www.w3.org/International/articles/language-tags/')),
       );
     }
     $form['name'] = array(
       '#type' => 'textfield',
-      '#title' => $this->translator->translate('Language name in English'),
+      '#title' => t('Language name in English'),
       '#maxlength' => 64,
       '#default_value' => $language->label,
       '#required' => TRUE,
     );
     $form['direction'] = array(
       '#type' => 'radios',
-      '#title' => $this->translator->translate('Direction'),
+      '#title' => t('Direction'),
       '#required' => TRUE,
-      '#description' => $this->translator->translate('Direction that text in this language is presented.'),
+      '#description' => t('Direction that text in this language is presented.'),
       '#default_value' => $language->direction,
       '#options' => array(
-        Language::DIRECTION_LTR => $this->translator->translate('Left to right'),
-        Language::DIRECTION_RTL => $this->translator->translate('Right to left'),
+        Language::DIRECTION_LTR => t('Left to right'),
+        Language::DIRECTION_RTL => t('Right to left'),
       ),
     );
 
@@ -104,10 +70,10 @@ public function commonForm(array &$form) {
   public function validateCommon(array $form, array &$form_state) {
     // Ensure sane field values for langcode and name.
     if (!isset($form['langcode_view']) && preg_match('@[^a-zA-Z_-]@', $form_state['values']['langcode'])) {
-      form_error($form['langcode'], $this->translator->translate('%field may only contain characters a-z, underscores, or hyphens.', array('%field' => $form['langcode']['#title'])));
+      form_error($form['langcode'], t('%field may only contain characters a-z, underscores, or hyphens.', array('%field' => $form['langcode']['#title'])));
     }
     if ($form_state['values']['name'] != check_plain($form_state['values']['name'])) {
-      form_error($form['name'], $this->translator->translate('%field cannot contain any markup.', array('%field' => $form['name']['#title'])));
+      form_error($form['name'], t('%field cannot contain any markup.', array('%field' => $form['name']['#title'])));
     }
   }
 
diff --git a/core/modules/language/lib/Drupal/language/LanguageInterface.php b/core/modules/language/lib/Drupal/language/LanguageInterface.php
index 20ca26c..b2bfe26 100644
--- a/core/modules/language/lib/Drupal/language/LanguageInterface.php
+++ b/core/modules/language/lib/Drupal/language/LanguageInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\language\Entity\LanguageInterface.
+ * Contains \Drupal\language\LanguageInterface.
  */
 
 namespace Drupal\language;