Skip to content
This repository has been archived by the owner on Aug 16, 2024. It is now read-only.

fix: Fix url helper calls in 2 templates #28

Merged
merged 3 commits into from
Jan 26, 2024
Merged

fix: Fix url helper calls in 2 templates #28

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8e62c3
fix: Other template fixes where getHelperPluginManager was being used…
fibble Jan 24, 2024
a3877d3
fix: Corrects usage of url helper in 2 refactored templates. Erroneou…
fibble Jan 25, 2024
5dc7975
Merge branch 'main' into fix-url-helper-call
fibble Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion module/Olcs/view/olcs/user-forgot-username/check-email.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<?php echo $this->translateReplace(
'user-forgot-username.page.check-email.content',
[
$this->getHelperPluginManager()->get('Helper\Url')->fromRoute('auth/login/GET')
$this->url('auth/login/GET')
]
); ?>
</p>
Expand Down
2 changes: 1 addition & 1 deletion module/Olcs/view/olcs/user-registration/check-email.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ echo $this->partial(
<?php echo $this->translateReplace(
'user-registration.page.check-email.content',
[
$this->getHelperPluginManager()->get('Helper\Url')->fromRoute('auth/login/GET')
$this->url('auth/login/GET')
]
); ?>
</p>
Expand Down
8 changes: 3 additions & 5 deletions module/Olcs/view/pages/lva-details.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,17 @@ echo $this->partial(
<?php echo $this->form($filterForm); ?>
<?php
$statusTranslated = $this->translate($this->status);
/** @var \Common\Service\Helper\TranslationHelperService $translator */
$translator = $this->getHelperPluginManager()->get('Helper\Translation');

if ($this->lva === 'application') {
echo $translator->translateReplace(
echo $this->translateReplace(
'markup-application-right-column', [$this->escapeHtml($reference), $statusTranslated]
);
} elseif ($this->lva === 'variation') {
echo $translator->translateReplace(
echo $this->translateReplace(
'markup-variation-right-column', [$this->escapeHtml($reference), $statusTranslated]
);
} elseif ($this->lva === 'licence') {
echo $translator->translateReplace(
echo $this->translateReplace(
'markup-licence-right-column',
[
$this->escapeHtml($this->licNo),
Expand Down