symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.xml
+4-1Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/identity_translator.xml
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Translation/IdentityTranslator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/IdentityTranslator.php
+19-7Lines changed: 19 additions & 7 deletions b/‎src/Symfony/Component/Translation/IdentityTranslator.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/IdentityTranslator.php
+19-7Lines changed: 19 additions & 7 deletions
@@ -10,7 +10,10 @@
         <service id="Symfony\Component\Translation\TranslatorInterface" alias="translator" />
         <service id="Symfony\Contracts\Translation\TranslatorInterface" alias="translator" />
 
-        <service id="identity_translator" class="Symfony\Component\Translation\IdentityTranslator" />
+        <service id="identity_translator" class="Symfony\Component\Translation\IdentityTranslator">
+            <argument>null</argument>
+            <argument>%kernel.debug%</argument>
+        </service>
         <service id="translator.selector" class="Symfony\Component\Translation\MessageSelector">
             <deprecated>The "%service_id%" service is deprecated since Symfony 4.2, use "identity_translator" instead.</deprecated>
         </service>
 
@@ -25,16 +25,21 @@ class IdentityTranslator implements LegacyTranslatorInterface, TranslatorInterfa
     use TranslatorTrait;
 
     private $selector;
+    private $debug;
 
     /**
-     * @param MessageSelector|null $selector The message selector for pluralization
+     * @param bool $debug
      */
-    public function __construct(MessageSelector $selector = null)
+    public function __construct($debug = true)
     {
-        $this->selector = $selector;
-
-        if (__CLASS__ !== \get_class($this)) {
-            @trigger_error(sprintf('Calling "%s()" is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
+        if (null === $debug || $debug instanceof MessageSelector) {
+            @trigger_error(sprintf('Passing a %s instance or null to %s() is deprecated since Symfony 4.4.', MessageSelector::class, __METHOD__), E_USER_DEPRECATED);
+            $this->selector = $debug;
+            $this->debug = true;
+        } elseif (!\is_bool($debug)) {
+            throw new \TypeError(sprintf('The first argument of %s() must be a boolean.', __METHOD__));
+        } else {
+            $this->debug = $debug;
         }
     }
 
@@ -50,8 +55,15 @@ public function transChoice($id, $number, array $parameters = [], $domain = null
         if ($this->selector) {
             return strtr($this->selector->choose((string) $id, $number, $locale ?: $this->getLocale()), $parameters);
         }
+        try {
+            return $this->trans($id, ['%count%' => $number] + $parameters, $domain, $locale);
+        } catch (\InvalidArgumentException $e) {
+            if ($this->debug) {
+                throw $e;
+            }
 
-        return $this->trans($id, ['%count%' => $number] + $parameters, $domain, $locale);
+            return strtr($id, $parameters);
+        }
     }
 
     private function getPluralizationRule(int $number, string $locale): int