Skip to content
Snippets Groups Projects
Commit 422f8b34 authored by Olav Morken's avatar Olav Morken
Browse files

Template: change all in-tree users of the t()-method to use the new parameter layout.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@749 44740490-163a-0410-bde0-09ae8108e29a
parent 178682bf
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div id="content"> <div id="content">
<p><?php echo htmlspecialchars($this->t('consent_notice')); ?> <strong><?php echo htmlspecialchars($this->t('spname')); ?></strong>. <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> </p>
<?php if ($this->data['sppp'] !== FALSE) { <?php if ($this->data['sppp'] !== FALSE) {
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
if (isset($this->data['attribute_' . htmlspecialchars(strtolower($name)) ])) { if (isset($this->data['attribute_' . htmlspecialchars(strtolower($name)) ])) {
$name = $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) { if (sizeof($value) > 1) {
echo '<tr><td>' . htmlspecialchars($name) . '</td><td><ul>'; echo '<tr><td>' . htmlspecialchars($name) . '</td><td><ul>';
foreach ($value AS $v) { foreach ($value AS $v) {
......
...@@ -10,7 +10,7 @@ $this->includeAtTemplateBase('includes/header.php'); ...@@ -10,7 +10,7 @@ $this->includeAtTemplateBase('includes/header.php');
<p><?php echo $this->t('metadata_intro'); ?></p> <p><?php echo $this->t('metadata_intro'); ?></p>
<?php if (isset($this->data['metaurl'])) { ?> <?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> <input type="text" style="width: 90%" value="<?php echo htmlspecialchars($this->data['metaurl']); ?>" /></p>
<?php } ?> <?php } ?>
<h2><?php echo($this->t('metadata_metadata')); ?></h2> <h2><?php echo($this->t('metadata_metadata')); ?></h2>
...@@ -34,15 +34,15 @@ $this->includeAtTemplateBase('includes/header.php'); ...@@ -34,15 +34,15 @@ $this->includeAtTemplateBase('includes/header.php');
<div style="border: 1px solid #444; margin: 2em; padding: 1em; background: #eee"> <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"> <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="" /> <input type="text" size="25" name="email" value="" />
</p> </p>
...@@ -51,7 +51,7 @@ $this->includeAtTemplateBase('includes/header.php'); ...@@ -51,7 +51,7 @@ $this->includeAtTemplateBase('includes/header.php');
<input type="hidden" name="techemail" value="<?php echo $this->data['techemail']; ?>" /> <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="version" value="<?php echo $this->data['version']; ?>" />
<input type="hidden" name="defaultidp" value="<?php echo htmlspecialchars($this->data['defaultidp']); ?>" /> <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> </form>
......
...@@ -10,7 +10,7 @@ $status = $this->data['status']; ...@@ -10,7 +10,7 @@ $status = $this->data['status'];
$replaceurl = array('%URL%' => htmlspecialchars($this->data['url'])); $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)) { if(array_key_exists('errortext', $this->data)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment