laminas#7: Pass translated message through placeholder compile

TotalWipeOut · May 16, 2024 · 56f4038 · 56f4038
1 parent f5413d6
commit 56f4038
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Translator/PlaceholderPluginManager.php b/src/Translator/PlaceholderPluginManager.php
@@ -21,12 +21,13 @@
  *
  * @template InstanceType of Placeholder\PlaceholderInterface
  * @extends AbstractPluginManager<InstanceType>
- * @method Placeholder\PlaceholderInterface get(string $name)
+ * @method Placeholder\PlaceholderInterface get(string $name, ?array $options = null)
  */
 class PlaceholderPluginManager extends AbstractPluginManager
 {
     /** @inheritDoc */
     protected $aliases = [
+        'segment'    => Placeholder\SegmentPlaceholder::class,
         'colon'      => Placeholder\SegmentPlaceholder::class,
         'laravel'    => Placeholder\SegmentPlaceholder::class,
         'handlebar'  => Placeholder\HandlebarPlaceholder::class,

diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -446,7 +446,13 @@ protected function getTranslatedMessage(
         }
 
         if (isset($this->messages[$textDomain][$locale][$message])) {
-            return $this->messages[$textDomain][$locale][$message];
+            return $this->placeholder ?
+                $this->placeholder->compile(
+                    $locale,
+                    $this->messages[$textDomain][$locale][$message],
+                    $placeholders
+                ) :
+                $this->messages[$textDomain][$locale][$message];
         }
 
         /**
@@ -463,7 +469,13 @@ protected function getTranslatedMessage(
          * ]
          */
         if (isset($this->messages[$textDomain][$locale][$textDomain . "\x04" . $message])) {
-            return $this->messages[$textDomain][$locale][$textDomain . "\x04" . $message];
+            return $this->placeholder ?
+                $this->placeholder->compile(
+                    $locale,
+                    $this->messages[$textDomain][$locale][$textDomain . "\x04" . $message],
+                    $placeholders
+                ) :
+                $this->messages[$textDomain][$locale][$textDomain . "\x04" . $message];
         }
 
         if ($this->isEventManagerEnabled()) {