diff options
Diffstat (limited to 'lib/SimpleSAML/XHTML/Template.php')
| -rw-r--r-- | lib/SimpleSAML/XHTML/Template.php | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php index 138423c..af97162 100644 --- a/lib/SimpleSAML/XHTML/Template.php +++ b/lib/SimpleSAML/XHTML/Template.php @@ -38,6 +38,13 @@ class SimpleSAML_XHTML_Template */ private $template = 'default.php'; + /** + * The template name. + * + * @var string + */ + private $twig_template; + /* * Main Twig namespace, to avoid misspelling it *again* */ @@ -70,7 +77,7 @@ class SimpleSAML_XHTML_Template */ private function normalizeTemplateName($templateName) { - if (strripos($templateName, '.twig.html')) { + if (strripos($templateName, '.twig')) { return $templateName; } $phppos = strripos($templateName, '.php'); @@ -81,7 +88,7 @@ class SimpleSAML_XHTML_Template if ($tplpos) { $templateName = substr($templateName, 0, $tplpos); } - return $templateName.'.twig.html'; + return $templateName.'.twig'; } @@ -560,6 +567,18 @@ class SimpleSAML_XHTML_Template /** + * Wrap Language->noop to mark a tag for translation but actually do it later. + * + * @see \SimpleSAML\Locale\Translate::noop() + * @deprecated This method will be removed in SSP 2.0. Please use \SimpleSAML\Locale\Translate::t() instead. + */ + public function noop($tag) + { + return $this->translator->noop($tag); + } + + + /** * Wrap Language->t to translate tag into the current language, with a fallback to english. * * @see \SimpleSAML\Locale\Translate::t() |