API Update translation to use symfony 6

silverstripe · Sep 1, 2022 · f8c7dbd · f8c7dbd
1 parent e6fb963
commit f8c7dbd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/i18n/Messages/Symfony/FlushInvalidatedResource.php b/src/i18n/Messages/Symfony/FlushInvalidatedResource.php
@@ -27,7 +27,7 @@ public function getResource()
         return null;
     }
 
-    public function isFresh($timestamp)
+    public function isFresh(int $timestamp): bool
     {
         // Check mtime of canary
         $canary = static::canary();

diff --git a/src/i18n/Messages/Symfony/ModuleYamlLoader.php b/src/i18n/Messages/Symfony/ModuleYamlLoader.php
@@ -7,6 +7,7 @@
 use SilverStripe\i18n\i18n;
 use SilverStripe\i18n\Messages\Reader;
 use Symfony\Component\Translation\Loader\ArrayLoader;
+use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\PluralizationRules;
 
 /**
@@ -23,7 +24,7 @@ class ModuleYamlLoader extends ArrayLoader
      */
     protected $reader = null;
 
-    public function load($resource, $locale, $domain = 'messages')
+    public function load(mixed $resource, string $locale, string $domain = 'messages'): MessageCatalogue
     {
         $messages = [];
         foreach ($resource as $path) {

diff --git a/src/i18n/Messages/Symfony/SymfonyMessageProvider.php b/src/i18n/Messages/Symfony/SymfonyMessageProvider.php
@@ -121,11 +121,11 @@ public function pluralise($entity, $default, $injection, $count)
         ));
 
         // Pass to symfony translator
-        $result = $this->getTranslator()->transChoice($entity, $count, $arguments, 'messages', $locale);
+        $result = $this->getTranslator()->trans($entity, $arguments, 'messages', $locale);
 
         // Manually inject default if no translation found
         if ($entity === $result) {
-            $result = $this->getTranslator()->transChoice($default, $count, $arguments, 'messages', $locale);
+            $result = $this->getTranslator()->trans($default, $arguments, 'messages', $locale);
         }
 
         return $result;