Introduce new attribute translation function.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2581 44740490-163a-0410-bde0-09ae8108e29a

lib/SimpleSAML/XHTML/Template.php

@@ -295,6 +295,29 @@ class SimpleSAML_XHTML_Template {
 	}
 
 
+	/**
+	 * Translate a attribute name.
+	 *
+	 * @param string $name  The attribute name.
+	 * @return string  The translated attribute name, or the original attribute name if no translation was found.
+	 */
+	public function getAttributeTranslation($name) {
+
+		/* Normalize attribute name. */
+		$normName = strtolower($name);
+		$normName = str_replace(":", "_", $normName);
+
+		/* Search the default attribute dictionary. */
+		$dict = $this->getDictionary('attributes');
+		if (array_key_exists('attribute_' . $normName, $dict)) {
+			return $this->getTranslation($dict['attribute_' . $normName]);
+		}
+
+		/* No translations found. */
+		return $name;
+	}
+
+
 	/**
 	 * Translate a tag into the current language, with a fallback to english.
 	 *

modules/consent/templates/consentform.php

@@ -137,10 +137,7 @@ function present_attributes($t, $attributes, $nameParent) {
 	
 	foreach ($attributes as $name => $value) {
 		$nameraw = $name;
-		$nameTag = '{attributes:attribute_' . $parentStr . str_replace(":", "_", strtolower($name) ) . '}';
-		if ($t->getTag($nameTag) !== NULL) {
-			$name = $t->t($nameTag);
-		}
+		$name = $t->getAttributeTranslation($nameraw);
 		
 		if (preg_match('/^child_/', $nameraw)) {
 			// Insert child table

modules/consentAdmin/templates/consentadmin.php

@@ -99,7 +99,7 @@ TRSTART;
 				if (isset($this->data['attribute_' . htmlspecialchars(strtolower($name)) ])) {
 				  $name = $this->data['attribute_' . htmlspecialchars(strtolower($name))];
 				}
-				$name = $this->t('attribute_'.strtolower($name)); // translate
+				$name = $this->getAttributeTranslation($name); // translate
 				if (sizeof($value) > 1) {
 						echo "<li>" . htmlspecialchars($name) . ":\n<ul>\n";
 						foreach ($value AS $v) {

templates/status.php

@@ -62,11 +62,8 @@ function present_attributes($t, $attributes, $nameParent) {
 	foreach ($attributes as $name => $value) {
 	
 		$nameraw = $name;
-		$nameTag = '{attributes:attribute_' . $parentStr . str_replace(":", "_", strtolower($name) ) . '}';
-		if ($t->getTag($nameTag) !== NULL) {
-			$name = $t->t($nameTag);
-		}
-		
+		$name = $t->getAttributeTranslation($nameraw);
+
 		if (preg_match('/^child_/', $nameraw)) {
 			$parentName = preg_replace('/^child_/', '', $nameraw);
 			foreach($value AS $child) {