Simplified the consent template. Only uses consent_accept dictionary entry and

SPNAME, IDPNAME and SPDESC replacement strings now. David@wayf.dk has updated
all languages in translations.rnd.feide.no so everything should be backward
compatible. The only caveat is that you should have an english service description
in the sp-remote metadata. Otherwise you will get "SP_DESCRIPTION".


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

templates/default/consent.php

@@ -2,15 +2,15 @@
 	$this->includeAtTemplateBase('includes/header.php');
 	
 	$this->includeLanguageFile('consent.php'); 
-	$this->includeInlineTranslation('spname', $this->data['sp_name']);
+	$this->includeInlineTranslation('SPNAME', $this->data['sp_name']);
 	$this->includeInlineTranslation('IDPNAME', $this->data['idp_name']);
 	$this->includeInlineTranslation('SPDESC', $this->data['sp_description']);
 ?>
 
 	<div id="content">
 
-		<p><?php echo htmlspecialchars($this->t('consent_notice')); ?> <strong><?php echo htmlspecialchars($this->t('spname')); ?></strong>.
-		<?php echo htmlspecialchars($this->t('consent_accept', array('IDPNAME' => '', 'SPDESC' => ''))) ?>
+		<p>
+		<?php echo $this->t('consent_accept', array('SPNAME' => '', 'IDPNAME' => '', 'SPDESC' => '')) ?>
 		</p>
 
 		<?php if ($this->data['sppp'] !== FALSE) {