diff --git a/config/install/lingotek.profile.automatic.yml b/config/install/lingotek.profile.automatic.yml index fdfa3bf6..015c66c7 100644 --- a/config/install/lingotek.profile.automatic.yml +++ b/config/install/lingotek.profile.automatic.yml @@ -4,6 +4,7 @@ weight: 30 locked: true auto_upload: true auto_download: true +append_type_to_title: global_setting vault: default project: default workflow: default diff --git a/config/install/lingotek.profile.disabled.yml b/config/install/lingotek.profile.disabled.yml index 5fbe35a7..ebd836d7 100644 --- a/config/install/lingotek.profile.disabled.yml +++ b/config/install/lingotek.profile.disabled.yml @@ -4,6 +4,7 @@ weight: 100 locked: true auto_upload: false auto_download: false +append_type_to_title: global_setting vault: default project: default workflow: default diff --git a/config/install/lingotek.profile.manual.yml b/config/install/lingotek.profile.manual.yml index b56f7e3f..2edb1d03 100644 --- a/config/install/lingotek.profile.manual.yml +++ b/config/install/lingotek.profile.manual.yml @@ -4,6 +4,7 @@ weight: 60 locked: true auto_upload: false auto_download: false +append_type_to_title: global_setting vault: default project: default workflow: default diff --git a/config/install/lingotek.settings.yml b/config/install/lingotek.settings.yml index 036ac65e..fb06765b 100644 --- a/config/install/lingotek.settings.yml +++ b/config/install/lingotek.settings.yml @@ -10,6 +10,7 @@ preference: advanced_taxonomy_terms: true always_show_translate_tabs: false target_download_status: same-as-source + append_type_to_title: global_setting enable_content_cloud: false content_cloud_import_format: 'article' content_cloud_import_status: 0 diff --git a/config/schema/lingotek.schema.yml b/config/schema/lingotek.schema.yml index 250a7df6..d31285ea 100644 --- a/config/schema/lingotek.schema.yml +++ b/config/schema/lingotek.schema.yml @@ -39,6 +39,9 @@ lingotek.settings: target_download_status: label: 'Published status for content translation downloads' type: string + append_type_to_title: + label: 'Global setting to set whether to append content type to title in TMS' + type: string enable_content_cloud: type: boolean enable_download_source: @@ -256,6 +259,9 @@ lingotek.profile.*: workflow: type: string label: 'TM Workflow' + append_type_to_title: + type: string + label: 'Append Content Type To Title' intelligence_metadata: type: mapping mapping: diff --git a/lingotek.install b/lingotek.install index 7aad26c1..03de7cd4 100644 --- a/lingotek.install +++ b/lingotek.install @@ -608,6 +608,16 @@ function lingotek_update_8210() { } } +/** + * The default for appending content type to the document name was changed + * so make sure current users continue to see the same behavior as before the update. + */ +function lingotek_update_8211() { + /** @var \Drupal\lingotek\LingotekConfigurationServiceInterface $lingotek_config */ + $lingotek_config = \Drupal::service('lingotek.configuration'); + $lingotek_config->setPreference('append_type_to_title', TRUE); +} + function lingotek_legacy_get_translation_status($field) { $status = []; foreach ($field->getIterator() as $delta => $value) { diff --git a/src/Entity/LingotekProfile.php b/src/Entity/LingotekProfile.php index 2217ac5f..6fe6fc3c 100644 --- a/src/Entity/LingotekProfile.php +++ b/src/Entity/LingotekProfile.php @@ -34,6 +34,7 @@ use Drupal\lingotek\LingotekProfileInterface; * "locked", * "auto_upload", * "auto_download", + * "append_type_to_title", * "vault", * "project", * "workflow", @@ -135,6 +136,13 @@ class LingotekProfile extends ConfigEntityBase implements LingotekProfileInterfa */ protected $language_overrides = []; + /** + * If content type is to be appended to title when uploading to TMS. + * + * @var string + */ + protected $append_type_to_title = 'global_setting'; + /** * Metadata for content with this translation profile * @@ -600,6 +608,21 @@ class LingotekProfile extends ConfigEntityBase implements LingotekProfileInterfa return (bool) $this->locked; } + /** + * {@inheritdoc} + */ + public function getAppendContentTypeToTitle() { + return $this->append_type_to_title; + } + + /** + * {@inheritdoc} + */ + public function setAppendContentTypeToTitle($append_type_to_title = 'global_setting') { + $this->append_type_to_title = $append_type_to_title; + return $this; + } + /** * {@inheritdoc} */ diff --git a/src/Form/LingotekProfileFormBase.php b/src/Form/LingotekProfileFormBase.php index d35b9f0d..dcc697e1 100644 --- a/src/Form/LingotekProfileFormBase.php +++ b/src/Form/LingotekProfileFormBase.php @@ -105,6 +105,22 @@ class LingotekProfileFormBase extends EntityForm { '#disabled' => $profile->isLocked(), '#default_value' => $profile->hasAutomaticDownload(), ); + + $options = [ + 'global_setting' => $this->t('Use global setting'), + 'yes' => $this->t('Yes'), + 'no' => $this->t('No'), + ]; + + $form['append_type_to_title'] = [ + '#type' => 'select', + '#title' => $this->t('Append Entity Type to TMS Document Name'), + '#description' => $this->t('When enabled, the content/entity type will be appended to the title when uploading to TMS. The source and target titles will remain unchanged.'), + '#options' => $options, + '#default_value' => $profile->getAppendContentTypeToTitle(), + '#disabled' => $profile->isLocked(), + ]; + $form['future_only_note'] = array( '#type' => 'markup', '#markup' => '

' . $this->t('Profile settings impacting only new nodes') . '

', diff --git a/src/Form/LingotekSettingsTabPreferencesForm.php b/src/Form/LingotekSettingsTabPreferencesForm.php index cbf82622..fbef5037 100644 --- a/src/Form/LingotekSettingsTabPreferencesForm.php +++ b/src/Form/LingotekSettingsTabPreferencesForm.php @@ -65,7 +65,7 @@ class LingotekSettingsTabPreferencesForm extends LingotekConfigFormBase { '#type' => 'checkbox', '#title' => t('Enable advanced handling of taxonomy terms'), '#description' => t('This option is used to handle translation of custom fields assigned to taxonomy terms.'), - '#default_value' => $this->lingotek->get('preference.advanced_taxonomy_terms'), + '#default_value' => $lingotek_config->getPreference('advanced_taxonomy_terms'), ); $form['prefs']['hide_top_level'] = array( @@ -79,14 +79,14 @@ class LingotekSettingsTabPreferencesForm extends LingotekConfigFormBase { '#type' => 'checkbox', '#title' => t('Show language label on node pages'), '#description' => t('If checked, language labels will be displayed for nodes that have the \'language selection\' field set to be visible.'), - '#default_value' => $this->lingotek->get('preference.show_language_labels'), + '#default_value' => $lingotek_config->getPreference('show_language_labels'), ); $form['prefs']['always_show_translate_tabs'] = array( '#type' => 'checkbox', '#title' => t('Always show non-Lingotek translate tabs'), '#description' => t('If checked, edit-form tabs for both Content Translation and Entity Translation will not be hidden, even if the entity is managed by Lingotek.'), - '#default_value' => $this->lingotek->get('preference.always_show_translate_tabs'), + '#default_value' => $lingotek_config->getPreference('always_show_translate_tabs'), ); $form['prefs']['allow_local_editing'] = array( @@ -95,7 +95,7 @@ class LingotekSettingsTabPreferencesForm extends LingotekConfigFormBase { '#type' => 'checkbox', '#title' => t('Allow local editing of Lingotek translations'), '#description' => t('If checked, local editing of translations managed by Lingotek will be allowed. (Note: any changes made may be overwritten if the translation is downloaded from Lingotek again.)'), - '#default_value' => $this->lingotek->get('preference.allow_local_editing'), + '#default_value' => $lingotek_config->getPreference('allow_local_editing'), '#states' => array( 'visible' => array( ':input[name="always_show_translate_tabs"]' => array('checked' => TRUE), @@ -107,7 +107,7 @@ class LingotekSettingsTabPreferencesForm extends LingotekConfigFormBase { '#type' => 'checkbox', '#title' => t('Enable language-specific profiles'), '#description' => t('If checked, languages enabled for Lingotek translation will not automatically be queued for all content. Instead, languages enabled for Lingotek will be added to the available languages for profiles but will be disabled by default on profiles that have existing content. (Note: this cannot be unchecked if language-specific settings are in use.)'), - '#default_value' => $this->lingotek->get('preference.language_specific_profiles'), + '#default_value' => $lingotek_config->getPreference('language_specific_profiles'), ); $form['prefs']['delete_tms_documents_upon_disassociation'] = array( @@ -122,7 +122,7 @@ class LingotekSettingsTabPreferencesForm extends LingotekConfigFormBase { '#title' => t('Enable advanced features'), '#description' => t('Some features may not be available without an Enterprise License for the Lingotek TMS. Call %phone for details.', [':url' => 'http://www.lingotek.com', ':phone_link' => 'tel:1-801-331-7777', '%phone' => '+1 (801) 331-7777']), - '#default_value' => $this->lingotek->get('preference.advanced_parsing'), + '#default_value' => $lingotek_config->getPreference('advanced_parsing'), ); $states = array( @@ -143,7 +143,7 @@ class LingotekSettingsTabPreferencesForm extends LingotekConfigFormBase { '#type' => 'checkbox', '#title' => t('Enable importing from Lingotek Content Cloud (beta)'), '#description' => t('Allows the importing of documents that are in your TMS. An \'Import\' tab will appear next to the \'Settings\' tab.
Note: The settings could take longer to save if this setting is changed.'), - '#default_value' => $this->lingotek->get('preference.enable_content_cloud', FALSE), + '#default_value' => $lingotek_config->getPreference('enable_content_cloud', FALSE), ); $form['prefs']['enable_download_source'] = array( @@ -153,6 +153,13 @@ class LingotekSettingsTabPreferencesForm extends LingotekConfigFormBase { '#default_value' => $lingotek_config->getPreference('enable_download_source') ?: FALSE, ); + $form['prefs']['append_type_to_title'] = array( + '#type' => 'checkbox', + '#title' => t('Append Entity Type to TMS Document Name'), + '#description' => t('Enable to have content/entity type appended to the document title in TMS.'), + '#default_value' => $lingotek_config->getPreference('append_type_to_title') ?: FALSE, + ); + $form['prefs']['actions']['#type'] = 'actions'; $form['prefs']['actions']['submit'] = array( '#type' => 'submit', @@ -176,9 +183,10 @@ class LingotekSettingsTabPreferencesForm extends LingotekConfigFormBase { $this->saveLanguageSwitcherSettings($form_values); $this->saveShowLanguageFields($form_values); $this->saveAlwaysShowTranslateTabs($form_values); - $this->lingotek->set('preference.language_specific_profiles', $form_values['language_specific_profiles']); - $this->lingotek->set('preference.advanced_taxonomy_terms', $form_values['advanced_taxonomy_terms']); - $this->lingotek->set('preference.advanced_parsing', $form_values['advanced_parsing']); + $lingotek_config->setPreference('language_specific_profiles', $form_values['language_specific_profiles']); + $lingotek_config->setPreference('advanced_taxonomy_terms', $form_values['advanced_taxonomy_terms']); + $lingotek_config->setPreference('advanced_parsing', $form_values['advanced_parsing']); + $lingotek_config->setPreference('append_type_to_title', $form_values['append_type_to_title']); $lingotek_config->setPreference('target_download_status', $form_values['target_download_status']); $lingotek_config->setDeleteRemoteAfterDisassociation($form_values['delete_tms_documents_upon_disassociation']); $lingotek_config->setPreference('enable_download_source', $form_values['enable_download_source']); diff --git a/src/LingotekConfigTranslationService.php b/src/LingotekConfigTranslationService.php index 6d7043ec..39207770 100644 --- a/src/LingotekConfigTranslationService.php +++ b/src/LingotekConfigTranslationService.php @@ -366,7 +366,28 @@ class LingotekConfigTranslationService implements LingotekConfigTranslationServi return $this->updateDocument($entity, $job_id); } $source_data = $this->getSourceData($entity); - $document_name = $entity->id() . ' (config): ' . $entity->label(); + $extended_name = $entity->id() . ' (config): ' . $entity->label(); + switch ($profile->getAppendContentTypeToTitle()) { + default: + case 'global_setting': { + if ($this->lingotekConfiguration->getPreference('append_type_to_title')) { + $document_name = $extended_name; + } + else { + $document_name = $entity->label(); + } + break; + } + case 'yes': { + $document_name = $extended_name; + break; + } + case 'no': { + $document_name = $entity->label(); + break; + } + } + $url = $entity->hasLinkTemplate('edit-form') ? $entity->toUrl()->setAbsolute()->toString() : NULL; // Allow other modules to alter the data before is uploaded. @@ -416,7 +437,27 @@ class LingotekConfigTranslationService implements LingotekConfigTranslationServi } $source_data = $this->getSourceData($entity); $document_id = $this->getDocumentId($entity); - $document_name = $entity->id() . ' (config): ' . $entity->label(); + $extended_name = $entity->id() . ' (config): ' . $entity->label(); + switch ($profile->getAppendContentTypeToTitle()) { + default: + case 'global_setting': { + if ($this->lingotekConfiguration->getPreference('append_type_to_title')) { + $document_name = $extended_name; + } + else { + $document_name = $entity->label(); + } + break; + } + case 'yes': { + $document_name = $extended_name; + break; + } + case 'no': { + $document_name = $entity->label(); + break; + } + } $url = $entity->hasLinkTemplate('edit-form') ? $entity->toUrl()->setAbsolute()->toString() : NULL; @@ -878,7 +919,28 @@ class LingotekConfigTranslationService implements LingotekConfigTranslationServi return $this->updateConfig($mapper_id); } $source_data = json_encode($this->getConfigSourceData($mapper)); - $document_name = $mapper_id . ' (config): ' . $mapper->getTitle(); + $extended_name = $mapper_id . ' (config): ' . $mapper->getTitle(); + switch ($profile->getAppendContentTypeToTitle()) { + default: + case 'global_setting': { + if ($this->lingotekConfiguration->getPreference('append_type_to_title')) { + $document_name = $extended_name; + } + else { + $document_name = (string) $mapper->getTitle(); + } + break; + } + case 'yes': { + $document_name = $extended_name; + break; + } + case 'no': { + $document_name = (string) $mapper->getTitle(); + break; + } + } + $document_id = $this->lingotek->uploadDocument($document_name, $source_data, $this->getConfigSourceLocale($mapper), NULL, $this->lingotekConfiguration->getConfigProfile($mapper_id), $job_id); if ($document_id) { $this->setConfigDocumentId($mapper, $document_id); @@ -1176,7 +1238,27 @@ class LingotekConfigTranslationService implements LingotekConfigTranslationServi $mapper = $this->mappers[$mapper_id]; $source_data = json_encode($this->getConfigSourceData($mapper)); $document_id = $this->getConfigDocumentId($mapper); - $document_name = $mapper_id . ' (config): ' . $mapper->getTitle(); + $extended_name = $mapper_id . ' (config): ' . $mapper->getTitle(); + switch ($profile->getAppendContentTypeToTitle()) { + default: + case 'global_setting': { + if ($this->lingotekConfiguration->getPreference('append_type_to_title')) { + $document_name = $extended_name; + } + else { + $document_name = (string) $mapper->getTitle(); + } + break; + } + case 'yes': { + $document_name = $extended_name; + break; + } + case 'no': { + $document_name = (string) $mapper->getTitle(); + break; + } + } if ($this->lingotek->updateDocument($document_id, $source_data, NULL, $document_name, NULL, $job_id)) { $this->setConfigSourceStatus($mapper, Lingotek::STATUS_IMPORTING); diff --git a/src/LingotekContentTranslationService.php b/src/LingotekContentTranslationService.php index f050349f..25f3c204 100644 --- a/src/LingotekContentTranslationService.php +++ b/src/LingotekContentTranslationService.php @@ -728,9 +728,29 @@ class LingotekContentTranslationService implements LingotekContentTranslationSer return $this->updateDocument($entity, $job_id); } $source_data = $this->getSourceData($entity); - $document_name = $entity->bundle() . ' (' . $entity->getEntityTypeId() . '): ' . $entity->label(); + $extended_name = $entity->bundle() . ' (' . $entity->getEntityTypeId() . '): ' . $entity->label(); + switch ($profile->getAppendContentTypeToTitle()) { + default: + case 'global_setting': { + if ($this->lingotekConfiguration->getPreference('append_type_to_title')) { + $document_name = $extended_name; + } + else { + $document_name = $entity->label(); + } + break; + } + case 'yes': { + $document_name = $extended_name; + break; + } + case 'no': { + $document_name = $entity->label(); + break; + } + } + $url = $entity->hasLinkTemplate('canonical') ? $entity->toUrl()->setAbsolute(TRUE)->toString() : NULL; - $profile = $this->lingotekConfiguration->getEntityProfile($entity); // Allow other modules to alter the data before is uploaded. \Drupal::moduleHandler()->invokeAll('lingotek_content_entity_document_upload', [&$source_data, &$entity, &$url]); @@ -836,8 +856,28 @@ class LingotekContentTranslationService implements LingotekContentTranslationSer $source_data = $this->getSourceData($entity); $document_id = $this->getDocumentId($entity); $url = $entity->hasLinkTemplate('canonical') ? $entity->toUrl()->setAbsolute(TRUE)->toString() : NULL; - $document_name = $entity->bundle() . ' (' . $entity->getEntityTypeId() . '): ' . $entity->label(); - $profile = $this->lingotekConfiguration->getEntityProfile($entity); + $extended_name = $entity->bundle() . ' (' . $entity->getEntityTypeId() . '): ' . $entity->label(); + switch ($profile->getAppendContentTypeToTitle()) { + default: + case 'global_setting': { + if ($this->lingotekConfiguration->getPreference('append_type_to_title')) { + $document_name = $extended_name; + } + else { + $document_name = $entity->label(); + } + break; + } + case 'yes': { + $document_name = $extended_name; + break; + } + case 'no': { + $document_name = $entity->label(); + break; + } + } + // Allow other modules to alter the data before is uploaded. \Drupal::moduleHandler()->invokeAll('lingotek_content_entity_document_upload', [&$source_data, &$entity, &$url]); @@ -1316,7 +1356,7 @@ class LingotekContentTranslationService implements LingotekContentTranslationSer $intelligenceService->setProfile($profile); $data['_lingotek_metadata']['_intelligence']['external_document_id'] = $entity->id(); - $data['_lingotek_metadata']['_intelligence']['content_type'] = $entity->getEntityTypeId(); + $data['_lingotek_metadata']['_intelligence']['content_type'] = $entity->getEntityTypeId() . ' - ' . $entity->bundle(); //Check if we have permission to send these if ($intelligenceService->getBaseDomainPermission()) { diff --git a/src/LingotekProfileInterface.php b/src/LingotekProfileInterface.php index ab8b868d..fc8bf1cf 100644 --- a/src/LingotekProfileInterface.php +++ b/src/LingotekProfileInterface.php @@ -37,6 +37,24 @@ interface LingotekProfileInterface extends ConfigEntityInterface, LingotekFilter */ public function isLocked(); + /** + * Returns value of append content type to title option. + * + * @return string + * Values will be 'global_setting', 'yes', or 'no' + */ + public function getAppendContentTypeToTitle(); + + /** + * Sets the value of append content type to title option. + * + * @param string $append_type_to_title + * 'global_setting', 'yes', or 'no' + * + * @return $this + */ + public function setAppendContentTypeToTitle($append_type_to_title = 'global_setting'); + /** * Gets the weight of the profile. * diff --git a/tests/src/Functional/Form/LingotekProfileFormTest.php b/tests/src/Functional/Form/LingotekProfileFormTest.php index 14533ee7..0731412b 100644 --- a/tests/src/Functional/Form/LingotekProfileFormTest.php +++ b/tests/src/Functional/Form/LingotekProfileFormTest.php @@ -55,7 +55,6 @@ class LingotekProfileFormTest extends LingotekTestBase { */ public function testAddingProfile() { $this->drupalGet('admin/lingotek/settings'); - $this->clickLink(t('Add new Translation Profile')); $profile_id = strtolower($this->randomMachineName()); @@ -65,6 +64,7 @@ class LingotekProfileFormTest extends LingotekTestBase { 'label' => $profile_name, 'auto_upload' => 1, 'auto_download' => 1, + 'append_type_to_title' => 'yes', ]; $this->drupalPostForm(NULL, $edit, t('Save')); @@ -82,6 +82,7 @@ class LingotekProfileFormTest extends LingotekTestBase { $profile = LingotekProfile::load($profile_id); $this->assertTrue($profile->hasAutomaticUpload()); $this->assertTrue($profile->hasAutomaticDownload()); + $this->assertIdentical('yes', $profile->getAppendContentTypeToTitle()); $this->assertIdentical('default', $profile->getProject()); $this->assertIdentical('default', $profile->getVault()); $this->assertIdentical('default', $profile->getWorkflow()); @@ -102,6 +103,7 @@ class LingotekProfileFormTest extends LingotekTestBase { $profile->save(); $profile_id = $profile->id(); + $this->assertIdentical('global_setting', $profile->getAppendContentTypeToTitle()); $this->drupalGet("/admin/lingotek/settings/profile/$profile_id/edit"); $edit = [ @@ -112,6 +114,7 @@ class LingotekProfileFormTest extends LingotekTestBase { 'workflow' => 'test_workflow', 'filter' => 'test_filter', 'subfilter' => 'another_filter', + 'append_type_to_title' => 'no', ]; $this->drupalPostForm(NULL, $edit, t('Save')); @@ -119,6 +122,7 @@ class LingotekProfileFormTest extends LingotekTestBase { $profile = LingotekProfile::load($profile_id); $this->assertFalse($profile->hasAutomaticUpload()); $this->assertTrue($profile->hasAutomaticDownload()); + $this->assertIdentical('no', $profile->getAppendContentTypeToTitle()); $this->assertIdentical('test_project', $profile->getProject()); $this->assertIdentical('test_vault', $profile->getVault()); $this->assertIdentical('test_workflow', $profile->getWorkflow()); @@ -128,6 +132,7 @@ class LingotekProfileFormTest extends LingotekTestBase { $this->drupalGet("/admin/lingotek/settings/profile/$profile_id/edit"); $this->assertNoFieldChecked("edit-auto-upload"); $this->assertFieldChecked("edit-auto-download"); + $this->assertOptionSelected('edit-append-type-to-title', 'no'); $this->assertOptionSelected('edit-project', 'test_project'); $this->assertOptionSelected('edit-vault', 'test_vault'); $this->assertOptionSelected('edit-workflow', 'test_workflow'); diff --git a/tests/src/Functional/LingotekIntelligenceMetadataTranslationTest.php b/tests/src/Functional/LingotekIntelligenceMetadataTranslationTest.php index 77842823..ab8562a6 100644 --- a/tests/src/Functional/LingotekIntelligenceMetadataTranslationTest.php +++ b/tests/src/Functional/LingotekIntelligenceMetadataTranslationTest.php @@ -129,7 +129,7 @@ class LingotekIntelligenceMetadataTranslationTest extends LingotekTestBase { $this->assertIdentical($data['_lingotek_metadata']['_entity_revision'], '1'); $this->assertIdentical($data['_lingotek_metadata']['_entity_type_id'], 'node'); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['external_document_id'], '1'); - $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node'); + $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node - article'); } public function testUploadNodeWithDefaultSettings() { @@ -177,7 +177,7 @@ class LingotekIntelligenceMetadataTranslationTest extends LingotekTestBase { $this->assertEqual(17, count($data['_lingotek_metadata']['_intelligence'])); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['external_document_id'], '1'); - $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node'); + $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node - article'); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['domain'], $domain); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['reference_url'], $this->node->toUrl()->setAbsolute(TRUE)->toString()); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['author_name'], 'admin'); @@ -244,7 +244,7 @@ class LingotekIntelligenceMetadataTranslationTest extends LingotekTestBase { $this->assertEqual(17, count($data['_lingotek_metadata']['_intelligence'])); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['external_document_id'], '1'); - $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node'); + $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node - article'); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['domain'], $domain); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['reference_url'], $this->node->toUrl()->setAbsolute(TRUE)->toString()); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['author_name'], 'admin'); @@ -309,7 +309,7 @@ class LingotekIntelligenceMetadataTranslationTest extends LingotekTestBase { $this->assertEqual(17, count($data['_lingotek_metadata']['_intelligence'])); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['external_document_id'], '1'); - $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node'); + $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node - article'); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['domain'], $domain); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['reference_url'], $this->node->toUrl()->setAbsolute(TRUE)->toString()); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['author_name'], 'admin'); @@ -375,7 +375,7 @@ class LingotekIntelligenceMetadataTranslationTest extends LingotekTestBase { $this->assertEqual(17, count($data['_lingotek_metadata']['_intelligence'])); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['external_document_id'], '1'); - $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node'); + $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['content_type'], 'node - article'); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['domain'], $domain); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['reference_url'], $this->node->toUrl()->setAbsolute(TRUE)->toString()); $this->assertIdentical($data['_lingotek_metadata']['_intelligence']['author_name'], 'admin'); diff --git a/tests/src/Functional/Update/LingotekAppendTypeToTitle8209Test.php b/tests/src/Functional/Update/LingotekAppendTypeToTitle8209Test.php new file mode 100644 index 00000000..5d8af37e --- /dev/null +++ b/tests/src/Functional/Update/LingotekAppendTypeToTitle8209Test.php @@ -0,0 +1,38 @@ +databaseDumpFiles = [ + __DIR__ . '/../../../fixtures/update/drupal-8.lingotek.standard.pre8210.php.gz', + ]; + } + + /** + * Tests that the setting to append content type is set to TRUE after updates + */ + public function testAppendTypeToTitle() { + /** @var \Drupal\lingotek\LingotekConfigurationServiceInterface $lingotek_config */ + $lingotek_config = \Drupal::service('lingotek.configuration'); + $this->assertNull($lingotek_config->getPreference('append_type_to_title')); + + $this->runUpdates(); + + $this->assertTrue($lingotek_config->getPreference('append_type_to_title')); + } + +}