Merge branch 'dev-context-translator' into dev-datetime-period

.github/workflows/php-psr.yml

@@ -28,7 +28,7 @@ jobs:
         name: Test
       - if: failure()
         name: Failure output
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: output
           path: tests/**/*.actual

.github/workflows/php.yml

@@ -27,13 +27,13 @@ jobs:
       - run: composer run-script testCoverage
         name: Test
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: code-coverage-report
           path: coverage.html
       - if: failure()
         name: Failure output
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: output
           path: tests/**/*.actual

src/Components/DIComponent.php

@@ -5,7 +5,8 @@
 namespace Fykosak\Utils\Components;
 
 use Fykosak\Utils\Localization\GettextTranslator;
-use Nette\Application\UI\{Control, Template};
+use Nette\Application\UI\Control;
+use Nette\Application\UI\Template;
 use Nette\DI\Container;
 
 /**
@@ -37,6 +38,7 @@ protected function createTemplate(): Template
         /** @var \Nette\Bridges\ApplicationLatte\Template $template */
         $template = parent::createTemplate();
         $template->setTranslator($this->translator);
+        $template->translator = $this->translator;
         return $template;
     }
 }

src/Localization/GettextTranslator.php

@@ -6,10 +6,18 @@
 
 use Nette\Localization\Translator;
 
+/**
+ * @phpstan-template TLang of string
+ */
 class GettextTranslator implements Translator
 {
+    /** @phpstan-var  \BackedEnum&LangEnum<TLang> */
     public LangEnum & \BackedEnum $lang;
 
+
+    /** @phpstan-var array<TLang,string> */
+    public array $locales;
+
     /**
      * @phpstan-param class-string<LangEnum>|string $langEnumClass
      */
@@ -19,6 +27,8 @@ public function __construct(
     }
 
     /**
+     *
+     * @param TLang $lang ISO 639-1
      * @throws UnsupportedLanguageException
      */
     public function setLang(LangEnum & \BackedEnum $lang): void
@@ -38,14 +48,31 @@ public function setLang(LangEnum & \BackedEnum $lang): void
     }
 
     /**
-     * @param mixed|string $message
+     * @phpstan-template TValue
+     * @phpstan-param array<TLang,TValue>|LangMap<TLang,TValue> $map
+     * @phpstan-return TValue
+     */
+    public function getVariant(array|LangMap $map)
+    {
+        $this->lang->getVariant($map);
+    }
+
+    /**
+     * @param array|LangMap|string|null $message
      * @param string|int $parameters
      */
     public function translate($message, ...$parameters): string
     {
+
         if ($message === '' || $message === null) {
             return '';
         }
+        if (is_array($message)) {
+            return (string)$this->getVariant($message);
+        }
+        if ($message instanceof LangMap) {
+            return (string)$this->getVariant($message);
+        }
         if (isset($parameters[0])) {
             return ngettext($message, $message, (int)$parameters[0]);
         } else {

src/Localization/LangEnum.php

@@ -4,8 +4,14 @@
 
 namespace Fykosak\Utils\Localization;
 
+/**
+ * @phpstan-template TLang of string
+ */
 interface LangEnum
 {
+    /**
+     * @phpstan-return array<TLang,string>
+     */
     public static function getLocales(): array;
 
     public function getLocaleDir(): string;

src/Localization/LangMap.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fykosak\Utils\Localization;
+
+/**
+ * @phpstan-template TLang of string
+ * @phpstan-template TValue
+ */
+class LangMap
+{
+    /**
+     * @phpstan-var array<TLang,TValue>
+     */
+    protected array $variants;
+
+    /**
+     * @phpstan-param array<TLang,TValue> $variants
+     */
+    public function __construct(array $variants)
+    {
+        $this->variants = $variants;
+    }
+
+    /**
+     * @phpstan-param TLang $key
+     * @phpstan-return TValue
+     */
+    public function get(string $key): mixed
+    {
+        return $this->variants[$key] ?? null;
+    }
+
+    /**
+     * @phpstan-return array<TLang,TValue>
+     */
+    public function __serialize(): array
+    {
+        return $this->variants;
+    }
+}

src/Localization/LangTrait.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fykosak\Utils\Localization;
+
+/**
+ * @phpstan-template TLang of string
+ */
+trait LangTrait
+{
+    /**
+     * @phpstan-template TValue
+     * @phpstan-param array<TLang,TValue>|LangMap<TLang,TValue> $map
+     * @phpstan-return TValue
+     */
+    final public function getVariant(array|LangMap $map): mixed
+    {
+        if ($map instanceof LangMap) {
+            return $map->get($this->value);
+        } else {
+            return $map[$this->value];
+        }
+    }
+}