From 0bf9a4a056ab4844b713d3e1b8504df2940c2d9e Mon Sep 17 00:00:00 2001 From: Johan Gant Date: Fri, 27 Sep 2019 14:41:14 +0100 Subject: [PATCH 1/3] Flush development to master (#14) * bug fix to audit processing * Update README.md --- README.md | 8 ++++++++ origins_workflow/origins_workflow.module | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 282cfa7a..cedff6f1 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,11 @@ A collection of modules for use across DOF-DSS Drupal sites * **origins_common:** General utilities and functions. * **origins_layouts:** A collection of Layout Builder layouts. * **origins_workflow:** Generic editorial workflows across DoF sites. + +## Usage + +You can include this package into your project using composer: +``` +composer require dof-dss/nicsdru_origins_modules +``` +Details can be found at: https://packagist.org/packages/dof-dss/nicsdru_origins_modules diff --git a/origins_workflow/origins_workflow.module b/origins_workflow/origins_workflow.module index 0005cc12..fa34fee2 100644 --- a/origins_workflow/origins_workflow.module +++ b/origins_workflow/origins_workflow.module @@ -28,7 +28,7 @@ function origins_workflow_entity_presave(EntityInterface $entity) { if ($entity->getEntityTypeId() == 'node') { if (isset($audit_types[$entity->bundle()]) && ($audit_types[$entity->bundle()] == $entity->bundle())) { // We have just published a node type that is subject to auditing. - if ($entity->isPublished()) { + if ($entity->isPublished() && $entity->hasField('field_next_audit_due')) { $next_audit_date = $entity->get('field_next_audit_due')->value; if (empty($next_audit_date)) { // No audit date set, set it for six months time. From cdb6535fce6e261e4ba16ae4bca92408b4b9d2a9 Mon Sep 17 00:00:00 2001 From: Johan Gant Date: Fri, 9 Oct 2020 11:25:36 +0100 Subject: [PATCH 2/3] 0.9.3 release (#103) * Add timestamp to node title to avoid tripping the unique title validation (#99) * D8NID-897 ~ Use CSS selector instead of field to generate ToC * D8NID-897 ~ Replace hard coded values with configuration * D8NID-897 ~ Remove warning notice * D8NID-897 ~ Remove source field exists check * D8NID-897 ~ Perform some ToC enabled checks earlier for perf reasons * D8NID-897 ~ Update comments * Fix stable packages on coder module (#101) * bug fix - duplicate revision numbers being shown if diff module not installed Co-authored-by: omahm Co-authored-by: Steve Cousins Co-authored-by: DuttonMa --- .circleci/config.yml | 2 +- origins_toc/js/origins_toc.js | 31 +++++++++---------- origins_toc/origins_toc.module | 17 ++++------ origins_workflow/origins_workflow.module | 16 +++++++--- .../02.draftToNeedsReview.js | 2 +- .../03.draftToQuickPublish.js | 2 +- .../04.needsReviewToPublished.js | 2 +- .../05.needsReviewToReject.js | 2 +- .../06.publishedToArchive.js | 2 +- .../07.publishedToDraftOfPublished.js | 2 +- .../08.publishedToUnpublished.js | 2 +- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9836219a..7878f91e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: - run: name: Fetch phpcs and dependencies command: | - composer require drupal/coder --no-interaction --optimize-autoloader + composer require drupal/coder --prefer-stable --no-interaction --optimize-autoloader # Move vendor directory up a level as we don't want to code-check all of that. mv vendor ../ - run: diff --git a/origins_toc/js/origins_toc.js b/origins_toc/js/origins_toc.js index 31a0ab40..9bac9ac0 100644 --- a/origins_toc/js/origins_toc.js +++ b/origins_toc/js/origins_toc.js @@ -3,25 +3,23 @@ Drupal.behaviors.originsToC = { attach: function attach (context) { - var tocHeadings = $('#main-article h2', context).once('attachToC'); - if (tocHeadings.length > 2) { + if (typeof drupalSettings.origins_toc.settings !== 'undefined') { + var toc_settings = drupalSettings.origins_toc.settings; + } else { + return; + } - if (typeof drupalSettings.origins_toc.settings !== 'undefined') { - var toc_settings = drupalSettings.origins_toc.settings; - } else { - return; - } + // Check if Toc is enabled for this entity type and this entity instance. + if (toc_settings.toc_enable != 1 || toc_settings.toc_entity_enable != 1) { + return; + } - // Check if Toc is enabled for this entity type and this entity. - if (toc_settings.toc_enable != 1 || toc_settings.toc_entity_enable != 1) { - return; - } + var tocHeadings = $(toc_settings.toc_source_container + ' ' + toc_settings.toc_element, context).once('attachToC'); - // This implementation doesn't use the configuration - // from the toc 3rd party settings 'toc_settings'. - let tocHeadings = $('#main-article h2').not('toc--exclude'); + if (tocHeadings.length > 2) { + let tocHeadings = $(toc_settings.toc_source_container + ' ' + toc_settings.toc_element).not(toc_settings.toc_exclusions); let $tocList = $('
    '); - let $headingText = Drupal.t('Contents'); + let $headingText = Drupal.t(toc_settings.toc_title); let $skipTocText = Drupal.t('Skip table of contents'); // Iterate each element, append an anchor id and append link to block list. @@ -33,11 +31,12 @@ return; } - // Ignore empty h2s. + // Ignore empty source elements. if ($linkText.toLowerCase().trim().length == 0) { return; } + // Build the ToC links. $(this).attr('id', 'toc-' + index); $tocList.append( '
  • ' + $linkText + '
    • ' diff --git a/origins_toc/origins_toc.module b/origins_toc/origins_toc.module index 4bcd88d3..521ca492 100644 --- a/origins_toc/origins_toc.module +++ b/origins_toc/origins_toc.module @@ -73,13 +73,6 @@ function origins_toc_form_node_type_form_alter(&$form, FormStateInterface $form_ ], ]; - $form['toc']['toc_config']['notice'] = [ - '#type' => 'html_tag', - '#tag' => 'p', - '#value' => 'The settings below currently have no effect on the ToC creation.', - '#attributes' => ['style' => 'color: red'], - ]; - $form['toc']['toc_config']['toc_title'] = [ '#type' => 'textfield', '#title' => t('Title'), @@ -213,7 +206,7 @@ function origins_toc_node_view(&$build, EntityInterface $entity, EntityViewDispl $node_type = \Drupal::entityTypeManager()->getStorage('node_type')->load($entity->getType()); $toc_settings = $node_type->getThirdPartySettings('origins_toc'); - if (!empty($toc_settings) && array_key_exists($toc_settings['toc_source_container'], $build)) { + if (!empty($toc_settings)) { // Check if ToC's have been disabled at the entity type. if (!$toc_settings['toc_enable']) { @@ -222,10 +215,12 @@ function origins_toc_node_view(&$build, EntityInterface $entity, EntityViewDispl if ($entity->hasField('field_toc_enable')) { $toc_settings['toc_entity_enable'] = (int) $entity->get('field_toc_enable')->value; - } - $build['#attached']['drupalSettings']['origins_toc']['settings'] = $toc_settings; - $build['#attached']['library'][] = 'origins_toc/toc'; + if ($toc_settings['toc_entity_enable']) { + $build['#attached']['drupalSettings']['origins_toc']['settings'] = $toc_settings; + $build['#attached']['library'][] = 'origins_toc/toc'; + } + } } } } diff --git a/origins_workflow/origins_workflow.module b/origins_workflow/origins_workflow.module index cef6afb3..86877c1b 100644 --- a/origins_workflow/origins_workflow.module +++ b/origins_workflow/origins_workflow.module @@ -299,25 +299,31 @@ function origins_workflow_preprocess_table(&$variables) { if (isset($variables['header']['select_column_two'])) { $variables['header']['select_column_two']['content'] = ['#markup' => t('Compare revision 2')]; } + // Check whether the 'diff' module has been installed and set the + // column for the 'action' links accordingly. + $action_column = 1; + if (\Drupal::moduleHandler()->moduleExists('diff')) { + $action_column = 3; + } // Loop through the rows and add the revision number column to each. foreach ($variables['rows'] as $idx => $row) { $this_version = ''; - if (isset($row['cells'][3]['content']['#links'])) { + if (isset($row['cells'][$action_column]['content']['#links'])) { // Cheekily extract current revision from the 'revert' button link. - $this_url = $row['cells'][3]['content']['#links']['revert']['url']; + $this_url = $row['cells'][$action_column]['content']['#links']['revert']['url']; if (isset($this_url)) { $this_version = $this_url->getRouteParameters()['node_revision']; } // Change the link text from 'Set as current revision' to // 'Copy to new revision' as it makes more sense - see issue // https://www.drupal.org/project/drupal/issues/2899719 - if (isset($variables['rows'][$idx]['cells'][3]['content']['#links']['revert']['title'])) { - $title_markup = $variables['rows'][$idx]['cells'][3]['content']['#links']['revert']['title']; + if (isset($variables['rows'][$idx]['cells'][$action_column]['content']['#links']['revert']['title'])) { + $title_markup = $variables['rows'][$idx]['cells'][$action_column]['content']['#links']['revert']['title']; // Check the existing text in an attempt to detect any core fix that // might come along. $title_text = $title_markup->getUntranslatedString(); if (($title_text == 'Set as current revision') || ($title_text == 'Revert')) { - $variables['rows'][$idx]['cells'][3]['content']['#links']['revert']['title'] = t('Copy to new revision'); + $variables['rows'][$idx]['cells'][$action_column]['content']['#links']['revert']['title'] = t('Copy to new revision'); } } } diff --git a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/02.draftToNeedsReview.js b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/02.draftToNeedsReview.js index df0330e8..902001af 100644 --- a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/02.draftToNeedsReview.js +++ b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/02.draftToNeedsReview.js @@ -17,7 +17,7 @@ module.exports = { browser.click('select[id="edit-field-subtheme-shs-0-0"]'); browser.click('select[id="edit-field-subtheme-shs-0-0"] option[value="12"]'); browser - .setValue('input#edit-title-0-value', ['Test article (draft to needs review)', browser.Keys.TAB]) + .setValue('input#edit-title-0-value', [Date.now() + ' -- ' + 'Test article (draft to needs review)', browser.Keys.TAB]) .pause(2000) .setValue('textarea#edit-field-summary-0-value', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.') .waitForElementVisible('#cke_edit-body-0-value', 2000) diff --git a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/03.draftToQuickPublish.js b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/03.draftToQuickPublish.js index 30256f38..e4bcefe4 100644 --- a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/03.draftToQuickPublish.js +++ b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/03.draftToQuickPublish.js @@ -17,7 +17,7 @@ module.exports = { browser.click('select[id="edit-field-subtheme-shs-0-0"]'); browser.click('select[id="edit-field-subtheme-shs-0-0"] option[value="12"]'); browser - .setValue('input#edit-title-0-value', ['Test article (draft to quick publish)', browser.Keys.TAB]) + .setValue('input#edit-title-0-value', [Date.now() + ' -- ' + 'Test article (draft to quick publish)', browser.Keys.TAB]) .pause(2000) .setValue('textarea#edit-field-summary-0-value', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.') .waitForElementVisible('#cke_edit-body-0-value', 2000) diff --git a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/04.needsReviewToPublished.js b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/04.needsReviewToPublished.js index 87231c50..97e81cbb 100644 --- a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/04.needsReviewToPublished.js +++ b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/04.needsReviewToPublished.js @@ -18,7 +18,7 @@ module.exports = { browser.click('select[id="edit-field-subtheme-shs-0-0"] option[value="12"]'); browser.click('select[id="edit-moderation-state-0-state"] option[value="needs_review"]'); browser - .setValue('input#edit-title-0-value', ['Test article (needs review to published)', browser.Keys.TAB]) + .setValue('input#edit-title-0-value', [Date.now() + ' -- ' + 'Test article (needs review to published)', browser.Keys.TAB]) .pause(2000) .setValue('textarea#edit-field-summary-0-value', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.') .waitForElementVisible('#cke_edit-body-0-value', 2000) diff --git a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/05.needsReviewToReject.js b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/05.needsReviewToReject.js index 49c58006..c3149f60 100644 --- a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/05.needsReviewToReject.js +++ b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/05.needsReviewToReject.js @@ -18,7 +18,7 @@ module.exports = { browser.click('select[id="edit-field-subtheme-shs-0-0"] option[value="12"]'); browser.click('select[id="edit-moderation-state-0-state"] option[value="needs_review"]'); browser - .setValue('input#edit-title-0-value', ['Test article (needs review to reject)', browser.Keys.TAB]) + .setValue('input#edit-title-0-value', [Date.now() + ' -- ' + 'Test article (needs review to reject)', browser.Keys.TAB]) .pause(2000) .setValue('textarea#edit-field-summary-0-value', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.') .waitForElementVisible('#cke_edit-body-0-value', 2000) diff --git a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/06.publishedToArchive.js b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/06.publishedToArchive.js index 34cd958f..bdecb2a4 100644 --- a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/06.publishedToArchive.js +++ b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/06.publishedToArchive.js @@ -18,7 +18,7 @@ module.exports = { browser.click('select[id="edit-field-subtheme-shs-0-0"] option[value="12"]'); browser.click('select[id="edit-moderation-state-0-state"] option[value="published"]'); browser - .setValue('input#edit-title-0-value', ['Test article (published to archive)', browser.Keys.TAB]) + .setValue('input#edit-title-0-value', [Date.now() + ' -- ' + 'Test article (published to archive)', browser.Keys.TAB]) .pause(2000) .setValue('textarea#edit-field-summary-0-value', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.') .waitForElementVisible('#cke_edit-body-0-value', 2000) diff --git a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/07.publishedToDraftOfPublished.js b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/07.publishedToDraftOfPublished.js index 72b48a53..e058cca2 100644 --- a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/07.publishedToDraftOfPublished.js +++ b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/07.publishedToDraftOfPublished.js @@ -18,7 +18,7 @@ module.exports = { browser.click('select[id="edit-field-subtheme-shs-0-0"] option[value="12"]'); browser.click('select[id="edit-moderation-state-0-state"] option[value="published"]'); browser - .setValue('input#edit-title-0-value', ['Test article (published to draft of published)', browser.Keys.TAB]) + .setValue('input#edit-title-0-value', [Date.now() + ' -- ' + 'Test article (published to draft of published)', browser.Keys.TAB]) .pause(2000) .setValue('textarea#edit-field-summary-0-value', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.') .waitForElementVisible('#cke_edit-body-0-value', 2000) diff --git a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/08.publishedToUnpublished.js b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/08.publishedToUnpublished.js index 762b9816..f97809a4 100644 --- a/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/08.publishedToUnpublished.js +++ b/origins_workflow/tests/src/Nightwatch/Tests/moderationSidebar/08.publishedToUnpublished.js @@ -18,7 +18,7 @@ module.exports = { browser.click('select[id="edit-field-subtheme-shs-0-0"] option[value="12"]'); browser.click('select[id="edit-moderation-state-0-state"] option[value="published"]'); browser - .setValue('input#edit-title-0-value', ['Test article (published to unpublished)', browser.Keys.TAB]) + .setValue('input#edit-title-0-value', [Date.now() + ' -- ' + 'Test article (published to unpublished)', browser.Keys.TAB]) .pause(2000) .setValue('textarea#edit-field-summary-0-value', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.') .waitForElementVisible('#cke_edit-body-0-value', 2000) From 7128dd567d2fb1a199d244ea8192f057c79ad351 Mon Sep 17 00:00:00 2001 From: Johan Gant Date: Wed, 11 Aug 2021 10:41:04 +0100 Subject: [PATCH 3/3] Release version bump to facilitate Origins profile + Unity updates (#174) * D8UN-627 ~ Initial module and block * D8UN-627 ~ Load translations UI via ajax call on block link * D8UN-627 ~ Pass the current URL to the callback to generate Google links * D8UN-627 ~ Attach library to select element * D8UN-627 ~ Open translation url in new window on select change * D8UN-627 ~ Fix URL passed to Google * D8UN-627 ~ Admin form for settings Translations config * D8UN-627 ~ Custom permission for admin form * D8UN-627 ~ Redirect non-ajax requests to the translations page * D8UN-627 ~ Added option to override the translation URL domain * D8UN-627 ~ Inject the current request into the block * D8UN-627 ~ Replace markup element with link and html div * D8UN-627 ~ Refactor admin settings * D8UN-627 ~ Save API key into the state system * D8UN-627 ~ Remove API key when module is uninstalled * D8UN-627 ~ Import languages config and display on form * D8UN-627 ~ Add Edit & Toggle operation button and routes * D8UN-627 ~ Display language on edit form. Update settings on save * D8UN-627 ~ Toggle option to enable or disable language * D8UN-627 ~ Refactor languages display from form to controller method * D8UN-627 ~ Method to return active languages * D8UN-627 ~ Update to save settings to configuration * D8UN-627 ~ Generate a linked list of active languages * D8NID-1384 ~ Display only active languages on the token list * D8NID-1384 ~ Translate link text from browser language * D8UN-627 ~ Controller method to replace the title link with a translation * D8UN-627 ~ Remove langauge cache context as it's currently brokwn in core * D8UN-627 ~ Ajax callback to translate the title based on the users browser language settings * D8UN-627 ~ Refactor select UI routes and methods * D8UN-627 ~ Move select title to first element in options * D8UN-627 ~ Translate select title based on users browser language setting * D8UN-627 ~ Code standards * D8UN-627 ~ Major redesign due to bug with Core and ajax callbacks on links * D8UN-627 ~ Enable and disable UI element if the user has JS enabled * D8UN-627 ~ Remove Google URL from select values. Only open a new tab for a selected language * D8UN-627 ~ Javascript improvements and comments * D8UN-627 ~ Add basic styling to make the button look like a text link * D8UN-627 ~ Utilities service class * D8UN-627 ~ Replace languages code with call to utilities service * D8UN-627 ~ Inject Language select form into block. Remove redundant code and routes * D8UN-627 ~ Code standards and comments * D8UN-627 ~ Inject Utilities service into controller. Fix translation issue with form button * D8UN-627 ~ Inject form builder service * D8UN-627 ~ Token to render language select form * D8UN-627 ~ Add unique ids to form element for ajax callbacks to target * D8UN-627 ~ Allow for custom domain to be inserted into translation url * D8UN-627 ~ Commenting out redundant API key field * D8UN-627 ~ Update installed languages based on NI Census and GA data * D8UN-627 ~ Translate UI for Simplified and Traditional Chinese * D8UN-627 ~ Code standards and comments * D8UN-627 ~ Add help and module configuration link * Add default theme property to test class (#173) * Add default theme property to test class * coding standards Co-authored-by: omahm Co-authored-by: Steve Cousins --- .../origins_translations.languages.yml | 18 +++ origins_translations/css/translations_ui.css | 7 + .../js/origins-translations.js | 54 +++++++ .../origins_translations.info.yml | 7 + .../origins_translations.install | 14 ++ .../origins_translations.libraries.yml | 12 ++ .../origins_translations.links.menu.yml | 5 + .../origins_translations.links.task.yml | 17 ++ .../origins_translations.module | 96 ++++++++++++ .../origins_translations.permissions.yml | 3 + .../origins_translations.routing.yml | 56 +++++++ .../origins_translations.services.yml | 4 + .../OriginsTranslationsAdminController.php | 104 +++++++++++++ .../OriginsTranslationsPageController.php | 33 ++++ .../OriginsTranslationsUiController.php | 60 ++++++++ .../src/Form/LanguageEditForm.php | 76 +++++++++ .../src/Form/LanguageSelectorForm.php | 145 ++++++++++++++++++ .../src/Form/SettingsForm.php | 102 ++++++++++++ .../src/Form/TranslationsPageForm.php | 61 ++++++++ .../Plugin/Block/OriginsTranslationBlock.php | 91 +++++++++++ origins_translations/src/Utilities.php | 41 +++++ .../tests/src/Functional/AuditTest.php | 9 ++ 22 files changed, 1015 insertions(+) create mode 100644 origins_translations/config/install/origins_translations.languages.yml create mode 100644 origins_translations/css/translations_ui.css create mode 100644 origins_translations/js/origins-translations.js create mode 100644 origins_translations/origins_translations.info.yml create mode 100644 origins_translations/origins_translations.install create mode 100644 origins_translations/origins_translations.libraries.yml create mode 100644 origins_translations/origins_translations.links.menu.yml create mode 100644 origins_translations/origins_translations.links.task.yml create mode 100644 origins_translations/origins_translations.module create mode 100644 origins_translations/origins_translations.permissions.yml create mode 100644 origins_translations/origins_translations.routing.yml create mode 100644 origins_translations/origins_translations.services.yml create mode 100644 origins_translations/src/Controller/OriginsTranslationsAdminController.php create mode 100644 origins_translations/src/Controller/OriginsTranslationsPageController.php create mode 100644 origins_translations/src/Controller/OriginsTranslationsUiController.php create mode 100644 origins_translations/src/Form/LanguageEditForm.php create mode 100644 origins_translations/src/Form/LanguageSelectorForm.php create mode 100644 origins_translations/src/Form/SettingsForm.php create mode 100644 origins_translations/src/Form/TranslationsPageForm.php create mode 100644 origins_translations/src/Plugin/Block/OriginsTranslationBlock.php create mode 100644 origins_translations/src/Utilities.php diff --git a/origins_translations/config/install/origins_translations.languages.yml b/origins_translations/config/install/origins_translations.languages.yml new file mode 100644 index 00000000..a7a9dc57 --- /dev/null +++ b/origins_translations/config/install/origins_translations.languages.yml @@ -0,0 +1,18 @@ +ar: ["Arabic", true, "ترجم هذه الصفحة", "اختر لغة"] +zh-cn: ["Chinese (Simplified)", true, "翻译此页", "选择语言"] +zh-tw: ["Chinese (Traditional)", true, "翻譯此頁", "選擇語言"] +nl: ["Dutch", true, "Vertaal deze pagina", "Selecteer een taal"] +tl: ["Filipino", true, "Isalin ang pahinang ito", "Pumili ng isang wika"] +fr: ["French", true, "Traduire cette page", "Sélectionnez une langue"] +de: ["German", true, "Übersetze diese Seite", "Wähle eine Sprache"] +hu: ["Hungarian", true, "Fordítsa le ezt az oldalt", "Válasszon nyelvet"] +ga: ["Irish", true, "Aistrigh an leathanach seo", "Roghnaigh teanga"] +it: ["Italian", true, "Traduci questa pagina", "Seleziona una lingua"] +lv: ["Latvian", true, "Tulkojiet šo lapu", "Izvēlieties valodu"] +lt: ["Lithuanian", true, "Išverskite šį puslapį", "Pasirinkite kalbą"] +pl: ["Polish", true, "Przetłumacz tę stronę", "Wybierz język"] +pt: ["Portuguese", true, "Traduza esta página", "Selecione um idioma"] +ro: ["Romanian", true, "Traduceți această pagină", "Selectați o limbă"] +ru: ["Russian", true, "Перевести эту страницу", "Выберите язык"] +sk: ["Slovak", true, "Preložiť túto stránku", "Vyberte jazyk"] +es: ["Spanish", true, "Traduzca esta pagina", "Selecciona un idioma"] diff --git a/origins_translations/css/translations_ui.css b/origins_translations/css/translations_ui.css new file mode 100644 index 00000000..aba748f3 --- /dev/null +++ b/origins_translations/css/translations_ui.css @@ -0,0 +1,7 @@ +input[type=submit].origins-translation-button { + background-image: none !important; + background: none !important; + border: none !important; + box-shadow: none !important; + font-weight: normal !important; +} diff --git a/origins_translations/js/origins-translations.js b/origins_translations/js/origins-translations.js new file mode 100644 index 00000000..14a4daed --- /dev/null +++ b/origins_translations/js/origins-translations.js @@ -0,0 +1,54 @@ +/** + * @file + * Attaches behaviors for the Origins Translations module. + */ + +(function($, Drupal) { + 'use strict'; + + // Disable the non-javascript link. + function disableLinkUi(i, elm) { + $(elm).addClass('hidden'); + } + + // Enable the AJAX button and update title. + function enableButtonUi(i, elm) { + $(elm).removeClass('hidden'); + var lang_code = navigator.language.substr(0,2); + + if (lang_code !== 'en') { + // Allow for Simplified (zh-cn) and Traditional (zh-tw) Chinese. + if (lang_code === 'zh') { + lang_code = navigator.language; + } + + // Lookup the translation for the UI title. + $.ajax({ + url: '/origins-translations/translation-link-ui/title/' + lang_code, + }) + .done(function(data) { + if (data) { + $(elm).val(data); + } + }); + } + } + + // Open the selected translation in a new tab. + function viewTranslation(i, elm) { + $(elm).change(function () { + if ($(elm).val().length > 0) { + window.open(('https://translate.google.com/translate?hl=en&tab=TT&sl=auto&tl=' + $(elm).val())); + } + }); + } + + Drupal.behaviors.originsTranslate = { + attach: function (context, settings) { + $('.origins-translation-link', context).once('origins-translation').each(disableLinkUi); + $('.origins-translation-button', context).once('origins-translation').each(enableButtonUi); + $('.origins-translation-select', context).once('origins-translation').each(viewTranslation); + } + }; + +})(jQuery, Drupal, drupalSettings); diff --git a/origins_translations/origins_translations.info.yml b/origins_translations/origins_translations.info.yml new file mode 100644 index 00000000..f8c83b62 --- /dev/null +++ b/origins_translations/origins_translations.info.yml @@ -0,0 +1,7 @@ +name: Origins Translations +type: module +description: Provides translation services +package: 'NICS: Origins' +core: 8.x +core_version_requirement: ^8 || ^9 +configure: origins_translations.settings.settings diff --git a/origins_translations/origins_translations.install b/origins_translations/origins_translations.install new file mode 100644 index 00000000..d3d92f8e --- /dev/null +++ b/origins_translations/origins_translations.install @@ -0,0 +1,14 @@ +delete('origins_translations.settings.apikey'); +} diff --git a/origins_translations/origins_translations.libraries.yml b/origins_translations/origins_translations.libraries.yml new file mode 100644 index 00000000..0719d65d --- /dev/null +++ b/origins_translations/origins_translations.libraries.yml @@ -0,0 +1,12 @@ +origins_translations.link_ui: + css: + theme: + css/translations_ui.css: { } + js: + js/origins-translations.js: {} + dependencies: + - core/drupal + - core/drupal.ajax + - core/drupal.url + - core/jquery + - core/jquery.once diff --git a/origins_translations/origins_translations.links.menu.yml b/origins_translations/origins_translations.links.menu.yml new file mode 100644 index 00000000..a3fa27a5 --- /dev/null +++ b/origins_translations/origins_translations.links.menu.yml @@ -0,0 +1,5 @@ +origins_translations.settings: + title: Origins Translations + description: Configure Origins Translations. + parent: origins.admin_config + route_name: origins_translations.settings.settings diff --git a/origins_translations/origins_translations.links.task.yml b/origins_translations/origins_translations.links.task.yml new file mode 100644 index 00000000..fda7f363 --- /dev/null +++ b/origins_translations/origins_translations.links.task.yml @@ -0,0 +1,17 @@ +origins_translations.settings.settings: + route_name: origins_translations.settings.settings + title: 'Settings' + base_route: origins_translations.settings + weight: 10 + +origins_translations.settings.languages: + route_name: origins_translations.settings.languages + title: 'Languages' + base_route: origins_translations.settings + weight: 20 + +origins_translations.settings.translations_page: + route_name: origins_translations.settings.translations_page + title: 'Translations page' + base_route: origins_translations.settings + weight: 30 diff --git a/origins_translations/origins_translations.module b/origins_translations/origins_translations.module new file mode 100644 index 00000000..1cbc8463 --- /dev/null +++ b/origins_translations/origins_translations.module @@ -0,0 +1,96 @@ +' . t('About') . ''; + $output .= '

    ' . t('Provides a translation link or dropdown for the current page.') . '

    '; + $output .= '

    ' . t('Translation can be added via a block or token') . '

    '; + return $output; + + default: + } +} + +/** + * Implements hook_token_info(). + */ +function origins_translations_token_info() { + $types['origins'] = ['name' => 'Origins']; + + $tokens['translations_languages_list'] = [ + 'name' => t('Translation languages list'), + 'description' => t('Displays a list of active site languages linking to Google Translate.'), + ]; + + $tokens['translations_languages_select'] = [ + 'name' => t('Translation languages select'), + 'description' => t('Allows the user to select a language to translate the current page.'), + ]; + + return [ + 'types' => $types, + 'tokens' => ['origins' => $tokens], + ]; +} + +/** + * Implements hook_tokens(). + */ +function origins_translations_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) { + $replacements = []; + + if ($type == 'origins') { + foreach ($tokens as $name => $original) { + switch ($name) { + case 'translations_languages_list': + $utils = \Drupal::service('origins_translations.utilities'); + $request = \Drupal::request(); + + $url = $request->query->get('url'); + + if (empty($url)) { + $url = $request->getUriForPath('/'); + } + + $languages = $utils->getActiveLanguages(); + $links = []; + + foreach ($languages as $code => $language) { + $links[] = [ + '#type' => 'link', + '#url' => Url::fromUri('https://translate.google.com/translate?hl=en&tab=TT&sl=auto&tl=' . $code . '&u=' . $url), + '#title' => $language[0], + ]; + } + + $output = [ + '#theme' => 'item_list', + '#items' => $links, + ]; + + $replacements[$original] = render($output); + break; + + case 'translations_languages_select': + $output = \Drupal::formBuilder()->getForm(LanguageSelectorForm::class); + $replacements[$original] = render($output); + } + } + } + return $replacements; +} diff --git a/origins_translations/origins_translations.permissions.yml b/origins_translations/origins_translations.permissions.yml new file mode 100644 index 00000000..740677cc --- /dev/null +++ b/origins_translations/origins_translations.permissions.yml @@ -0,0 +1,3 @@ +administer origins translations configuration: + title: 'Administer Origins Translations configuration' + restrict access: true diff --git a/origins_translations/origins_translations.routing.yml b/origins_translations/origins_translations.routing.yml new file mode 100644 index 00000000..512fe7a4 --- /dev/null +++ b/origins_translations/origins_translations.routing.yml @@ -0,0 +1,56 @@ +origins_translations.translation-link-ui.title: + path: '/origins-translations/translation-link-ui/title/{code}' + defaults: + _title: 'Translations UI' + _controller: '\Drupal\origins_translations\Controller\OriginsTranslationsUiController::title' + requirements: + _permission: 'access content' + +origins_translations.translations-page: + path: 'translations' + defaults: + _title: 'Translations' + _controller: '\Drupal\origins_translations\Controller\OriginsTranslationsPageController::build' + _title_callback: '\Drupal\origins_translations\Controller\OriginsTranslationsPageController::getTitle' + requirements: + _permission: 'access content' + +origins_translations.settings.settings: + path: '/admin/config/system/origins/translations/settings' + defaults: + _title: 'Origins Translations settings' + _form: 'Drupal\origins_translations\Form\SettingsForm' + requirements: + _permission: 'administer origins translations configuration' + +origins_translations.settings.languages: + path: '/admin/config/system/origins/translations/languages' + defaults: + _title: 'Origins Translations languages' + _controller: '\Drupal\origins_translations\Controller\OriginsTranslationsAdminController::languages' + requirements: + _permission: 'administer origins translations configuration' + +origins_translations.settings.languages.edit: + path: '/admin/config/system/origins/translations/languages/edit/{code}' + defaults: + _title: 'Origins Translations: Edit language' + _form: 'Drupal\origins_translations\Form\LanguageEditForm' + requirements: + _permission: 'administer origins translations configuration' + +origins_translations.settings.languages.toggle: + path: '/admin/config/system/origins/translations/languages/toggle/{code}' + defaults: + _title: 'Origins Translations: Edit language' + _controller: '\Drupal\origins_translations\Controller\OriginsTranslationsAdminController::toggle' + requirements: + _permission: 'administer origins translations configuration' + +origins_translations.settings.translations_page: + path: '/admin/config/system/origins/translations/translations-page' + defaults: + _title: 'Origins Translations page' + _form: 'Drupal\origins_translations\Form\TranslationsPageForm' + requirements: + _permission: 'administer origins translations configuration' diff --git a/origins_translations/origins_translations.services.yml b/origins_translations/origins_translations.services.yml new file mode 100644 index 00000000..714b14d5 --- /dev/null +++ b/origins_translations/origins_translations.services.yml @@ -0,0 +1,4 @@ +services: + origins_translations.utilities: + class: Drupal\origins_translations\Utilities + arguments: ['@config.factory'] diff --git a/origins_translations/src/Controller/OriginsTranslationsAdminController.php b/origins_translations/src/Controller/OriginsTranslationsAdminController.php new file mode 100644 index 00000000..2c7464c8 --- /dev/null +++ b/origins_translations/src/Controller/OriginsTranslationsAdminController.php @@ -0,0 +1,104 @@ +routeMatch = $route_match; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('current_route_match') + ); + } + + /** + * Display a table of languages and settings for the site. + */ + public function languages() { + $config = $this->config('origins_translations.languages'); + + $languages = $config->getRawData(); + unset($languages['_core']); + + $build['languages'] = [ + '#type' => 'table', + '#header' => [ + $this->t('Operations'), + $this->t('Language'), + $this->t('Enabled'), + $this->t('Translate this page'), + $this->t('Select a language'), + ], + ]; + + foreach ($languages as $code => $language) { + $build['languages']['#rows'][$code] = [ + [ + 'data' => [ + '#type' => 'dropbutton', + '#links' => [ + 'edit' => [ + 'title' => $this->t('Edit'), + 'url' => Url::fromRoute('origins_translations.settings.languages.edit', ['code' => $code]), + ], + 'toggle' => [ + 'title' => $this->t('Enable/Disable'), + 'url' => Url::fromRoute('origins_translations.settings.languages.toggle', ['code' => $code]), + ], + ], + ], + ], + $language['0'], + ($language['1']) ? $this->t('True') : $this->t('False'), + $language['2'], + $language['3'], + ]; + } + + return $build; + } + + /** + * Toggle method for enabling or disabling a language. + */ + public function toggle() { + $lang_code = $this->routeMatch->getParameter('code'); + + $languages = $this->config('origins_translations.languages')->getRawData(); + + $languages[$lang_code][1] = !$languages[$lang_code][1]; + + $this->configFactory->getEditable('origins_translations.languages')->setData($languages)->save(); + + return $this->redirect('origins_translations.settings.languages'); + + } + +} diff --git a/origins_translations/src/Controller/OriginsTranslationsPageController.php b/origins_translations/src/Controller/OriginsTranslationsPageController.php new file mode 100644 index 00000000..ed21252e --- /dev/null +++ b/origins_translations/src/Controller/OriginsTranslationsPageController.php @@ -0,0 +1,33 @@ + 'processed_text', + '#text' => $this->config('origins_translations.settings')->get('content')['value'], + '#format' => $this->config('origins_translations.settings')->get('content')['format'], + ]; + + return $build; + } + + /** + * Title callback. + */ + public function getTitle() { + return $this->config('origins_translations.settings')->get('title'); + } + +} diff --git a/origins_translations/src/Controller/OriginsTranslationsUiController.php b/origins_translations/src/Controller/OriginsTranslationsUiController.php new file mode 100644 index 00000000..b3ca9ba8 --- /dev/null +++ b/origins_translations/src/Controller/OriginsTranslationsUiController.php @@ -0,0 +1,60 @@ +utilities = $utilities; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('origins_translations.utilities') + ); + } + + /** + * Returns a translated title if present in the configuration. + */ + public function title(Request $request) { + $response = new Response(); + + $config = $this->config('origins_translations.languages'); + $languages = $config->getRawData(); + $code = strtolower($request->get('code')); + + if (array_key_exists($code, $languages)) { + return $response->setContent($languages[$code][2]); + } + else { + return $response->setContent('Translate this page'); + } + } + +} diff --git a/origins_translations/src/Form/LanguageEditForm.php b/origins_translations/src/Form/LanguageEditForm.php new file mode 100644 index 00000000..50aed381 --- /dev/null +++ b/origins_translations/src/Form/LanguageEditForm.php @@ -0,0 +1,76 @@ +getRouteMatch()->getParameter('code'); + + $languages = $this->config('origins_translations.languages')->getRawData(); + + $language = $languages[$lang_code]; + + $form['title'] = [ + '#type' => 'html_tag', + '#tag' => 'h2', + '#value' => $this->t("Translations for @language", ['@language' => $language[0]]), + ]; + + $form['translation_this_page'] = [ + '#type' => 'textfield', + '#title' => $this->t('"Translate this page"'), + '#description' => $this->t('Translate via Google translate', ['@google-translate' => 'https://translate.google.co.uk']), + '#default_value' => $language[2], + ]; + + $form['translation_select'] = [ + '#type' => 'textfield', + '#title' => $this->t('"Select a language"'), + '#description' => $this->t('Translate via Google translate', ['@google-translate' => 'https://translate.google.co.uk']), + '#default_value' => $language[3], + ]; + + return parent::buildForm($form, $form_state); + } + + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + $values = $form_state->getValues(); + $lang_code = $this->getRouteMatch()->getParameter('code'); + $languages = $this->config('origins_translations.languages')->getRawData(); + + $languages[$lang_code][2] = trim($values['translation_this_page']); + $languages[$lang_code][3] = trim($values['translation_select']); + + $this->configFactory()->getEditable('origins_translations.languages')->setData($languages)->save(); + parent::submitForm($form, $form_state); + } + +} diff --git a/origins_translations/src/Form/LanguageSelectorForm.php b/origins_translations/src/Form/LanguageSelectorForm.php new file mode 100644 index 00000000..30910fe5 --- /dev/null +++ b/origins_translations/src/Form/LanguageSelectorForm.php @@ -0,0 +1,145 @@ +utilities = $utilities; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('origins_translations.utilities') + ); + } + + /** + * {@inheritdoc} + */ + public function getFormId() { + return 'origins_translations_translation_selector'; + } + + /** + * {@inheritdoc} + */ + public function buildForm(array $form, FormStateInterface $form_state) { + $request = $this->getRequest(); + $url = $this->config('origins_translations.settings')->get('domain'); + + // If the domain is set we need to append the current path. + if (!empty($url)) { + $url .= $request->getPathInfo(); + } + else { + $url = $request->getUri(); + } + + $wrapper_id = Html::getUniqueId('translations-select-wrapper'); + + // Provide a link to the translations page for when the browser doesn't + // have Javascript enabled. This will be hidden if JS is enabled. + $form['translations-link'] = [ + '#type' => 'link', + '#title' => $this->t('Translate this page'), + '#url' => Url::fromRoute('origins_translations.translations-page', ['url' => $url]), + '#attributes' => ['class' => ['origins-translation-link']], + ]; + + // Provide a button for AJAX callbacks when Javascript is enabled. + // We can't bind an AJAX call to the link element above because of this bug + // in Drupal core: https://www.drupal.org/project/drupal/issues/2915954 + $form['translations-button'] = [ + '#type' => 'button', + '#value' => $this->t('Translate this page'), + '#attributes' => ['class' => ['origins-translation-button', 'hidden']], + '#attached' => ['library' => ['origins_translations/origins_translations.link_ui']], + '#ajax' => [ + 'callback' => '::displayLanguageOptions', + 'wrapper' => $wrapper_id, + ], + '#suffix' => '
    ', + ]; + + return $form; + } + + /** + * AJAX callback to display a select list of languages. + */ + public function displayLanguageOptions($form, FormStateInterface $form_state) { + $request = $this->getRequest(); + $languages = $this->utilities->getActiveLanguages(); + $code = substr($request->headers->get('accept-language'), 0, 2); + + // Allow for Simplified (zh-cn) and Traditional (zh-tw) Chinese. + if ($code === 'zh') { + $code = strtolower(substr($request->headers->get('accept-language'), 0, 5)); + } + + $url = $this->config('origins_translations.settings')->get('domain'); + + // If the domain is set we need to append the current path. + if (!empty($url)) { + $url .= $request->getPathInfo(); + } + else { + $url = $request->getUri(); + } + + // Provide a translation for 'Select a language' if available for the + // detected browser language. + if (array_key_exists($code, $languages) && strpos($code, 'en') !== 0) { + $translations[''] = $languages[$code][3]; + } + else { + $translations[''] = 'Select a language'; + } + + foreach ($languages as $code => $language) { + $translations[$code . '&u=' . $url] = $language[0]; + } + + $form['translation-select'] = [ + '#type' => 'select', + '#options' => $translations, + '#attributes' => ['class' => ['origins-translation-select']], + ]; + return $form['translation-select']; + } + + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + // Method stub to comply with interface. + } + +} diff --git a/origins_translations/src/Form/SettingsForm.php b/origins_translations/src/Form/SettingsForm.php new file mode 100644 index 00000000..87d774cb --- /dev/null +++ b/origins_translations/src/Form/SettingsForm.php @@ -0,0 +1,102 @@ +state = $state; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container) { + return new static( + $container->get('config.factory'), + $container->get('state') + ); + } + + /** + * {@inheritdoc} + */ + public function getFormId() { + return 'origins_translations_settings'; + } + + /** + * {@inheritdoc} + */ + protected function getEditableConfigNames() { + return ['origins_translations.settings']; + } + + /** + * {@inheritdoc} + */ + public function buildForm(array $form, FormStateInterface $form_state) { + + $form['domain'] = [ + '#type' => 'textfield', + '#title' => $this->t('Replace domain'), + '#description' => $this->t("Typically you would enter the live site domain if using this on a development site which Google Translate won't have access to."), + '#default_value' => $this->config('origins_translations.settings')->get('domain'), + ]; + + return parent::buildForm($form, $form_state); + } + + /** + * {@inheritdoc} + */ + public function validateForm(array &$form, FormStateInterface $form_state) { + $domain = trim($form_state->getValue('domain')); + + if (!empty($domain) && UrlHelper::isValid($domain) === FALSE) { + $form_state->setErrorByName('domain', $this->t('Domain must be a valid URL.')); + } + + parent::validateForm($form, $form_state); + } + + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + $this->configFactory()->getEditable('origins_translations.settings') + ->set('domain', trim($form_state->getValue('domain'), ' /')) + ->save(); + + $this->state->set('origins_translations.settings.apikey', trim($form_state->getValue('apikey'))); + + parent::submitForm($form, $form_state); + } + +} diff --git a/origins_translations/src/Form/TranslationsPageForm.php b/origins_translations/src/Form/TranslationsPageForm.php new file mode 100644 index 00000000..142ac58c --- /dev/null +++ b/origins_translations/src/Form/TranslationsPageForm.php @@ -0,0 +1,61 @@ + 'textfield', + '#title' => $this->t('Title'), + '#required' => TRUE, + '#default_value' => $this->config('origins_translations.settings')->get('title'), + ]; + + $form['content'] = [ + '#type' => 'text_format', + '#title' => $this->t('Content'), + '#required' => TRUE, + '#format' => $this->config('origins_translations.settings')->get('content')['format'], + '#default_value' => $this->config('origins_translations.settings')->get('content')['value'], + ]; + + return parent::buildForm($form, $form_state); + } + + /** + * {@inheritdoc} + */ + public function submitForm(array &$form, FormStateInterface $form_state) { + $this->configFactory()->getEditable('origins_translations.settings') + ->set('title', $form_state->getValue('title')) + ->set('content', $form_state->getValue('content')) + ->save(); + parent::submitForm($form, $form_state); + } + +} diff --git a/origins_translations/src/Plugin/Block/OriginsTranslationBlock.php b/origins_translations/src/Plugin/Block/OriginsTranslationBlock.php new file mode 100644 index 00000000..9d385c4c --- /dev/null +++ b/origins_translations/src/Plugin/Block/OriginsTranslationBlock.php @@ -0,0 +1,91 @@ +config = $config_factory->get('origins_translations.settings'); + $this->request = $request; + $this->formBuilder = $form_builder; + } + + /** + * {@inheritdoc} + */ + public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { + return new static( + $configuration, + $plugin_id, + $plugin_definition, + $container->get('config.factory'), + $container->get('request_stack')->getCurrentRequest(), + $container->get('form_builder'), + ); + } + + /** + * {@inheritdoc} + */ + public function build() { + + $build = $this->formBuilder->getForm('Drupal\origins_translations\Form\LanguageSelectorForm'); + + return $build; + } + +} diff --git a/origins_translations/src/Utilities.php b/origins_translations/src/Utilities.php new file mode 100644 index 00000000..018c8aed --- /dev/null +++ b/origins_translations/src/Utilities.php @@ -0,0 +1,41 @@ +configFactory = $config_factory; + } + + /** + * Returns languages from the configuration that are set to 'enabled'. + */ + public function getActiveLanguages() { + $config = $this->configFactory->get('origins_translations.languages'); + + $languages = $config->getRawData(); + unset($languages['_core']); + + return array_filter($languages, static fn($language) => $language['1'] === TRUE); + } + +} diff --git a/origins_workflow/tests/src/Functional/AuditTest.php b/origins_workflow/tests/src/Functional/AuditTest.php index 472a50aa..9144fd88 100644 --- a/origins_workflow/tests/src/Functional/AuditTest.php +++ b/origins_workflow/tests/src/Functional/AuditTest.php @@ -27,6 +27,15 @@ class AuditTest extends BrowserTestBase { */ protected $profile = 'test_profile'; + /** + * Drupal\Tests\BrowserTestBase::$defaultTheme is required. See + * https://www.drupal.org/node/3083055, which includes recommendations + * on which theme to use. + * + * @var string + */ + protected $defaultTheme = 'classy'; + /** * The entity type manager. *