diff --git a/config/install/views.view.tmgmt_job_overview.yml b/config/install/views.view.tmgmt_job_overview.yml index 4cadf42..7302d74 100644 --- a/config/install/views.view.tmgmt_job_overview.yml +++ b/config/install/views.view.tmgmt_job_overview.yml @@ -977,7 +977,7 @@ display: menu: type: normal title: Jobs - description: 'Overview of Jobs.' + description: 'Manage and review existing translation jobs.' parent: tmgmt.admin_tmgmt weight: -100 context: '0' diff --git a/sources/content/src/Tests/ContentEntitySourceUiTest.php b/sources/content/src/Tests/ContentEntitySourceUiTest.php index 5f9a6ea..20354b0 100644 --- a/sources/content/src/Tests/ContentEntitySourceUiTest.php +++ b/sources/content/src/Tests/ContentEntitySourceUiTest.php @@ -451,7 +451,7 @@ class ContentEntitySourceUiTest extends EntityTestBase { ) )->save(); - $this->drupalGet('admin/config/regional/tmgmt_settings'); + $this->drupalGet('admin/tmgmt/settings'); $checked_reference_fields = array( 'embedded_fields[node][field1]' => TRUE, diff --git a/src/Entity/Translator.php b/src/Entity/Translator.php index 1a04f88..3320691 100644 --- a/src/Entity/Translator.php +++ b/src/Entity/Translator.php @@ -50,11 +50,11 @@ use Drupal\tmgmt\TranslatorInterface; * "remote_languages_mappings", * }, * links = { - * "collection" = "/admin/config/regional/tmgmt_translator", - * "edit-form" = "/admin/config/regional/tmgmt_translator/manage/{tmgmt_translator}", - * "add-form" = "/admin/config/regional/tmgmt_translator/add", - * "delete-form" = "/admin/config/regional/tmgmt_translator/manage/{tmgmt_translator}/delete", - * "clone-form" = "/admin/config/regional/tmgmt_translator/manage/{tmgmt_translator}/clone", + * "collection" = "/admin/tmgmt/translators", + * "edit-form" = "/admin/tmgmt/translator/manage/{tmgmt_translator}", + * "add-form" = "/admin/tmgmt/translators/add", + * "delete-form" = "/admin/tmgmt/translators/manage/{tmgmt_translator}/delete", + * "clone-form" = "/admin/tmgmt/translators/manage/{tmgmt_translator}/clone", * } * ) * diff --git a/src/Tests/TMGMTUiTest.php b/src/Tests/TMGMTUiTest.php index 548be9a..9a6cb2c 100644 --- a/src/Tests/TMGMTUiTest.php +++ b/src/Tests/TMGMTUiTest.php @@ -1000,19 +1000,19 @@ class TMGMTUiTest extends TMGMTTestBase { $item = $job->addItem('test_source', 'test', 1); // Tmgtm settings. - $this->drupalGet('/admin/config/regional/tmgmt_settings'); + $this->drupalGet('/admin/tmgmt/settings'); $this->assertTitle(t('Translation Management settings | Drupal')); // Manage translators. - $this->drupalGet('/admin/config/regional/tmgmt_translator'); + $this->drupalGet('/admin/tmgmt/translators'); $this->assertTitle(t('Translation Management translators | Drupal')); // Add Translator. - $this->drupalGet('/admin/config/regional/tmgmt_translator/add'); + $this->drupalGet('/admin/tmgmt/translators/add'); $this->assertTitle(t('Add Translator | Drupal')); // Delete Translators. - $this->drupalGet('/admin/config/regional/tmgmt_translator/manage/' . $translator->id() . '/delete'); + $this->drupalGet('/admin/tmgmt/translators/manage/' . $translator->id() . '/delete'); $this->assertTitle(t('Are you sure you want to delete the translator @label? | Drupal', ['@label' => $translator->label()])); // Edit Translators. - $this->drupalGet('/admin/config/regional/tmgmt_translator/manage/' . $translator->id()); + $this->drupalGet('/admin/tmgmt/translators/manage/' . $translator->id()); $this->assertTitle(t('Edit translator | Drupal')); // Delete Job. $this->drupalGet('/admin/tmgmt/jobs/' . $job->id() . '/delete'); diff --git a/src/Tests/TranslatorTest.php b/src/Tests/TranslatorTest.php index 7a3ad30..d2304aa 100644 --- a/src/Tests/TranslatorTest.php +++ b/src/Tests/TranslatorTest.php @@ -41,7 +41,7 @@ class TranslatorTest extends TMGMTTestBase { // Create a translator for later deletion. $translator = parent::createTranslator(); // Does the translator exist in the listing? - $this->drupalGet('admin/config/regional/tmgmt_translator'); + $this->drupalGet('admin/tmgmt/translators'); $this->assertText($translator->label()); $this->assertEqual(count($this->xpath('//tbody/tr')), 2); @@ -54,7 +54,7 @@ class TranslatorTest extends TMGMTTestBase { $item = $job->addItem('test_source', 'test', 1); // Try to delete the translator, should fail because of active job. - $delete_url = '/admin/config/regional/tmgmt_translator/manage/' . $translator->id() . '/delete'; + $delete_url = '/admin/tmgmt/translators/manage/' . $translator->id() . '/delete'; $this->drupalGet($delete_url); $this->assertLink(t('Cancel')); $this->drupalPostForm(NULL, array(), 'Delete'); @@ -99,7 +99,7 @@ class TranslatorTest extends TMGMTTestBase { \Drupal::service('module_installer')->uninstall(array('tmgmt_file'), FALSE); // Get the overview. - $this->drupalGet('admin/config/regional/tmgmt_translator'); + $this->drupalGet('admin/tmgmt/translators'); $this->assertNoText(t('Add translator')); $this->assertText(t('There are no translator plugins available. Please install a translator plugin.')); } diff --git a/src/Tests/TranslatorUITest.php b/src/Tests/TranslatorUITest.php index 014bc36..bab7af1 100644 --- a/src/Tests/TranslatorUITest.php +++ b/src/Tests/TranslatorUITest.php @@ -37,8 +37,8 @@ class TranslatorUITest extends TMGMTTestBase { public function testTranslatorUI() { // Test translator creation UI. - $this->drupalGet('admin/config/regional/tmgmt_translator/add'); - $this->drupalPostForm('admin/config/regional/tmgmt_translator/add', array( + $this->drupalGet('admin/tmgmt/translators/add'); + $this->drupalPostForm('admin/tmgmt/translators/add', array( 'label' => 'Test translator', 'description' => 'Test translator description', 'name' => 'translator_test', @@ -46,7 +46,7 @@ class TranslatorUITest extends TMGMTTestBase { ), t('Save')); $this->assertText('Test translator configuration has been created.'); // Test translator edit page. - $this->drupalGet('admin/config/regional/tmgmt_translator/manage/translator_test'); + $this->drupalGet('admin/tmgmt/translators/manage/translator_test'); $this->assertFieldByName('label', 'Test translator'); $this->assertFieldByName('description', 'Test translator description'); $this->assertFieldByName('name', 'translator_test'); @@ -58,7 +58,7 @@ class TranslatorUITest extends TMGMTTestBase { $this->assertText('Test translator changed configuration has been updated.'); // Test translator overview page. - $this->drupalGet('admin/config/regional/tmgmt_translator'); + $this->drupalGet('admin/tmgmt/translators'); $this->assertText('Test translator changed'); $this->assertLink(t('Edit')); $this->assertLink(t('Delete')); diff --git a/tmgmt.links.menu.yml b/tmgmt.links.menu.yml index 216b183..4d968f5 100644 --- a/tmgmt.links.menu.yml +++ b/tmgmt.links.menu.yml @@ -6,7 +6,7 @@ tmgmt.settings: weight: 25 entity.tmgmt_translator.collection: title: 'Translators' - description: 'Add and modify translators.' + description: 'Add and modify job translators.' route_name: entity.tmgmt_translator.collection parent: tmgmt.admin_tmgmt weight: 20 @@ -18,13 +18,13 @@ tmgmt.admin_tmgmt: weight: 0 tmgmt.cart: title: 'Cart' - description: 'Manage the carts.' + description: 'Manage the cart items.' route_name: tmgmt.cart parent: tmgmt.admin_tmgmt weight: -60 tmgmt.sources: title: 'Sources' - description: 'Overview off the souces plugins.' + description: 'View translation status of your site and create new jobs.' route_name: tmgmt.source_overview_default parent: tmgmt.admin_tmgmt weight: -80 diff --git a/tmgmt.routing.yml b/tmgmt.routing.yml index be88c34..69cd9ee 100644 --- a/tmgmt.routing.yml +++ b/tmgmt.routing.yml @@ -15,7 +15,7 @@ entity.tmgmt_translator.collection: _permission: 'administer tmgmt' entity.tmgmt_translator.add_form: - path: '/admin/config/regional/tmgmt_translator/add' + path: '/admin/tmgmt/translators/add' defaults: _title: 'Add Translator' _entity_form: tmgmt_translator.add @@ -23,14 +23,14 @@ entity.tmgmt_translator.add_form: _entity_create_access: tmgmt_translator entity.tmgmt_translator.delete_form: - path: '/admin/config/regional/tmgmt_translator/manage/{tmgmt_translator}/delete' + path: '/admin/tmgmt/translators/manage/{tmgmt_translator}/delete' defaults: _entity_form: tmgmt_translator.delete requirements: _entity_access: tmgmt_translator.delete entity.tmgmt_translator.clone_form: - path: '/admin/config/regional/tmgmt_translator/manage/{tmgmt_translator}/clone' + path: '/admin/tmgmt/translators/manage/{tmgmt_translator}/clone' defaults: _title: 'Clone translator' _entity_form: tmgmt_translator.clone @@ -38,7 +38,7 @@ entity.tmgmt_translator.clone_form: _entity_access: tmgmt_translator.clone entity.tmgmt_translator.edit_form: - path: '/admin/config/regional/tmgmt_translator/manage/{tmgmt_translator}' + path: '/admin/tmgmt/translators/manage/{tmgmt_translator}' defaults: _title: 'Edit translator' _entity_form: tmgmt_translator.edit diff --git a/translators/tmgmt_local/tmgmt_local.module b/translators/tmgmt_local/tmgmt_local.module index 78a42fb..1f2dac4 100755 --- a/translators/tmgmt_local/tmgmt_local.module +++ b/translators/tmgmt_local/tmgmt_local.module @@ -91,7 +91,7 @@ function tmgmt_local_menu_links_discovered_alter(&$links) { if ($view = Views::getView('tmgmt_local_task_overview')) { $links['tmgmt_local_task_overview'] = [ 'title' => new TranslatableMarkup('Translate'), - 'description' => new TranslatableMarkup('Perform local translations.'), + 'description' => new TranslatableMarkup('Perform task translations.'), 'route_name' => $view->getUrl(NULL, 'unassigned')->getRouteName(), 'parent' => 'tmgmt.admin_tmgmt', 'menu_name' => 'admin',