diff -u b/core/modules/locale/lib/Drupal/locale/Form/ImportForm.php b/core/modules/locale/lib/Drupal/locale/Form/ImportForm.php --- b/core/modules/locale/lib/Drupal/locale/Form/ImportForm.php +++ b/core/modules/locale/lib/Drupal/locale/Form/ImportForm.php @@ -7,11 +7,11 @@ namespace Drupal\locale\Form; -use Drupal\file\FileInterface; use Drupal\Core\Form\FormBase; use Drupal\Core\Language\Language; use Drupal\Core\DependencyInjection\ContainerInjectionInterface; use Drupal\Core\Extension\ModuleHandlerInterface; +use Drupal\Core\Language\LanguageManager; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -27,11 +27,19 @@ protected $moduleHandler; /** + * The language manager. + * + * @var \Drupal\Core\Language\LanguageManager + */ + protected $languageManager; + + /** * {@inheritdoc} */ public static function create(ContainerInterface $container) { return new static( - $container->get('module_handler') + $container->get('module_handler'), + $container->get('language_manager') ); } /** @@ -39,15 +47,16 @@ * * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler */ - public function __construct(ModuleHandlerInterface $module_handler) { + public function __construct(ModuleHandlerInterface $module_handler, LanguageManager $language_manager) { $this->moduleHandler = $module_handler; + $this->languageManager = $language_manager; } /** * {@inheritdoc} */ public function getFormID() { - return 'locale_translate_import'; + return 'locale_translate_import_form'; } /** @@ -56,8 +65,8 @@ * @ingroup forms */ public function buildForm(array $form, array &$form_state) { - \Drupal::languageManager()->reset(); - $languages = language_list(); + $this->languageManager->reset(); + $languages = $this->languageManager->getLanguages(); // Initialize a language list to the ones available, including English if we // are to translate Drupal to English as well. @@ -92,7 +101,7 @@ '#type' => 'file', '#title' => $this->t('Translation file'), '#description' => array( - '#type' => 'file_upload_help', + '#theme' => 'file_upload_help', '#description' => $this->t('A Gettext Portable Object file.'), '#upload_validators' => $validators, ), @@ -180,5 +189,3 @@ $form_state['redirect_route']['route_name'] = 'locale.translate_page'; - return; } - }