diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php index 4f3abf90152db3c33a17fc3a4182e8862749cf0d..a01ee48ffc56f96cfa90a889ae54572e20a6aebe 100644 --- a/lib/SimpleSAML/Locale/Translate.php +++ b/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); diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php index ee84beff0d907f4ac7a38247c0edf33a9dcbc0a2..268e6dc279481b64f49e74f16298f95f615bf7ae 100644 --- a/lib/SimpleSAML/XHTML/Template.php +++ b/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);