diff --git a/templates/default/consent.php b/templates/default/consent.php index 8810930b7fcdad208a09310df05ba1be8ea04152..2ad7c0750aae9d4429c22e6c4d2873dc49049537 100644 --- a/templates/default/consent.php +++ b/templates/default/consent.php @@ -9,7 +9,7 @@ <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', true, true, array('IDPNAME' => ''))) ?> + <?php echo htmlspecialchars($this->t('consent_accept', array('IDPNAME' => ''))) ?> </p> <?php if ($this->data['sppp'] !== FALSE) { @@ -39,7 +39,7 @@ if (isset($this->data['attribute_' . htmlspecialchars(strtolower($name)) ])) { $name = $this->data['attribute_' . htmlspecialchars(strtolower($name))]; } - $name = $this->t('attribute_'.strtolower($name), true); // translate + $name = $this->t('attribute_'.strtolower($name)); // translate if (sizeof($value) > 1) { echo '<tr><td>' . htmlspecialchars($name) . '</td><td><ul>'; foreach ($value AS $v) { diff --git a/templates/default/metadata.php b/templates/default/metadata.php index 53014794bb1ce3ff859f062caf42bd58ffa16406..02de8e59271b85f5fa6fccb62a563362c71fefeb 100644 --- a/templates/default/metadata.php +++ b/templates/default/metadata.php @@ -10,7 +10,7 @@ $this->includeAtTemplateBase('includes/header.php'); <p><?php echo $this->t('metadata_intro'); ?></p> <?php if (isset($this->data['metaurl'])) { ?> - <p><?php echo($this->t('metadata_xmlurl', TRUE, TRUE, array('%METAURL%' => htmlspecialchars($this->data['metaurl'])))); ?><br /> + <p><?php echo($this->t('metadata_xmlurl', array('%METAURL%' => htmlspecialchars($this->data['metaurl'])))); ?><br /> <input type="text" style="width: 90%" value="<?php echo htmlspecialchars($this->data['metaurl']); ?>" /></p> <?php } ?> <h2><?php echo($this->t('metadata_metadata')); ?></h2> @@ -34,15 +34,15 @@ $this->includeAtTemplateBase('includes/header.php'); <div style="border: 1px solid #444; margin: 2em; padding: 1em; background: #eee"> - <h2><?php echo $this->t('metadata_send_title', TRUE, TRUE, $param); ?></h2> + <h2><?php echo $this->t('metadata_send_title', $param); ?></h2> - <p><?php echo $this->t('metadata_send_hasdetected', TRUE, TRUE, $param); ?></p> + <p><?php echo $this->t('metadata_send_hasdetected', $param); ?></p> - <p><?php echo $this->t('metadata_send_desc', TRUE, TRUE, $param); ?></p> + <p><?php echo $this->t('metadata_send_desc', $param); ?></p> <form action="<?php echo $this->data['sendmetadatato']; ?>" method="post"> - <p><?php echo $this->t('metadata_send_email', TRUE, TRUE, $param); ?> + <p><?php echo $this->t('metadata_send_email', $param); ?> <input type="text" size="25" name="email" value="" /> </p> @@ -51,7 +51,7 @@ $this->includeAtTemplateBase('includes/header.php'); <input type="hidden" name="techemail" value="<?php echo $this->data['techemail']; ?>" /> <input type="hidden" name="version" value="<?php echo $this->data['version']; ?>" /> <input type="hidden" name="defaultidp" value="<?php echo htmlspecialchars($this->data['defaultidp']); ?>" /> - <input type="submit" name="send" value="<?php echo $this->t('metadata_send_send', TRUE, TRUE, $param); ?>" /> + <input type="submit" name="send" value="<?php echo $this->t('metadata_send_send', $param); ?>" /> </form> diff --git a/templates/default/metashare-add.php b/templates/default/metashare-add.php index 47b3de7d4177b9fb4fda01014a16fd8a54518dd7..b0da34ee18d5089dabeeae01e9f61d943b140641 100644 --- a/templates/default/metashare-add.php +++ b/templates/default/metashare-add.php @@ -10,7 +10,7 @@ $status = $this->data['status']; $replaceurl = array('%URL%' => htmlspecialchars($this->data['url'])); -echo('<p>' . $this->t('addpage_' . $status, TRUE, TRUE, $replaceurl) . '</p>'); +echo('<p>' . $this->t('addpage_' . $status, $replaceurl) . '</p>'); if(array_key_exists('errortext', $this->data)) {