From 48721c85ebcfa973ee81719d2467ca80e4253dc9 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 01 May 2026 17:30:03 +0000
Subject: [PATCH] =Edmonton Ink hard test begins! Real testing of the managers and reset routes will commence. So far, just ensuring our classes are all loaded correctly: Site() and its sub-classes Membership, Login, etc. Care should be taken to load conditionally on 'init', as we finish defining most settings by 'plugins_loaded' at priority 5
---
inc/forms/TaxonomySelector.php | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/inc/forms/TaxonomySelector.php b/inc/forms/TaxonomySelector.php
index eccabc2..5af59da 100644
--- a/inc/forms/TaxonomySelector.php
+++ b/inc/forms/TaxonomySelector.php
@@ -1,6 +1,7 @@
<?php
namespace JVBase\forms;
+use JVBase\registrar\Registrar;
use WP_Term;
if (!defined('ABSPATH')) {
@@ -27,13 +28,19 @@
protected string $base;
protected string $title;
protected array $config;
+ protected Registrar $registrar;
public function __construct(string $id, string $taxonomy, array $config = []) {
$this->id = sanitize_key($id);
$this->taxonomy = jvbCheckBase($taxonomy);
$this->name = jvbNoBase($taxonomy);
- $this->title = JVB_TAXONOMY[$this->name]['plural'];
+ $registrar = Registrar::getInstance($this->name);
+ if ($registrar) {
+ $this->registrar = $registrar;
+ }
+
+ $this->title = $registrar->getPlural();
$this->base = $config['base']??'';
$this->config = wp_parse_args($config, [
'types' => false, // for feed block implementation
@@ -50,8 +57,8 @@
'update' => true, // Whether to update on close
]);
- $this->plural = JVB_TAXONOMY[$taxonomy]['plural'];
- $this->singular = JVB_TAXONOMY[$taxonomy]['singular'];
+ $this->plural = $registrar->getPlural();
+ $this->singular = $registrar->getSingular();
}
@@ -64,14 +71,14 @@
*/
public static function getTermPath(WP_Term $term, bool $returnArray = false): string|array {
if (!is_taxonomy_hierarchical($term->taxonomy)) {
- return $term->name;
+ return html_entity_decode($term->name);
}
$path = [];
$currentTerm = $term;
while ($currentTerm) {
- array_unshift($path, $currentTerm->name);
+ array_unshift($path, html_entity_decode($currentTerm->name));
if ($currentTerm->parent) {
$currentTerm = get_term($currentTerm->parent);
@@ -118,14 +125,15 @@
</button>
</nav>
+
+ <p class="message" hidden aria-live="polite">
+ { <span>loading items</span> }
+ </p>
<!-- Terms list -->
<ul class="items-container col start" role="listbox" aria-label="Available terms">
<!-- Terms will be populated here -->
</ul>
- <p class="message" hidden aria-live="polite">
- { <span>loading items</span> }
- </p>
<button class="submit-term" hidden data-ignore><strong>Create: </strong> "<span></span>"</button>
<!-- Infinite scroll sentinel -->
@@ -239,12 +247,12 @@
</button>
<?php if ($hasAutocomplete !== '') { ?>
<input type="text" id="<?= $this->base ?><?= esc_attr($this->config['name']) ?>-autocomplete" autocomplete="off" data-ignore data-autocomplete>
+ <p class="message" hidden aria-live="polite">
+ { <span>loading items</span> }
+ </p>
<div class="auto-wrapper" hidden>
<ul class="search-results">
</ul>
- <p class="message" hidden aria-live="polite">
- { <span>loading items</span> }
- </p>
<button class="submit-term" hidden data-ignore><strong>Create: </strong> "<span></span>"</button>
</div>
@@ -271,12 +279,12 @@
{
return sprintf(
'<button type="button" data-icon="%s" data-filter="taxonomy" data-taxonomy="%s" data-type="selector" data-single="%s" data-plural="%s" title="Filter by %s">%s<span class="label">%s</span></button>',
- JVB_TAXONOMY[$this->name]['icon'],
+ $this->registrar->getIcon(),
$this->name,
$this->singular,
$this->plural,
$this->singular,
- jvbIcon($this->config['icon']),
+ jvbIcon($this->registrar->getIcon()),
$this->singular
);
}
@@ -341,7 +349,7 @@
<span><?= esc_html($termPath) ?></span>
<button type="button"
class="remove-term row"
- aria-label="Remove <?= esc_attr($term->name) ?>">
+ aria-label="Remove <?= html_entity_decode($term->name) ?>">
<?= jvbIcon('x') ?>
</button>
</div>
--
Gitblit v1.10.0