Use a placeholder in tracking code sentence in shipment email

jacquesbh · jacquesbh · commit 10601efafc72 · 2020-06-28T20:01:40.000+02:00
diff --git a/src/Sylius/Behat/Context/Ui/EmailContext.php b/src/Sylius/Behat/Context/Ui/EmailContext.php
@@ -151,12 +151,9 @@ public function anEmailWithShipmentDetailsOfOrderShouldBeSentTo(
 
         if ($this->sharedStorage->has('tracking_code')) {
             $this->assertEmailContainsMessageTo(
-                sprintf(
-                    '%s %s %s',
-                    $this->sharedStorage->get('tracking_code'),
-                    $this->translator->trans('sylius.email.shipment_confirmation.tracking_code', [], null, $localeCode),
-                    $this->translator->trans('sylius.email.shipment_confirmation.thank_you_for_transaction', [], null, $localeCode)
-                ),
+                $this->translator->trans('sylius.email.shipment_confirmation.you_can_check_its_location_with_the_tracking_code', [
+                    '%tracking_code%' => $this->sharedStorage->get('tracking_code'),
+                ], null, $localeCode),
                 $recipient
             );
         }
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml
@@ -4,8 +4,7 @@ sylius:
             has_been_sent_using: 'has been sent using'
             subject: 'Shipment confirmation'
             thank_you_for_transaction: 'Thank you for a successful transaction.'
-            tracking_code: 'tracking code.'
-            you_can_check_its_location: 'You can check it''s location with the'
+            you_can_check_its_location_with_the_tracking_code: 'You can check it''s location with the %tracking_code% tracking code.'
             your_order_with_number: 'Your order with number'
     menu:
         admin:
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Email/shipmentConfirmation.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Email/shipmentConfirmation.html.twig
@@ -14,9 +14,10 @@
         </div>
         {% if shipment.tracking is not null %}
             <div style="margin-bottom: 20px;">
-                {{ 'sylius.email.shipment_confirmation.you_can_check_its_location'|trans({}, null, localeCode) }}
-                <span style="color: #1abb9c;">{{ shipment.tracking }}</span>
-                {{ 'sylius.email.shipment_confirmation.tracking_code'|trans({}, null, localeCode) }}
+                {% set tracking_code %}<span style="color: #1abb9c;">{{ shipment.tracking }}</span>{% endset %}
+                {{ 'sylius.email.shipment_confirmation.you_can_check_its_location_with_the_tracking_code'|trans({
+                    '%tracking_code%': tracking_code
+                }, null, localeCode) }}
             </div>
         {% endif %}
         <div>
