From 0edda0fcfb02db4cb73979ce49d047ede22c35cc Mon Sep 17 00:00:00 2001
From: Hanne Moa <hanne.moa@uninett.no>
Date: Wed, 7 Sep 2016 14:32:30 +0200
Subject: [PATCH] Add noop() function for marking translations
---
lib/SimpleSAML/Locale/Translate.php | 15 ++++++++++++++-
lib/SimpleSAML/XHTML/Template.php | 12 ++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/lib/SimpleSAML/Locale/Translate.php b/lib/SimpleSAML/Locale/Translate.php
index dba41a86a..6ffd011a8 100644
--- a/lib/SimpleSAML/Locale/Translate.php
+++ b/lib/SimpleSAML/Locale/Translate.php
@@ -221,6 +221,19 @@ class Translate
}
+ /**
+ * Mark a string for translation without translating it.
+ *
+ * @param string $tag A tag name to mark for translation.
+ *
+ * @return string The tag, unchanged.
+ */
+ public function noop($tag)
+ {
+ return $tag;
+ }
+
+
/**
* Translate a tag into the current language, with a fallback to english.
*
@@ -245,7 +258,7 @@ class Translate
public function t(
$tag,
$replacements = array(),
- $fallbackdefault = true,
+ $fallbackdefault = true, // TODO: remove this for 2.0. Assume true
$oldreplacements = array(), // TODO: remove this for 2.0
$striptags = false // TODO: remove this for 2.0
) {
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index b2fa78042..af9716249 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -566,6 +566,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.
*
--
GitLab