diff --git a/core/modules/path/src/Form/AddForm.php b/core/modules/path/src/Form/AddForm.php index 1f99c87..9c8fb55 100644 --- a/core/modules/path/src/Form/AddForm.php +++ b/core/modules/path/src/Form/AddForm.php @@ -45,7 +45,12 @@ public function validateForm(array &$form, FormStateInterface $form_state) { $langcode = $form_state->getValue('langcode', LanguageInterface::LANGCODE_NOT_SPECIFIED); if ($this->aliasStorage->aliasExists($alias, $langcode)) { - $form_state->setErrorByName('alias', t('The alias %alias is already in use in this language.', array('%alias' => $alias))); + if ($langcode == LanguageInterface::LANGCODE_NOT_SPECIFIED) { + $form_state->setErrorByName('alias', t('The alias %alias is already in use.', array('%alias' => $alias))); + } + else { + $form_state->setErrorByName('alias', t('The alias %alias is already in use in this language.', array('%alias' => $alias))); + } } } } diff --git a/core/modules/path/src/Form/PathFormBase.php b/core/modules/path/src/Form/PathFormBase.php index f4d9309..d355a39 100644 --- a/core/modules/path/src/Form/PathFormBase.php +++ b/core/modules/path/src/Form/PathFormBase.php @@ -156,7 +156,12 @@ public function validateForm(array &$form, FormStateInterface $form_state) { $langcode = $form_state->getValue('langcode', LanguageInterface::LANGCODE_NOT_SPECIFIED); if ($this->aliasStorage->aliasExists($alias, $langcode, $source)) { - $form_state->setErrorByName('alias', t('The alias %alias is already in use in this language.', array('%alias' => $alias))); + if ($langcode == LanguageInterface::LANGCODE_NOT_SPECIFIED) { + $form_state->setErrorByName('alias', t('The alias %alias is already in use.', array('%alias' => $alias))); + } + else { + $form_state->setErrorByName('alias', t('The alias %alias is already in use in this language.', array('%alias' => $alias))); + } } if (!$this->pathValidator->isValid($source)) { $form_state->setErrorByName('source', t("The path '@link_path' is either invalid or you do not have access to it.", array('@link_path' => $source))); diff --git a/core/modules/path/src/Tests/PathAliasTest.php b/core/modules/path/src/Tests/PathAliasTest.php index 068edcd..eea3efb 100644 --- a/core/modules/path/src/Tests/PathAliasTest.php +++ b/core/modules/path/src/Tests/PathAliasTest.php @@ -82,7 +82,7 @@ function testAdminAlias() { // Confirm we can't create same alias one more time. $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save')); $this->assertResponse(200); - $this->assertRaw(t('The alias %alias is already in use in this language.', array('%alias' => $edit['alias'])), 'Attempt to create already existing alias was rejected.'); + $this->assertRaw(t('The alias %alias is already in use.', array('%alias' => $edit['alias'])), 'Attempt to create already existing alias was rejected.'); // Change alias to one containing "exotic" characters. $pid = $this->getPID($edit['alias']); @@ -113,7 +113,7 @@ function testAdminAlias() { $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save')); // Confirm no duplicate was created. - $this->assertRaw(t('The alias %alias is already in use in this language.', array('%alias' => $edit['alias'])), 'Attempt to move alias was rejected.'); + $this->assertRaw(t('The alias %alias is already in use.', array('%alias' => $edit['alias'])), 'Attempt to move alias was rejected.'); // Delete alias. $this->drupalPostForm('admin/config/search/path/edit/' . $pid, array(), t('Delete'));