diff --git a/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php b/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php index 39eb27c..dd7252d 100644 --- a/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php +++ b/core/modules/language/lib/Drupal/language/Form/LanguageDeleteForm.php @@ -11,7 +11,6 @@ use Drupal\Core\Entity\EntityControllerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Routing\PathBasedGeneratorInterface; -use Drupal\Core\StringTranslation\Translator\TranslatorInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -20,7 +19,7 @@ /** * Defines a confirmation form for deleting a language entity. */ -class LanguageDeleteForm extends EntityConfirmFormBase implements EntityControllerInterface { +class LanguageDeleteForm extends EntityConfirmFormBase { /** * The urlGenerator service. @@ -30,36 +29,21 @@ class LanguageDeleteForm extends EntityConfirmFormBase implements EntityControll protected $urlGenerator; /** - * The translation manager service. - * - * @var \Drupal\Core\StringTranslation\Translator\TranslatorInterface - */ - protected $translator; - - /** * Constructs a new LanguageDeleteForm object. * - * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler - * The module handler service. * @param \Drupal\Core\Routing\PathBasedGeneratorInterface $url_generator * The url generator service. - * @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translator - * The translation manager. */ - public function __construct(ModuleHandlerInterface $module_handler, PathBasedGeneratorInterface $url_generator, TranslatorInterface $translator) { - parent::__construct($module_handler); + public function __construct(PathBasedGeneratorInterface $url_generator) { $this->urlGenerator = $url_generator; - $this->translator = $translator; } /** * {@inheritdoc} */ - public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) { + public static function create(ContainerInterface $container) { return new static( - $container->get('module_handler'), - $container->get('url_generator'), - $container->get('string_translation') + $container->get('url_generator') ); } @@ -67,7 +51,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ * {@inheritdoc} */ public function getQuestion() { - return $this->translator->translate('Are you sure you want to delete the language %language?', array('%language' => $this->entity->label())); + return t('Are you sure you want to delete the language %language?', array('%language' => $this->entity->label())); } /** @@ -81,14 +65,14 @@ public function getCancelPath() { * {@inheritdoc} */ public function getDescription() { - return $this->translator->translate('Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. This action cannot be undone.'); + return t('Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. This action cannot be undone.'); } /** * {@inheritdoc} */ public function getConfirmText() { - return $this->translator->translate('Delete'); + return t('Delete'); } /** @@ -107,7 +91,7 @@ public function buildForm(array $form, array &$form_state, Request $request = NU // Warn and redirect user when attempting to delete the default language. if (language_default()->id == $langcode) { - drupal_set_message($this->translator->translate('The default language cannot be deleted.')); + drupal_set_message(t('The default language cannot be deleted.')); $url = $this->urlGenerator->generateFromPath('admin/config/regional/language', array('absolute' => TRUE)); return new RedirectResponse($url); } @@ -130,7 +114,7 @@ public function submit(array $form, array &$form_state) { if ($success) { $options = array('%language' => $this->entity->label(), '%langcode' => $this->entity->id()); - drupal_set_message($this->translator->translate('The %language (%langcode) language has been removed.', $options)); + drupal_set_message(t('The %language (%langcode) language has been removed.', $options)); } $form_state['redirect'] = 'admin/config/regional/language';