fix for attributes.po translations (#2576)

monkeyiq · monkeyiq · commit 17f4c09d02f1 · 2025-12-11T11:51:04.000+10:00
* A 2.4 PR of 2575 to see what the CI makes of it in that env. #2575 * it seems that the number of attempted paths in included in the count
diff --git a/src/SimpleSAML/Locale/Localization.php b/src/SimpleSAML/Locale/Localization.php
@@ -84,6 +84,7 @@ public function __construct(
         $this->language = new Language($configuration);
         $this->langcode = $this->language->getPosixLanguage($this->language->getLanguage());
         $this->setupL10N();
+        $this->addAttributeDomains();
     }
 
 
diff --git a/src/SimpleSAML/Locale/Translate.php b/src/SimpleSAML/Locale/Translate.php
@@ -111,7 +111,7 @@ public static function translateSingularGettext(?string $original): string
                     // try attributes.po
                     if ($text === $original) {
                         // @TODO: Fix this to be compatible with PHP 8.4 - domain cannot be an empty string
-                        $text = TranslatorFunctions::getTranslator()->dgettext("", $original);
+                        $text = TranslatorFunctions::getTranslator()->dgettext("attributes", $original);
                     }
                 }
             }
diff --git a/tests/modules/core/src/Controller/ExceptionTest.php b/tests/modules/core/src/Controller/ExceptionTest.php
@@ -86,7 +86,7 @@ public function testErrorURL(string $code, string $ts, string $rp, string $tid,
         Logger::setCaptureLog(false);
 
         $log = Logger::getCapturedLog();
-        self::assertCount(7, $log);
+        self::assertCount(9, $log);
 
         self::assertStringContainsString(
             "A Service Provider reported the following error during authentication:  "

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ public function __construct(`
`84`	`84`	`$this->language = new Language($configuration);`
`85`	`85`	`$this->langcode = $this->language->getPosixLanguage($this->language->getLanguage());`
`86`	`86`	`$this->setupL10N();`
	`87`	`+ $this->addAttributeDomains();`
`87`	`88`	`}`
`88`	`89`
`89`	`90`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public static function translateSingularGettext(?string $original): string`
`111`	`111`	`// try attributes.po`
`112`	`112`	`if ($text === $original) {`
`113`	`113`	`// @TODO: Fix this to be compatible with PHP 8.4 - domain cannot be an empty string`
`114`		`- $text = TranslatorFunctions::getTranslator()->dgettext("", $original);`
	`114`	`+ $text = TranslatorFunctions::getTranslator()->dgettext("attributes", $original);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`}`