Merge pull request #659 from jyhein/f699

pkp/pkp-lib#699 Show locale in url in multilingual contexts
pkp · Apr 25, 2024 · 89fe381 · 89fe381
2 parents 2fbda9b + 0b9e650
commit 89fe381
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 18 deletions.
diff --git a/cypress/tests/data/60-content/DphillipsSubmission.cy.js b/cypress/tests/data/60-content/DphillipsSubmission.cy.js
@@ -62,7 +62,7 @@ describe('Data suite: Dphillips', function() {
 
 	it('Preprint is not available when unposted', function() {
 		cy.login('dbarnes');
-		cy.visit('/index.php/publicknowledge/workflow/access/' + submission.id);
+		cy.visit('/index.php/publicknowledge/en/workflow/access/' + submission.id);
 		cy.get('#publication-button').click();
 		cy.get('button').contains('Unpost').click();
 		cy.contains('Are you sure you don\'t want this to be posted?');
@@ -72,7 +72,7 @@ describe('Data suite: Dphillips', function() {
 		cy.contains('Signalling Theory Dividends').should('not.exist');
 		cy.logout();
 		cy.request({
-				url: '/index.php/publicknowledge/preprint/view/' + submission.id,
+				url: '/index.php/publicknowledge/en/preprint/view/' + submission.id,
 				failOnStatusCode: false
 			})
 			.then((response) => {
@@ -81,7 +81,7 @@ describe('Data suite: Dphillips', function() {
 
 		// Re-post it
 		cy.login('dbarnes');
-		cy.visit('/index.php/publicknowledge/workflow/access/' + submission.id);
+		cy.visit('/index.php/publicknowledge/en/workflow/access/' + submission.id);
 		cy.get('#publication-button').click();
 		cy.get('.pkpPublication button').contains('Post').click();
 		cy.contains('All requirements have been met.');

diff --git a/cypress/tests/integration/Doi.cy.js b/cypress/tests/integration/Doi.cy.js
@@ -43,7 +43,7 @@ describe('DOI tests', function() {
 
 		cy.log('Check Submission Visibility');
 		// Select a submission
-		cy.visit(`/index.php/publicknowledge/preprint/view/${submissionId}`);
+		cy.visit(`/index.php/publicknowledge/en/preprint/view/${submissionId}`);
 
 		cy.get('section.item.doi')
 			.find('span.value').contains('https://doi.org/10.1234/');
@@ -411,7 +411,7 @@ describe('DOI tests', function() {
 			.click();
 		cy.get('#doisSetup [role="status"]').contains('Saved');
 
-		cy.visit('index.php/publicknowledge/dois');
+		cy.visit('index.php/publicknowledge/en/dois');
 
 		cy.get(
 			`#submission-doi-management .listPanel__item:contains("${articleTitle}") button.expander`

diff --git a/lib/pkp b/lib/pkp
diff --git a/pages/user/index.php b/pages/user/index.php
@@ -22,7 +22,6 @@
     // Misc.
     //
     case 'index':
-    case 'setLocale':
     case 'authorizationDenied':
     case 'toggleHelp':
     case 'getInterests':

diff --git a/plugins/blocks/languageToggle/LanguageToggleBlockPlugin.php b/plugins/blocks/languageToggle/LanguageToggleBlockPlugin.php
@@ -86,10 +86,8 @@ public function getContents($templateMgr, $request = null)
             $templateMgr->assign('languageToggleNoUser', true);
         }
 
-        if (isset($locales) && count($locales) > 1) {
-            $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
@@ -17,7 +17,7 @@
 		<ul>
 			{foreach from=$languageToggleLocales item=localeName key=localeKey}
 				<li class="locale_{$localeKey|escape}{if $localeKey == $currentLocale} current{/if}" lang="{$localeKey|replace:"_":"-"}">
-					<a href="{url router=PKPApplication::ROUTE_PAGE page="user" op="setLocale" path=$localeKey source=$smarty.server.REQUEST_URI}">
+					<a href="{url router=PKPApplication::ROUTE_PAGE page="user" op="setLocale" path=$localeKey}">
 						{$localeName}
 					</a>
 				</li>

diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage
diff --git a/plugins/generic/crossref b/plugins/generic/crossref
diff --git a/plugins/generic/googleScholar b/plugins/generic/googleScholar
diff --git a/plugins/metadata/dc11/filter/Dc11SchemaPreprintAdapter.php b/plugins/metadata/dc11/filter/Dc11SchemaPreprintAdapter.php
@@ -142,7 +142,7 @@ public function &extractMetadataFromDataObject(&$submission)
         // Identifier: URL
         $request = Application::get()->getRequest();
         $includeUrls = $server->getSetting('publishingMode') != \APP\server\Server::PUBLISHING_MODE_NONE;
-        $dc11Description->addStatement('dc:identifier', $request->url($server->getPath(), 'preprint', 'view', [$submission->getBestId()]));
+        $dc11Description->addStatement('dc:identifier', $request->getDispatcher()->url($request, Application::ROUTE_PAGE, $server->getPath(), 'preprint', 'view', [$submission->getBestId()], urlLocaleForPage: ''));
 
         // Language
         collect($galleys)
@@ -156,7 +156,7 @@ public function &extractMetadataFromDataObject(&$submission)
         // full text URLs
         if ($includeUrls) {
             foreach ($galleys as $galley) {
-                $relation = $request->url($server->getPath(), 'preprint', 'view', [$submission->getBestId(), $galley->getBestGalleyId()]);
+                $relation = $request->getDispatcher()->url($request, Application::ROUTE_PAGE, $server->getPath(), 'preprint', 'view', [$submission->getBestId(), $galley->getBestGalleyId()], urlLocaleForPage: '');
                 $dc11Description->addStatement('dc:relation', $relation);
             }
         }

diff --git a/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php b/plugins/oaiMetadataFormats/dc/tests/OAIMetadataFormat_DCTest.php
@@ -36,6 +36,7 @@
 use APP\submission\Submission;
 use Illuminate\Support\LazyCollection;
 use PHPUnit\Framework\MockObject\MockObject;
+use PKP\core\Dispatcher;
 use PKP\core\Registry;
 use PKP\db\DAORegistry;
 use PKP\doi\Doi;
@@ -184,13 +185,25 @@ public function testToXml()
             ->method('url')
             ->will($this->returnCallback(fn ($request, $newContext = null, $handler = null, $op = null, $path = null) => $handler . '-' . $op . '-' . implode('-', $path)));
 
+        // Dispatcher
+        /** @var Dispatcher|MockObject */
+        $dispatcher = $this->getMockBuilder(Dispatcher::class)
+        ->onlyMethods(['url'])
+        ->getMock();
+        $dispatcher->expects($this->any())
+            ->method('url')
+            ->will($this->returnCallback(fn ($request, $shortcut, $newContext = null, $handler = null, $op = null, $path = null) => $handler . '-' . $op . '-' . implode('-', $path)));
+
         // Request
         $requestMock = $this->getMockBuilder(Request::class)
-            ->onlyMethods(['getRouter'])
+            ->onlyMethods(['getRouter', 'getDispatcher'])
             ->getMock();
         $requestMock->expects($this->any())
             ->method('getRouter')
             ->will($this->returnValue($router));
+        $requestMock->expects($this->any())
+            ->method('getDispatcher')
+            ->will($this->returnValue($dispatcher));
         Registry::set('request', $requestMock);
+25 −4		classes/core/Core.php
+4 −2		classes/core/Dispatcher.php
+98 −10		classes/core/PKPPageRouter.php
+3 −2		classes/core/PKPRequest.php
+8 −0		classes/core/PKPRouter.php
+2 −1		classes/observers/events/UsageEvent.php
+15 −3		classes/template/PKPTemplateManager.php
+1 −1		cypress/support/commands.js
+0 −32		pages/user/PKPUserHandler.php
+3 −2		plugins/generic/usageEvent/PKPUsageEventPlugin.php
+34 −0		tests/classes/core/DispatcherTest.php
+23 −0		tests/classes/core/PKPPageRouterTest.php
+5 −5		tests/classes/core/PKPRouterTestCase.php
+3 −3		CitationStyleLanguagePlugin.php
+0 −127		locale/fa/locale.po
+5 −51		locale/it/locale.po
+8 −23		locale/pl/locale.po
+3 −3		pages/CitationStyleLanguageHandler.php