Skip to content
Snippets Groups Projects
Commit 55fe8674 authored by Markus Klein's avatar Markus Klein Committed by Stefan Bürk
Browse files

[TASK] Add language attribute to *.action viewhelpers

This supplements the other viewhelpers already equipped
with this attribute.

Resolves: #101775
Releases: main, 12.4, 11.5
Change-Id: Iadcdb1de591d9d9e56722623cacd1a5cf8fbe0af
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/80836


Reviewed-by: default avatarStefan Bürk <stefan@buerk.tech>
Tested-by: default avatarStefan Bürk <stefan@buerk.tech>
Tested-by: default avatarcore-ci <typo3@b13.com>
parent c4f6c2ca
Branches
Tags
No related merge requests found
...@@ -62,6 +62,7 @@ final class ActionViewHelper extends AbstractTagBasedViewHelper ...@@ -62,6 +62,7 @@ final class ActionViewHelper extends AbstractTagBasedViewHelper
$this->registerArgument('pageUid', 'int', 'Target page. See TypoLink destination'); $this->registerArgument('pageUid', 'int', 'Target page. See TypoLink destination');
$this->registerArgument('pageType', 'int', 'Type of the target page. See typolink.parameter'); $this->registerArgument('pageType', 'int', 'Type of the target page. See typolink.parameter');
$this->registerArgument('noCache', 'bool', 'Set this to disable caching for the target page. You should not need this.'); $this->registerArgument('noCache', 'bool', 'Set this to disable caching for the target page. You should not need this.');
$this->registerArgument('language', 'string', 'link to a specific language - defaults to the current language, use a language ID or "current" to enforce a specific language', false);
$this->registerArgument('section', 'string', 'The anchor to be added to the URI'); $this->registerArgument('section', 'string', 'The anchor to be added to the URI');
$this->registerArgument('format', 'string', 'The requested format, e.g. ".html'); $this->registerArgument('format', 'string', 'The requested format, e.g. ".html');
$this->registerArgument('linkAccessRestrictedPages', 'bool', 'If set, links pointing to access restricted pages will still link to the page even though the page cannot be accessed.'); $this->registerArgument('linkAccessRestrictedPages', 'bool', 'If set, links pointing to access restricted pages will still link to the page even though the page cannot be accessed.');
...@@ -91,6 +92,7 @@ final class ActionViewHelper extends AbstractTagBasedViewHelper ...@@ -91,6 +92,7 @@ final class ActionViewHelper extends AbstractTagBasedViewHelper
$pageUid = (int)$this->arguments['pageUid'] ?: null; $pageUid = (int)$this->arguments['pageUid'] ?: null;
$pageType = (int)($this->arguments['pageType'] ?? 0); $pageType = (int)($this->arguments['pageType'] ?? 0);
$noCache = (bool)($this->arguments['noCache'] ?? false); $noCache = (bool)($this->arguments['noCache'] ?? false);
$language = $this->arguments['language'] ?? null;
$section = (string)$this->arguments['section']; $section = (string)$this->arguments['section'];
$format = (string)$this->arguments['format']; $format = (string)$this->arguments['format'];
$linkAccessRestrictedPages = (bool)($this->arguments['linkAccessRestrictedPages'] ?? false); $linkAccessRestrictedPages = (bool)($this->arguments['linkAccessRestrictedPages'] ?? false);
...@@ -106,6 +108,7 @@ final class ActionViewHelper extends AbstractTagBasedViewHelper ...@@ -106,6 +108,7 @@ final class ActionViewHelper extends AbstractTagBasedViewHelper
->setRequest($request) ->setRequest($request)
->setTargetPageType($pageType) ->setTargetPageType($pageType)
->setNoCache($noCache) ->setNoCache($noCache)
->setLanguage($language)
->setSection($section) ->setSection($section)
->setFormat($format) ->setFormat($format)
->setLinkAccessRestrictedPages($linkAccessRestrictedPages) ->setLinkAccessRestrictedPages($linkAccessRestrictedPages)
......
...@@ -53,6 +53,7 @@ final class ActionViewHelper extends AbstractViewHelper ...@@ -53,6 +53,7 @@ final class ActionViewHelper extends AbstractViewHelper
$this->registerArgument('pageUid', 'int', 'Target page. See TypoLink destination'); $this->registerArgument('pageUid', 'int', 'Target page. See TypoLink destination');
$this->registerArgument('pageType', 'int', 'Type of the target page. See typolink.parameter', false, 0); $this->registerArgument('pageType', 'int', 'Type of the target page. See typolink.parameter', false, 0);
$this->registerArgument('noCache', 'bool', 'Set this to disable caching for the target page. You should not need this.', false); $this->registerArgument('noCache', 'bool', 'Set this to disable caching for the target page. You should not need this.', false);
$this->registerArgument('language', 'string', 'link to a specific language - defaults to the current language, use a language ID or "current" to enforce a specific language', false);
$this->registerArgument('section', 'string', 'The anchor to be added to the URI', false, ''); $this->registerArgument('section', 'string', 'The anchor to be added to the URI', false, '');
$this->registerArgument('format', 'string', 'The requested format, e.g. ".html', false, ''); $this->registerArgument('format', 'string', 'The requested format, e.g. ".html', false, '');
$this->registerArgument('linkAccessRestrictedPages', 'bool', 'If set, links pointing to access restricted pages will still link to the page even though the page cannot be accessed.', false, false); $this->registerArgument('linkAccessRestrictedPages', 'bool', 'If set, links pointing to access restricted pages will still link to the page even though the page cannot be accessed.', false, false);
...@@ -76,6 +77,7 @@ final class ActionViewHelper extends AbstractViewHelper ...@@ -76,6 +77,7 @@ final class ActionViewHelper extends AbstractViewHelper
$pageUid = (int)($arguments['pageUid'] ?? 0); $pageUid = (int)($arguments['pageUid'] ?? 0);
$pageType = (int)($arguments['pageType'] ?? 0); $pageType = (int)($arguments['pageType'] ?? 0);
$noCache = (bool)($arguments['noCache'] ?? false); $noCache = (bool)($arguments['noCache'] ?? false);
$language = $arguments['language'] ?? null;
/** @var string|null $section */ /** @var string|null $section */
$section = $arguments['section'] ?? null; $section = $arguments['section'] ?? null;
/** @var string|null $format */ /** @var string|null $format */
...@@ -99,6 +101,7 @@ final class ActionViewHelper extends AbstractViewHelper ...@@ -99,6 +101,7 @@ final class ActionViewHelper extends AbstractViewHelper
/** @var array|null $arguments */ /** @var array|null $arguments */
$arguments = $arguments['arguments'] ?? []; $arguments = $arguments['arguments'] ?? [];
/** @var UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class); $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$uriBuilder->reset()->setRequest($request); $uriBuilder->reset()->setRequest($request);
...@@ -133,6 +136,8 @@ final class ActionViewHelper extends AbstractViewHelper ...@@ -133,6 +136,8 @@ final class ActionViewHelper extends AbstractViewHelper
$uriBuilder->setLinkAccessRestrictedPages(true); $uriBuilder->setLinkAccessRestrictedPages(true);
} }
$uriBuilder->setLanguage($language);
return $uriBuilder->uriFor($action, $arguments, $controller, $extensionName, $pluginName); return $uriBuilder->uriFor($action, $arguments, $controller, $extensionName, $pluginName);
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment