diff --git a/cypress/tests/integration/Pubmed.cy.js b/cypress/tests/integration/Pubmed.cy.js index 9988fec38bf..437abe028e6 100644 --- a/cypress/tests/integration/Pubmed.cy.js +++ b/cypress/tests/integration/Pubmed.cy.js @@ -18,7 +18,7 @@ describe('Pubmed tests', function () { .then((win) => { const csrfToken = win.pkp.currentUser.csrfToken; cy.request({ - url: '/index.php/publicknowledge/management/importexport/plugin/PubMedExportPlugin/exportSubmissions', + url: '/index.php/publicknowledge/en/management/importexport/plugin/PubMedExportPlugin/exportSubmissions', method: 'POST', headers: { 'X-Csrf-Token': csrfToken diff --git a/cypress/tests/integration/Z_ArticleViewDCMetadata.cy.js b/cypress/tests/integration/Z_ArticleViewDCMetadata.cy.js index cfcde4ed50e..1b49ee62aa2 100644 --- a/cypress/tests/integration/Z_ArticleViewDCMetadata.cy.js +++ b/cypress/tests/integration/Z_ArticleViewDCMetadata.cy.js @@ -384,7 +384,7 @@ describe('Article View Metadata - DC Plugin', function() { return cy.submitSubmissionWithApi(submission.id, this.csrfToken); }) .then(xhr => { - cy.visit('/index.php/publicknowledge/workflow/index/' + submission.id + '/1'); + cy.visit('/index.php/publicknowledge/en/workflow/index/' + submission.id + '/1'); }); @@ -481,7 +481,7 @@ describe('Article View Metadata - DC Plugin', function() { }); it('Tests if Header DC Metadata are present and consistent', function() { - cy.visit('/index.php/publicknowledge/article/view/' + submission.urlPath); + cy.visit('/index.php/publicknowledge/en/article/view/' + submission.urlPath); cy.get('meta[name^="DC."]').each((item, index, list) => { cy.wrap(item) diff --git a/lib/pkp b/lib/pkp index 54e54ca0f73..101a0978d3c 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 54e54ca0f730ee02b35a47835738ba00b4d2e2c9 +Subproject commit 101a0978d3ccef52855916017d95bbaf75eef018 diff --git a/pages/user/index.php b/pages/user/index.php index 3eed7a68315..b085689cbd8 100644 --- a/pages/user/index.php +++ b/pages/user/index.php @@ -23,7 +23,6 @@ // case 'index': case 'subscriptions': - case 'setLocale': case 'authorizationDenied': case 'purchaseSubscription': case 'payPurchaseSubscription': diff --git a/plugins/blocks/languageToggle/LanguageToggleBlockPlugin.php b/plugins/blocks/languageToggle/LanguageToggleBlockPlugin.php index 4e5b1e5b994..0bdef8503fb 100644 --- a/plugins/blocks/languageToggle/LanguageToggleBlockPlugin.php +++ b/plugins/blocks/languageToggle/LanguageToggleBlockPlugin.php @@ -85,10 +85,8 @@ public function getContents($templateMgr, $request = null) $templateMgr->assign('languageToggleNoUser', true); } - if (!empty($locales)) { - $templateMgr->assign('enableLanguageToggle', true); - $templateMgr->assign('languageToggleLocales', $locales); - } + $templateMgr->assign('enableLanguageToggle', count($locales) > 1); + $templateMgr->assign('languageToggleLocales', $locales); return parent::getContents($templateMgr, $request); } diff --git a/plugins/blocks/languageToggle/templates/block.tpl b/plugins/blocks/languageToggle/templates/block.tpl index 24cbc4d9832..4edd0ed1a02 100644 --- a/plugins/blocks/languageToggle/templates/block.tpl +++ b/plugins/blocks/languageToggle/templates/block.tpl @@ -17,7 +17,7 @@