Refactor translation methods for PHP's implementation of Gettext.

lib/SimpleSAML/Locale/Translate.php

@@ -469,7 +469,7 @@ class Translate
     }
 
 
-    public static function translateSingular($original)
+    public static function translateSingularPHPGettext($original)
     {
         $text = \Gettext\BaseTranslator::$current->gettext($original);
 
@@ -483,7 +483,7 @@ class Translate
     }
 
 
-    public static function translatePlural($original, $plural, $value)
+    public static function translatePluralPHPGettext($original, $plural, $value)
     {
         $text = \Gettext\BaseTranslator::$current->ngettext($original, $plural, $value);
 

lib/SimpleSAML/XHTML/Template.php

@@ -174,8 +174,11 @@ class SimpleSAML_XHTML_Template
 
         // set up translation
         if ($this->localization->i18nBackend === 'gettext/gettext') {
-            $options['translation_function'] = array('\SimpleSAML\Locale\Translate', 'translateSingular');
-            $options['translation_function_plural'] = array('\SimpleSAML\Locale\Translate', 'translatePlural');
+            $options['translation_function'] = array('\SimpleSAML\Locale\Translate', 'translateSingularPHPGettext');
+            $options['translation_function_plural'] = array(
+                '\SimpleSAML\Locale\Translate',
+                'translatePluralPHPGettext'
+            );
         } // TODO: add a branch for the old SimpleSAMLphp backend
 
         $twig = new Twig_Environment($loader, $options);