From b2597b70ccac72a5e5e70d3dd47227738b189f01 Mon Sep 17 00:00:00 2001
From: Dorian Merz <merz@ub.uni-leipzig.de>
Date: Wed, 16 Dec 2020 09:24:47 +0100
Subject: [PATCH] refs #18509 [finc] mark some changes as deprecated + code
styling
---
.../finc/src/finc/View/Helper/Root/SideFacet.php | 15 ++++++++++-----
.../Recommend/SideFacets/filter-list.phtml | 4 ++--
2 files changed, 12 insertions(+), 7 deletions(-)
rename themes/{finc => finc-accessibility}/templates/Recommend/SideFacets/filter-list.phtml (92%)
diff --git a/module/finc/src/finc/View/Helper/Root/SideFacet.php b/module/finc/src/finc/View/Helper/Root/SideFacet.php
index f1c12ba4e8a..528bd3b3c2d 100644
--- a/module/finc/src/finc/View/Helper/Root/SideFacet.php
+++ b/module/finc/src/finc/View/Helper/Root/SideFacet.php
@@ -93,18 +93,23 @@ class SideFacet extends AbstractHelper
/**
* Get term with corresponding language tag within html element
*
- * @param string $term translation to decorate with language tag
- * @param string $element wrapping html element
- * @param string $language current language
+ * @param string $term translation to decorate with language tag
+ * @param string $element wrapping html element
+ * @param string $language current language
*
* @return string
+ *
+ * @deprecated remove when there's a VuFind core solution
*/
public function getLanguageTag(string $term, string $element, string $language)
{
$retval = $term;
- if (isset($this->config->LanguageTags[$term]) && $this->config->LanguageTags[$term] !== $language) {
- $retval = "<$element " . 'lang="' . $this->config->LanguageTags[$term] . '">' . "$term</$element>";
+ if (isset($this->config->LanguageTags[$term])
+ && $this->config->LanguageTags[$term] !== $language
+ ) {
+ $retval = "<$element " . 'lang="' . $this->config->LanguageTags[$term]
+ . '">' . "$term</$element>";
}
return $retval;
diff --git a/themes/finc/templates/Recommend/SideFacets/filter-list.phtml b/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml
similarity index 92%
rename from themes/finc/templates/Recommend/SideFacets/filter-list.phtml
rename to themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml
index 480226de443..d7e75e1a60c 100644
--- a/themes/finc/templates/Recommend/SideFacets/filter-list.phtml
+++ b/themes/finc-accessibility/templates/Recommend/SideFacets/filter-list.phtml
@@ -1,4 +1,4 @@
-<!-- finc - Recommend - SideFacets - filter-list.phtml -->
+<!-- finc-accessibility - Recommend - SideFacets - filter-list.phtml -->
<?php /* #18509 copied from bootstrap for adding language tags to displayText */ ?>
<div class="facet-group active-filters">
<div class="title"><?=$this->transEsc('Remove Filters')?></div>
@@ -30,4 +30,4 @@
<?php endforeach; ?>
<?php endforeach; ?>
</div>
-<!-- finc - Recommend - SideFacets - filter-list.phtml - END -->
+<!-- finc-accessibility - Recommend - SideFacets - filter-list.phtml - END -->
--
GitLab