Add a couple of methods to perform translations with PHP's native gettext...

Add a couple of methods to perform translations with PHP's native gettext implementation, and start using them.

lib/SimpleSAML/Locale/Translate.php

@@ -495,4 +495,32 @@ class Translate
 
         return strtr($text, is_array($args[0]) ? $args[0] : $args);
     }
+
+
+    public static function translateSingularNativeGettext($original)
+    {
+        $text = gettext($original);
+
+        if (func_num_args() === 1) {
+            return $text;
+        }
+
+        $args = array_slice(func_get_args(), 1);
+
+        return strtr($text, is_array($args[0]) ? $args[0] : $args);
+    }
+
+
+    public static function translatePluralNativeGettext($original, $plural, $value)
+    {
+        $text = ngettext($original, $plural, $value);
+
+        if (func_num_args() === 3) {
+            return $text;
+        }
+
+        $args = array_slice(func_get_args(), 3);
+
+        return strtr($text, is_array($args[0]) ? $args[0] : $args);
+    }
 }

lib/SimpleSAML/XHTML/Template.php

@@ -168,8 +168,8 @@ class SimpleSAML_XHTML_Template
         $options = array(
             'cache' => $cache,
             'auto_reload' => $auto_reload,
-            'translation_function' => 'gettext',
-            'translation_function_plural' => 'ngettext',
+            'translation_function' => array('\SimpleSAML\Locale\Translate', 'translateSingularNativeGettext'),
+            'translation_function_plural' => array('\SimpleSAML\Locale\Translate', 'translatePluralNativeGettext'),
         );
 
         // set up translation