@yuneta/gobj-ui 7.23.39 → 7.23.40

package/dist/gobj-ui.cjs.js

@@ -10921,10 +10921,6 @@ function make_toolbar$5(gobj) {
 			"span",
 			{ class: "JSON_GRAPH_FIND_COUNT" },
 			""
-		], [
-			"span",
-			{ i18n: "matches" },
-			"matches"
 		]]
 	]]);
 	let center_items = [];
@@ -11450,7 +11446,7 @@ function update_find_result$1(gobj) {
 		priv.$find_count.textContent = "";
 		return;
 	}
-	priv.$find_count.textContent = String(priv.match_count);
+	priv.$find_count.textContent = (0, i18next.t)("matches", { count: priv.match_count });
 	priv.$find_result.classList.remove("is-hidden");
 }
 /************************************************************
@@ -17368,10 +17364,6 @@ function make_find_items(gobj) {
 			"span",
 			{ class: "GOBJ_TREE_FIND_COUNT" },
 			""
-		], [
-			"span",
-			{ i18n: "matches" },
-			(0, i18next.t)("matches")
 		]]
 	]];
 }
@@ -17404,7 +17396,7 @@ function update_find_result(gobj) {
 		priv.$find_count.textContent = "";
 		return;
 	}
-	priv.$find_count.textContent = String(priv.match_count);
+	priv.$find_count.textContent = (0, i18next.t)("matches", { count: priv.match_count });
 	priv.$find_result.classList.remove("is-hidden");
 }
 function make_toolbar$1(gobj) {
@@ -18650,6 +18642,7 @@ function ac_language_changed$3(gobj, event, kw, src) {
 	if ($container) (0, _yuneta_gobj_js.refresh_language)($container, i18next.t);
 	hide_popover(gobj);
 	refresh_tree(gobj);
+	update_find_result(gobj);
 	return 0;
 }
 /***************************
@@ -20164,11 +20157,7 @@ function build_body(shell, t) {
 	let $count = (0, _yuneta_gobj_js.createElement2)([
 		"span",
 		{ class: "ROUTEMAP_COUNT is-size-7 has-text-grey is-hidden" },
-		[$count_n, [
-			"span",
-			{ i18n: "matches" },
-			"matches"
-		]]
+		[$count_n]
 	]);
 	let $refs_input = (0, _yuneta_gobj_js.createElement2)(["input", {
 		class: "ROUTEMAP_REFS_INPUT",
@@ -20206,7 +20195,7 @@ function build_body(shell, t) {
 		if ($root_li) filter_li($root_li, q, false, __show_refs__);
 		if (q === "") $count.classList.add("is-hidden");
 		else {
-			$count_n.textContent = $tree.querySelectorAll(".ROUTEMAP_MATCH").length;
+			$count_n.textContent = t("matches", { count: $tree.querySelectorAll(".ROUTEMAP_MATCH").length });
 			$count.classList.remove("is-hidden");
 		}
 	};
@@ -58140,10 +58129,6 @@ function make_toolbar(gobj) {
 					"span",
 					{ class: "GRAPH_FIND_COUNT" },
 					""
-				], [
-					"span",
-					{ i18n: "matches" },
-					"matches"
 				]]
 			]]
 		],
@@ -59199,7 +59184,7 @@ function ac_find_result(gobj, event, kw, src) {
 		$count.textContent = "";
 		return 0;
 	}
-	$count.textContent = String(kw && kw.matches || 0);
+	$count.textContent = (0, i18next.t)("matches", { count: kw && kw.matches || 0 });
 	$result.classList.remove("is-hidden");
 	return 0;
 }

package/dist/gobj-ui.es.js

@@ -10916,10 +10916,6 @@ function make_toolbar$5(gobj) {
 			"span",
 			{ class: "JSON_GRAPH_FIND_COUNT" },
 			""
-		], [
-			"span",
-			{ i18n: "matches" },
-			"matches"
 		]]
 	]]);
 	let center_items = [];
@@ -11445,7 +11441,7 @@ function update_find_result$1(gobj) {
 		priv.$find_count.textContent = "";
 		return;
 	}
-	priv.$find_count.textContent = String(priv.match_count);
+	priv.$find_count.textContent = t("matches", { count: priv.match_count });
 	priv.$find_result.classList.remove("is-hidden");
 }
 /************************************************************
@@ -17363,10 +17359,6 @@ function make_find_items(gobj) {
 			"span",
 			{ class: "GOBJ_TREE_FIND_COUNT" },
 			""
-		], [
-			"span",
-			{ i18n: "matches" },
-			t("matches")
 		]]
 	]];
 }
@@ -17399,7 +17391,7 @@ function update_find_result(gobj) {
 		priv.$find_count.textContent = "";
 		return;
 	}
-	priv.$find_count.textContent = String(priv.match_count);
+	priv.$find_count.textContent = t("matches", { count: priv.match_count });
 	priv.$find_result.classList.remove("is-hidden");
 }
 function make_toolbar$1(gobj) {
@@ -18645,6 +18637,7 @@ function ac_language_changed$3(gobj, event, kw, src) {
 	if ($container) refresh_language($container, t);
 	hide_popover(gobj);
 	refresh_tree(gobj);
+	update_find_result(gobj);
 	return 0;
 }
 /***************************
@@ -20159,11 +20152,7 @@ function build_body(shell, t) {
 	let $count = createElement2([
 		"span",
 		{ class: "ROUTEMAP_COUNT is-size-7 has-text-grey is-hidden" },
-		[$count_n, [
-			"span",
-			{ i18n: "matches" },
-			"matches"
-		]]
+		[$count_n]
 	]);
 	let $refs_input = createElement2(["input", {
 		class: "ROUTEMAP_REFS_INPUT",
@@ -20201,7 +20190,7 @@ function build_body(shell, t) {
 		if ($root_li) filter_li($root_li, q, false, __show_refs__);
 		if (q === "") $count.classList.add("is-hidden");
 		else {
-			$count_n.textContent = $tree.querySelectorAll(".ROUTEMAP_MATCH").length;
+			$count_n.textContent = t("matches", { count: $tree.querySelectorAll(".ROUTEMAP_MATCH").length });
 			$count.classList.remove("is-hidden");
 		}
 	};
@@ -58135,10 +58124,6 @@ function make_toolbar(gobj) {
 					"span",
 					{ class: "GRAPH_FIND_COUNT" },
 					""
-				], [
-					"span",
-					{ i18n: "matches" },
-					"matches"
 				]]
 			]]
 		],
@@ -59194,7 +59179,7 @@ function ac_find_result(gobj, event, kw, src) {
 		$count.textContent = "";
 		return 0;
 	}
-	$count.textContent = String(kw && kw.matches || 0);
+	$count.textContent = t("matches", { count: kw && kw.matches || 0 });
 	$result.classList.remove("is-hidden");
 	return 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.23.39",
+  "version": "7.23.40",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",

package/src/c_yui_gobj_tree_js.js

@@ -914,16 +914,25 @@ function make_find_items(gobj)
 
     return [
         $find_control,
-        /*  Two spans, not one string: the number is DATA and "matches"
-         *  is the word, so a language switch re-translates the half that
-         *  is a word. `display:flex` inline and NOT the `is-flex` helper
-         *  -- both Bulma helpers carry !important, so `is-hidden is-flex`
-         *  on one element is decided by stylesheet order.  */
+        /*  ONE counted span, not a number beside a word: "1 matches"
+         *  is what two spans always produce, because nothing there can
+         *  see the count. `t(key, {count})` picks `matches_one` for
+         *  one and falls back to the base key for the rest, in both
+         *  languages.
+         *
+         *  And NO `i18n` attribute on it: refresh_language()
+         *  re-translates whatever carries one by calling t() WITHOUT
+         *  the count, which would put the plural back over the
+         *  singular. A counted word is re-rendered by its owner
+         *  instead -- which is why the language action below repaints
+         *  this chip.  */
+        /*  `display:flex` inline and NOT the `is-flex` helper -- both
+         *  Bulma helpers carry !important, so `is-hidden is-flex` on one
+         *  element is decided by stylesheet order.  */
         ['div', {class: 'GOBJ_TREE_FIND_RESULT is-hidden',
                  style: 'display:flex; align-items:center; gap:.3rem; ' +
                         'margin-right:.5rem; font-size:.85rem;'}, [
-            ['span', {class: 'GOBJ_TREE_FIND_COUNT'}, ''],
-            ['span', {i18n: 'matches'}, t('matches')]
+            ['span', {class: 'GOBJ_TREE_FIND_COUNT'}, '']
         ]]
     ];
 }
@@ -964,7 +973,7 @@ function update_find_result(gobj)
         priv.$find_count.textContent = "";
         return;
     }
-    priv.$find_count.textContent = String(priv.match_count);
+    priv.$find_count.textContent = t("matches", {count: priv.match_count});
     priv.$find_result.classList.remove("is-hidden");
 }
 
@@ -2834,6 +2843,9 @@ function ac_language_changed(gobj, event, kw, src)
     }
     hide_popover(gobj);
     refresh_tree(gobj);
+    /*  The count chip carries a COUNTED word, which has no key for
+     *  refresh_language() to re-translate: its owner has to repaint it.  */
+    update_find_result(gobj);
     return 0;
 }
 

package/src/c_yui_json_graph.js

@@ -599,17 +599,25 @@ function make_toolbar(gobj)
      */
     let left_items = yui_graph_fold_items(gobj, toolbar_wide).concat([
         $find_control,
-        /*  Two spans, not one string: the number is DATA and "matches"
-         *  is the word, so a language switch re-translates the half that
-         *  is a word.  `display:flex` inline and NOT the `is-flex`
-         *  helper — both Bulma helpers carry !important, so
-         *  `is-hidden is-flex` on one element is decided by stylesheet
-         *  order. */
+        /*  ONE counted span, not a number beside a word: "1 matches"
+         *  is what two spans always produce, because nothing there can
+         *  see the count. `t(key, {count})` picks `matches_one` for
+         *  one and falls back to the base key for the rest, in both
+         *  languages.
+         *
+         *  And NO `i18n` attribute on it: refresh_language()
+         *  re-translates whatever carries one by calling t() WITHOUT
+         *  the count, which would put the plural back over the
+         *  singular. Nothing re-translates it, so it is repainted on
+         *  the next find -- which is the next keystroke, and it is
+         *  hidden while the box is empty.  */
+        /*  `display:flex` inline and NOT the `is-flex` helper — both
+         *  Bulma helpers carry !important, so `is-hidden is-flex` on one
+         *  element is decided by stylesheet order. */
         ['div', {class: 'JSON_GRAPH_FIND_RESULT is-hidden',
                  style: 'display:flex; align-items:center; gap:.3rem; ' +
                         'margin-right:.5rem; font-size:.85rem;'}, [
-            ['span', {class: 'JSON_GRAPH_FIND_COUNT'}, ''],
-            ['span', {i18n: 'matches'}, 'matches']
+            ['span', {class: 'JSON_GRAPH_FIND_COUNT'}, '']
         ]]
     ]);
     let center_items = [];
@@ -1537,7 +1545,7 @@ function update_find_result(gobj)
         priv.$find_count.textContent = "";
         return;
     }
-    priv.$find_count.textContent = String(priv.match_count);
+    priv.$find_count.textContent = t("matches", {count: priv.match_count});
     priv.$find_result.classList.remove("is-hidden");
 }
 

package/src/c_yui_treedb_graph.js

@@ -649,9 +649,14 @@ function make_toolbar(gobj)
 
     let center_items = [
         $find_control,
-        /*  Two spans, not one string: the number is DATA and "matches" is
-         *  the word, so a language switch re-translates the half that is a
-         *  word. Spaced with CSS because createElement2 trims text nodes. */
+        /*  ONE counted span, not a number beside a word: "1 matches" is
+         *  what two spans always produce, because nothing there can see
+         *  the count. `t(key, {count})` picks `matches_one` for one and
+         *  falls back to the base key for the rest, in both languages.
+         *  No `i18n` attribute on it: refresh_language() would call t()
+         *  WITHOUT the count and put the plural back over the singular.
+         *  Nothing re-translates it, so it is repainted on the next
+         *  find, and it is hidden while the box is empty.  */
         /*  `display:flex` inline and NOT the `is-flex` helper: both Bulma
          *  helpers carry !important, so `is-hidden is-flex` on one element
          *  is decided by whichever lands later in the stylesheet — and the
@@ -661,8 +666,7 @@ function make_toolbar(gobj)
         ['div', {class: 'GRAPH_FIND_RESULT is-hidden',
                  style: 'display:flex; align-items:center; gap:.3rem; ' +
                         'margin-right:.5rem; font-size:.85rem;'}, [
-            ['span', {class: 'GRAPH_FIND_COUNT'}, ''],
-            ['span', {i18n: 'matches'}, 'matches']
+            ['span', {class: 'GRAPH_FIND_COUNT'}, '']
         ]]
     ];
 
@@ -2485,7 +2489,7 @@ function ac_find_result(gobj, event, kw, src)
         return 0;
     }
 
-    $count.textContent = String((kw && kw.matches) || 0);
+    $count.textContent = t("matches", {count: (kw && kw.matches) || 0});
     $result.classList.remove("is-hidden");
     return 0;
 }

package/src/shell_route_map.js

@@ -257,11 +257,19 @@ function build_body(shell, t)
     );
     attach_clear($search_ctrl, $search);
 
-    /*  Live match counter next to the filter. */
+    /*  Live match counter next to the filter.
+     *
+     *  ONE counted span, not a number beside a word: "1 matches" is what
+     *  two spans always produce, because nothing there can see the
+     *  count. `t(key, {count})` picks `matches_one` for one and falls
+     *  back to the base key for the rest. No `i18n` attribute on it --
+     *  refresh_language() would call t() WITHOUT the count and put the
+     *  plural back over the singular -- so the filter, which runs on
+     *  every keystroke, is what repaints it.  */
     let $count_n = createElement2(["span", {class: "ROUTEMAP_COUNT_N"}, ""]);
     let $count = createElement2(
         ["span", {class: "ROUTEMAP_COUNT is-size-7 has-text-grey is-hidden"},
-            [$count_n, ["span", {i18n: "matches"}, "matches"]]]
+            [$count_n]]
     );
     /*  References are hidden by default and revealed by this toggle.
      *  Remembered for the page session (not localStorage): it is a
@@ -294,7 +302,9 @@ function build_body(shell, t)
         if(q === "") {
             $count.classList.add("is-hidden");
         } else {
-            $count_n.textContent = $tree.querySelectorAll(".ROUTEMAP_MATCH").length;
+            $count_n.textContent = t("matches", {
+                count: $tree.querySelectorAll(".ROUTEMAP_MATCH").length
+            });
             $count.classList.remove("is-hidden");
         }
     };