Commit 252ff769 authored by xjm's avatar xjm

Revert "Issue #2671058 by Jo Fitzgerald, hchonov, tstoeckler, tameeshb,...

Revert "Issue #2671058 by Jo Fitzgerald, hchonov, tstoeckler, tameeshb, Munavijayalakshmi, pguillard: OverviewTerms doesn't respect the current content language when building the form and term urls and names are generated based on the terms default language"

This reverts commit d370ee76.
parent d370ee76
...@@ -21,13 +21,6 @@ class OverviewTerms extends FormBase { ...@@ -21,13 +21,6 @@ class OverviewTerms extends FormBase {
*/ */
protected $moduleHandler; protected $moduleHandler;
/**
* The entity manager.
*
* @var \Drupal\Core\Entity\EntityManagerInterface
*/
protected $entityManager;
/** /**
* The term storage handler. * The term storage handler.
* *
...@@ -45,7 +38,6 @@ class OverviewTerms extends FormBase { ...@@ -45,7 +38,6 @@ class OverviewTerms extends FormBase {
*/ */
public function __construct(ModuleHandlerInterface $module_handler, EntityManagerInterface $entity_manager) { public function __construct(ModuleHandlerInterface $module_handler, EntityManagerInterface $entity_manager) {
$this->moduleHandler = $module_handler; $this->moduleHandler = $module_handler;
$this->entityManager = $entity_manager;
$this->storageController = $entity_manager->getStorage('taxonomy_term'); $this->storageController = $entity_manager->getStorage('taxonomy_term');
} }
...@@ -217,7 +209,6 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular ...@@ -217,7 +209,6 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular
]; ];
foreach ($current_page as $key => $term) { foreach ($current_page as $key => $term) {
/** @var $term \Drupal\Core\Entity\EntityInterface */ /** @var $term \Drupal\Core\Entity\EntityInterface */
$term = $this->entityManager->getTranslationFromContext($term);
$form['terms'][$key]['#term'] = $term; $form['terms'][$key]['#term'] = $term;
$indentation = []; $indentation = [];
if (isset($term->depth) && $term->depth > 0) { if (isset($term->depth) && $term->depth > 0) {
......
...@@ -107,37 +107,4 @@ public function testDefaultTermLanguage() { ...@@ -107,37 +107,4 @@ public function testDefaultTermLanguage() {
$this->assertOptionSelected('edit-langcode-0-value', 'cc', "The expected langcode, 'cc', was selected."); $this->assertOptionSelected('edit-langcode-0-value', 'cc', "The expected langcode, 'cc', was selected.");
} }
/**
* Tests that translated terms are displayed correctly on the term overview.
*/
public function testTermTranslatedOnOverviewPage() {
// Configure the vocabulary to not hide the language selector.
$edit = [
'default_language[language_alterable]' => TRUE,
];
$this->drupalPostForm('admin/structure/taxonomy/manage/' . $this->vocabulary->id(), $edit, t('Save'));
// Add a term.
$this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
// Submit the term.
$edit = [
'name[0][value]' => $this->randomMachineName(),
'langcode[0][value]' => 'aa',
];
$this->drupalPostForm(NULL, $edit, t('Save'));
$terms = taxonomy_term_load_multiple_by_name($edit['name[0][value]']);
$term = reset($terms);
// Add a translation for that term.
$translated_title = $this->randomMachineName();
$term->addTranslation('bb', [
'name' => $translated_title,
]);
$term->save();
// Overview page in the other language shows the translated term
$this->drupalGet('bb/admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview');
$this->assertPattern('|<a[^>]*>' . $translated_title . '</a>|', 'The term language is correct');
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment