Fix the calls to the old getTranslation() and getAttributeTranslation()...

Fix the calls to the old getTranslation() and getAttributeTranslation() methods from SimpleSAML_XHTML_Template.

modules/consent/templates/consentform.php

@@ -72,7 +72,7 @@ if (array_key_exists('descr_purpose', $this->data['dstMetadata'])) {
         '{consent:consent:consent_purpose}',
         array(
             'SPNAME' => $dstName,
-            'SPDESC' => $this->getTranslation(
+            'SPDESC' => $this->getTranslator()->getPreferredTranslation(
                 SimpleSAML\Utils\Arrays::arrayize(
                     $this->data['dstMetadata']['descr_purpose'],
                     'en'

modules/consentAdmin/templates/consentadmin.php

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

modules/core/templates/frontpage_federation.tpl.php

@@ -54,11 +54,13 @@ if (is_array($this->data['metaentries']['hosted']) && count($this->data['metaent
             echo '<br />Index: '.$hm['metadata-index'];
         }
         if (!empty($hm['name'])) {
-            echo '<br /><strong>'.$this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($hm['name'], 'en')).
+            echo '<br /><strong>'.
+                $this->getTranslator()->getPreferredTranslation(SimpleSAML\Utils\Arrays::arrayize($hm['name'], 'en')).
                 '</strong>';
         }
         if (!empty($hm['descr'])) {
-            echo '<br /><strong>'.$this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($hm['descr'], 'en')).
+            echo '<br /><strong>'.
+                $this->getTranslator()->getPreferredTranslation(SimpleSAML\Utils\Arrays::arrayize($hm['descr'], 'en')).
                 '</strong>';
         }
 
@@ -84,11 +86,13 @@ if (is_array($this->data['metaentries']['remote']) && count($this->data['metaent
                     )
                 ).'">');
             if (!empty($entry['name'])) {
-                echo htmlspecialchars($this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($entry['name'], 'en')));
+                echo htmlspecialchars($this->getTranslator()->getPreferredTranslation(
+                    SimpleSAML\Utils\Arrays::arrayize($entry['name'], 'en')
+                ));
             } elseif (!empty($entry['OrganizationDisplayName'])) {
-                echo htmlspecialchars(
-                    $this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($entry['OrganizationDisplayName'], 'en'))
-                );
+                echo htmlspecialchars($this->getTranslator()->getPreferredTranslation(
+                    SimpleSAML\Utils\Arrays::arrayize($entry['OrganizationDisplayName'], 'en')
+                ));
             } else {
                 echo htmlspecialchars($entry['entityid']);
             }

modules/core/templates/logout-iframe.php

@@ -42,7 +42,7 @@ foreach ($SPs as $assocId => $sp) {
 }
 
 if ($from !== NULL) {
-	$from = $this->getTranslation($from);
+	$from = $this->getTranslator()->getPreferredTranslation($from);
 }
 
 
@@ -99,7 +99,7 @@ echo '<table id="slostatustable">';
 
 foreach ($SPs AS $assocId => $sp) {
 	if (isset($sp['core:Logout-IFrame:Name'])) {
-		$spName = $this->getTranslation($sp['core:Logout-IFrame:Name']);
+		$spName = $this->getTranslator()->getPreferredTranslation($sp['core:Logout-IFrame:Name']);
 	} else {
 		$spName = $assocId;
 	}

modules/discopower/templates/disco-tpl.php

@@ -84,13 +84,13 @@ function getTranslatedName($t, $metadata) {
 		$displayName = $metadata['UIInfo']['DisplayName'];
 		assert('is_array($displayName)'); // Should always be an array of language code -> translation
 		if (!empty($displayName)) {
-			return $t->getTranslation($displayName);
+			return $t->getTranslator()->getPreferredTranslation($displayName);
 		}
 	}
 
 	if (array_key_exists('name', $metadata)) {
 		if (is_array($metadata['name'])) {
-			return $t->getTranslation($metadata['name']);
+			return $t->getTranslator()->getPreferredTranslation($metadata['name']);
 		} else {
 			return $metadata['name'];
 		}