Remove concat: translated header in metadata.php

For #455

modules/adfs/www/idp/metadata.php

@@ -148,7 +148,8 @@ try {
 
         $t->data['clipboard.js'] = true;
         $t->data['available_certs'] = $availableCerts;
-        $t->data['header'] = 'adfs-idp';
+        $t->data['header'] = 'adfs-idp'; // TODO: Replace with headerString in 2.0
+        $t->data['headerString'] = $t->noop('metadata_adfs-idp');
         $t->data['metaurl'] = \SimpleSAML\Utils\HTTP::getSelfURLNoQuery();
         $t->data['metadata'] = htmlspecialchars($metaxml);
         $t->data['metadataflat'] = htmlspecialchars($metaflat);

modules/saml/www/sp/metadata.php

@@ -242,7 +242,8 @@ if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
     $t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
 
     $t->data['clipboard.js'] = true;
-    $t->data['header'] = 'saml20-sp';
+    $t->data['header'] = 'saml20-sp'; // TODO: Replace with headerString in 2.0
+    $t->data['headerString'] = $t->noop('metadata_saml20-sp');
     $t->data['metadata'] = htmlspecialchars($xml);
     $t->data['metadataflat'] = '$metadata['.var_export($entityId, true).'] = '.var_export($metaArray20, true).';';
     $t->data['metaurl'] = $source->getMetadataURL();

templates/metadata.php

 <?php
-$this->data['header'] = $this->t('metadata_'.$this->data['header']);
+$this-data['header'] = $this->t($this->data['headerString']);
 $this->includeAtTemplateBase('includes/header.php'); ?>
     <h2><?php echo $this->data['header']; ?></h2>
     <p><?php echo $this->t('metadata_intro'); ?></p>

www/saml2/idp/metadata.php

@@ -211,7 +211,8 @@ try {
 
         $t->data['clipboard.js'] = true;
         $t->data['available_certs'] = $availableCerts;
-        $t->data['header'] = 'saml20-idp';
+        $t->data['header'] = 'saml20-idp'; // TODO: Replace with headerString in 2.0
+        $t->data['headerString'] = $t->noop('metadata_saml20-idp');
         $t->data['metaurl'] = HTTP::getSelfURLNoQuery();
         $t->data['metadata'] = htmlspecialchars($metaxml);
         $t->data['metadataflat'] = htmlspecialchars($metaflat);

www/shib13/idp/metadata.php

@@ -90,7 +90,8 @@ try {
         $t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
 
         $t->data['clipboard.js'] = true;
-        $t->data['header'] = 'shib13-idp';
+        $t->data['header'] = 'shib13-idp'; // TODO: Replace with headerString in 2.0
+        $t->data['headerString'] = $t->noop('metadata_shib13-idp');
         $t->data['metaurl'] = \SimpleSAML\Utils\HTTP::addURLParameters(
             \SimpleSAML\Utils\HTTP::getSelfURLNoQuery(),
             array('output' => 'xml')