From 531808ef99f0e3eea06de525f22216f6269f9ee9 Mon Sep 17 00:00:00 2001
From: Guy Halse <guy@tenet.ac.za>
Date: Thu, 15 Nov 2018 10:24:35 +0200
Subject: [PATCH] Remove hardcoded English string from discopower module
---
modules/discopower/dictionaries/tabs.definition.json | 3 +++
modules/discopower/templates/disco.tpl.php | 8 ++++----
modules/discopower/templates/disco.twig | 6 +++---
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/modules/discopower/dictionaries/tabs.definition.json b/modules/discopower/dictionaries/tabs.definition.json
index 51c3ca41b..323a7165c 100644
--- a/modules/discopower/dictionaries/tabs.definition.json
+++ b/modules/discopower/dictionaries/tabs.definition.json
@@ -37,5 +37,8 @@
},
"ukacessfederation": {
"en": "UK Access Federation"
+ },
+ "incremental_search": {
+ "en": "Incremental search..."
}
}
diff --git a/modules/discopower/templates/disco.tpl.php b/modules/discopower/templates/disco.tpl.php
index 4174ace4c..1c8ce9454 100644
--- a/modules/discopower/templates/disco.tpl.php
+++ b/modules/discopower/templates/disco.tpl.php
@@ -73,8 +73,8 @@ if (!empty($this->data['faventry'])) {
}
?>
-<div id="tabdiv">
- <ul class="tabset_tabs">
+<div id="tabdiv">
+ <ul class="tabset_tabs">
<?php
$tabs = array_keys($this->data['idplist']);
$i = 1;
@@ -91,7 +91,7 @@ if (!empty($this->data['faventry'])) {
}
}
?>
- </ul>
+ </ul>
<?php
@@ -104,7 +104,7 @@ foreach ($this->data['idplist'] as $tab => $slist) {
}
if (!empty($slist)) {
echo '<div class="inlinesearch">';
- echo '<p>Incremental search...</p>';
+ echo '<p>'.htmlspecialchars($this->t('{discopower:tabs:incremental_search}')).'</p>';
echo '<form id="idpselectform" action="?" method="get">';
echo '<input class="inlinesearch" type="text" value="" name="query_'.$tab.'" id="query_'.$tab.'" /></form>';
echo '</div>';
diff --git a/modules/discopower/templates/disco.twig b/modules/discopower/templates/disco.twig
index 8e7082304..45c407122 100644
--- a/modules/discopower/templates/disco.twig
+++ b/modules/discopower/templates/disco.twig
@@ -19,8 +19,8 @@
<input type="hidden" name="return" value="{{ return|escape('html') }}" />
<input type="hidden" name="returnIDParam" value="{{ returnIDParam|escape('html') }}" />
<input type="hidden" name="idpentityid" value="{{ faventry.entityid|escape('html') }}" />
- <input type="submit" name="formsubmit" id="favouritesubmit" value="{{ '{disco:login_at}'|trans }} {{ faventry.translated|escape('html') }}" />
- </form>
+ <input type="submit" name="formsubmit" id="favouritesubmit" value="{{ '{disco:login_at}'|trans }} {{ faventry.translated|escape('html') }}" />
+ </form>
</div>
{% endif %}
@@ -37,7 +37,7 @@
{% if idps is not empty %}
<div id="{{ tab }}" class="tabset_content{% if loop.first %} current{% endif %}">
<div class="inlinesearch">
- <p>Incremental search...</p>
+ <p>{{ '{discopower:tabs:incremental_search}'|trans }}</p>
<form id="idpselectform" method="get">
<input class="inlinesearch" type="text" value="" name="query_{{ tab }}" id="query_{{ tab }}" />
</form>
--
GitLab