diff -u b/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php b/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php
--- b/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php
+++ b/core/modules/locale/lib/Drupal/locale/Controller/LocaleController.php
@@ -94,10 +94,9 @@
    * @see locale_menu()
    */
   public function translatePage() {
-    $state = $this->container->get('keyvalue')->get('state');
     return array(
-      'filter' => TranslateFilterForm::create($this->container),
-      'form' => TranslateEditForm::create($this->container),
+      'filter' => drupal_get_form(TranslateFilterForm::create($this->container)),
+      'form' => drupal_get_form(TranslateEditForm::create($this->container)),
     );
   }
 }
diff -u b/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php b/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
--- b/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
+++ b/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
@@ -19,7 +19,7 @@
 /**
  * Defines a translation edit form.
  */
-class TranslateEditForm extends TranslateFormBase implements FormInterface {
+class TranslateEditForm extends TranslateFormBase {
 
   /**
    * The state store.
@@ -276,7 +276,7 @@
     drupal_set_message($this->translator->translate('The strings have been saved.'));
 
     // Keep the user on the current pager page.
-    $page = $request->query->get('page');
+    $page = $this->request->query->get('page');
     if (isset($page)) {
       $form_state['redirect'] = array('admin/config/regional/translate', array('query' => array('page' => $page)));
     }