Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Bug, EC]: Fix translations in workflows #17252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 16, 2024
Merged

[Bug, EC]: Fix translations in workflows #17252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
383741a
fix translations
kingjia90 Jul 1, 2024
cefb99e
fix translations
kingjia90 Jul 1, 2024
ffbf902
fix translations
kingjia90 Jul 1, 2024
adb1cb6
Apply php-cs-fixer changes
kingjia90 Jul 1, 2024
58a9e09
more bc friendly
kingjia90 Jul 1, 2024
fdba279
Merge remote-tracking branch 'refs/remotes/origin/11.2' into fix-work…
kingjia90 Jul 2, 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
8 changes: 6 additions & 2 deletions bundles/CoreBundle/templates/Workflow/statusinfo/allPlacesStatusInfo.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{# @var places \Pimcore\Workflow\Place\PlaceConfig[] #}
{# @var translator \Symfony\Contracts\Translation\TranslatorInterface #}
{% if lang is not defined %}
{% set lang = 'en' %}
{% endif %}

<div>

{% for place in places %}

<div class="pimcore-workflow-place-indicator" style="background-color: {{ place.backgroundColor }}; color:{{ place.fontColor }}; border: 1px solid {{ place.borderColor }};" title="{{ translator.trans(place.title,[],'admin') }}">
{{ translator.trans(place.label,[],'admin') }}
<div class="pimcore-workflow-place-indicator" style="background-color: {{ place.backgroundColor }}; color:{{ place.fontColor }}; border: 1px solid {{ place.borderColor }};" title="{{ translator.trans(place.title,[],'admin',lang) }}">
{{ translator.trans(place.label,[],'admin',lang) }}
</div>
{% endfor %}
</div>
7 changes: 5 additions & 2 deletions bundles/CoreBundle/templates/Workflow/statusinfo/toolbarStatusInfo.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{# @var places \Pimcore\Workflow\Place\PlaceConfig[] #}
{# @var translator \Symfony\Contracts\Translation\TranslatorInterface #}
{% if lang is not defined %}
{% set lang = 'en' %}
{% endif %}

<div class="pimcore-workflow-place-indicator-wrapper">
{% for place in places %}

<div class="pimcore-workflow-place-indicator" style="background-color: {{ place.backgroundColor }}; color:{{ place.fontColor }}; border: 1px solid {{ place.borderColor }};" title="{{ translator.trans(place.title,[],'admin') }}">
{{ translator.trans(place.label,[],'admin') }}
<div class="pimcore-workflow-place-indicator" style="background-color: {{ place.backgroundColor }}; color:{{ place.fontColor }}; border: 1px solid {{ place.borderColor }};" title="{{ translator.trans(place.title,[],'admin',lang) }}">
{{ translator.trans(place.label,[],'admin',lang) }}
</div>
{% endfor %}
</div>
7 changes: 7 additions & 0 deletions lib/Workflow/Place/StatusInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,16 @@ class StatusInfo

private TranslatorInterface $translator;

private string $userLanguage;

public function __construct(Manager $workflowManager, Environment $twig, TranslatorInterface $translator)
{
$this->workflowManager = $workflowManager;
$this->twig = $twig;
$this->translator = $translator;

$user = \Pimcore\Tool\Admin::getCurrentUser();
$this->userLanguage = $user ? $user->getLanguage() : 'en';
}

public function getToolbarHtml(object $subject): string
Expand All @@ -44,6 +49,7 @@ public function getToolbarHtml(object $subject): string
[
'places' => $places,
'translator' => $this->translator,
'lang' => $this->userLanguage,
]
);
}
Expand All @@ -57,6 +63,7 @@ public function getAllPalacesHtml(object $subject, string $workflowName = null):
[
'places' => $places,
'translator' => $this->translator,
'lang' => $this->userLanguage,
]
);
}
Expand Down