i18n: allow a theme and module to work together (#2172)

monkeyiq · monkeyiq · commit 126742701572 · 2024-07-13T09:40:07.000+10:00
* i18n: allow a theme and module to work together

* style

A slight update to header includes during the cherry pick
diff --git a/src/SimpleSAML/Locale/Localization.php b/src/SimpleSAML/Locale/Localization.php
@@ -16,6 +16,7 @@
 use Gettext\{Translations, Translator, TranslatorFunctions};
 use SimpleSAML\{Configuration, Logger};
 use Symfony\Component\HttpFoundation\File\File;
+use SimpleSAML\Locale\Translate;
 
 use function explode;
 use function is_dir;
@@ -141,6 +142,7 @@ public function addModuleDomain(string $module, string $localeDir = null, string
     public function defaultDomain(string $domain): self
     {
         $this->translator->defaultDomain($domain);
+        Translate::addDefaultDomain($domain);
         return $this;
     }
 
diff --git a/src/SimpleSAML/Locale/Translate.php b/src/SimpleSAML/Locale/Translate.php
@@ -30,6 +30,10 @@ class Translate
      */
     private Language $language;
 
+    /**
+     * A theme and module may exist together as dual default translation domains
+     */
+    private static array $defaultDomains = [];
 
     /**
      * Constructor
@@ -66,6 +70,10 @@ public static function noop(string $tag): string
         return $tag;
     }
 
+    public static function addDefaultDomain(string $domain): void
+    {
+        array_push(self::$defaultDomains, $domain);
+    }
 
     /**
      * Translate a singular text.
@@ -84,9 +92,18 @@ public static function translateSingularGettext(?string $original): string
             $text = TranslatorFunctions::getTranslator()->dgettext("core", $original);
             if ($text === $original) {
                 $text = TranslatorFunctions::getTranslator()->dgettext("messages", $original);
-                // try attributes.po
                 if ($text === $original) {
-                    $text = TranslatorFunctions::getTranslator()->dgettext("", $original);
+                    foreach (self::$defaultDomains as $d) {
+                        $text = TranslatorFunctions::getTranslator()->dgettext($d, $original);
+                        if ($text != $original) {
+                            return $text;
+                        }
+                    }
+
+                    // try attributes.po
+                    if ($text === $original) {
+                        $text = TranslatorFunctions::getTranslator()->dgettext("", $original);
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`use Gettext\{Translations, Translator, TranslatorFunctions};`
`17`	`17`	`use SimpleSAML\{Configuration, Logger};`
`18`	`18`	`use Symfony\Component\HttpFoundation\File\File;`
	`19`	`+use SimpleSAML\Locale\Translate;`
`19`	`20`
`20`	`21`	`use function explode;`
`21`	`22`	`use function is_dir;`
`@@ -141,6 +142,7 @@ public function addModuleDomain(string $module, string $localeDir = null, string`
`141`	`142`	`public function defaultDomain(string $domain): self`
`142`	`143`	`{`
`143`	`144`	`$this->translator->defaultDomain($domain);`
	`145`	`+ Translate::addDefaultDomain($domain);`
`144`	`146`	`return $this;`
`145`	`147`	`}`
`146`	`148`