@wix/himalaya-cli 0.1589.0 → 0.1591.0

package/templates/beauty-salon-owner/tier5-src/_shared/himi-copy.ts

@@ -12,10 +12,12 @@
 // and every read returns `fallback` verbatim — routing a worker string through
 // copyParam is byte-for-byte behavior-preserving.
 //
-// Pure + Hermes-safe (no host globals, no Node APIs, no imports): bundled into
+// Pure + Hermes-safe (no host globals, no Node APIs; its only import is the pure `app-locale` sibling): bundled into
 // every worker that emits user-facing copy, and copied verbatim into the
 // generated templates' tier5-src/_shared/.
 
+import { isSingular, setAppLocale, setBusinessTimeZone } from "./app-locale.js";
+
 /** Customer strings override every read; translated stock is valid only for its
  * original English fallback. Some existing keys serve more than one message. */
 export type CopyPackValue = string | { source: string; translation: string };
@@ -29,6 +31,12 @@ let copyReceived = false;
  *  stock fallbacks keep rendering. */
 export function stashCopy(arg: unknown): void {
   if (!arg || typeof arg !== "object") return;
+  // A param-carrying dispatch names the app language and business zone too (absent: the English house
+  // pattern, and no zone).
+  if ("copy" in arg || "locale" in arg || "businessTimeZone" in arg) {
+    setAppLocale((arg as Record<string, unknown>).locale);
+    setBusinessTimeZone((arg as Record<string, unknown>).businessTimeZone);
+  }
   const raw = (arg as Record<string, unknown>).copy;
   if (typeof raw !== "string" || !raw) return;
   try {
@@ -77,5 +85,5 @@ export function copyPlural(key: string, fallback: string, count: number): string
   const pattern = copyParam(key, fallback);
   const match = /^\{n, plural, one \{([^{}]*)\} other \{([^{}]*)\}\}$/.exec(pattern);
   if (!match) return copyTemplate(key, fallback, { n: count });
-  return (count === 1 ? match[1] : match[2])!.replace(/#/g, String(count));
+  return (isSingular(count) ? match[1] : match[2])!.replace(/#/g, String(count));
 }

package/templates/branded-lite/tier5-src/_shared/app-locale.ts

@@ -0,0 +1,61 @@
+// The language a worker formats numbers, money and plurals in, and the business's time zone. A worker has no host locale to read,
+// so the screen's `onAppear` hands it over: `appear()` adds `locale` to the load params when the app
+// pins its language, and `stashCopy` stores it here. Absent, every formatter stays on "en" — the
+// house pattern every English app was approved with — so an unpinned app is unchanged.
+//
+// The business time zone comes the same way, from the app's provisioning (`businessTimeZone`, collected
+// at migration time while the site's properties are readable): a worker cannot read it itself, because
+// the site-properties route is owner-scoped. Absent, it is "" and no worker guesses one.
+//
+// Pure, no host globals: bundled into every worker that formats, copied into generated templates.
+
+const TAG = /^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/;
+let tag = "en";
+
+/** Set from a load argument's `locale`; anything that is not a language tag resets to "en". */
+export function setAppLocale(value: unknown): void {
+  tag = typeof value === "string" && TAG.test(value) ? value : "en";
+}
+
+export function appLocale(): string {
+  return tag;
+}
+
+/** An IANA zone such as "Asia/Jerusalem" (or "UTC") that this engine knows. A bare offset, a lowercase
+ *  alias or an engine without ECMA-402 is not one: a zone is never guessed. */
+export function isIanaTimeZone(value: unknown): value is string {
+  if (typeof value !== "string" || !/^(?:UTC|[A-Za-z]+(?:\/[A-Za-z0-9_+-]+)+)$/.test(value)) return false;
+  // An engine without ECMA-402 has no zone database: nothing it holds is a zone it knows.
+  if (typeof Intl === "object" && typeof Intl.DateTimeFormat === "function") {
+    try {
+      new Intl.DateTimeFormat("en-US", { timeZone: value });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  return false;
+}
+
+let zone = "";
+
+/** Set from a load argument's `businessTimeZone`; anything that is not an IANA zone clears it. */
+export function setBusinessTimeZone(value: unknown): void {
+  zone = isIanaTimeZone(value) ? value : "";
+}
+
+/** The business's IANA zone, or "" when the app has none provisioned. */
+export function businessTimeZone(): string {
+  return zone;
+}
+
+/** Does `count` take the singular form in the app language? CLDR plural rules, so French "0 point"
+ *  and "1,5 point" are singular and Hebrew "2" is not. An engine without PluralRules keeps the
+ *  English rule (exactly one). */
+export function isSingular(count: number, locale = appLocale()): boolean {
+  try {
+    // An engine without ECMA-402 has no `Intl` at all: it keeps the English rule.
+    if (typeof Intl === "object" && typeof Intl.PluralRules === "function") return new Intl.PluralRules(locale).select(count) === "one";
+  } catch { /* malformed tag — use the English rule */ }
+  return count === 1;
+}

package/templates/branded-lite/tier5-src/_shared/engine-intl.ts

@@ -20,6 +20,8 @@
 // These helpers are the sanctioned way to format across the whole fleet: real ECMA-402 where it
 // exists, a deterministic en-US-shaped fallback where it does not, and never a throw.
 
+import { appLocale } from "./app-locale.js";
+
 /** Is ECMA-402 actually present in THIS engine? Cheap, and safe in a realm without `Intl`. */
 export function hasIntl(): boolean {
   return typeof Intl !== "undefined";
@@ -189,7 +191,7 @@ const CURRENCY_DIGITS: Record<string, number> = {
 export function formatCurrency(
   amount: number,
   currency = "USD",
-  locale = "en",
+  locale = appLocale(),
   /** Omit for the currency's natural digits. Pass 0 to render a whole amount as "$25" rather
    *  than "$25.00" — Intl clamps the minimum down to match, so max<min does not throw here. */
   maximumFractionDigits?: number,
@@ -258,7 +260,7 @@ function groupThousands(fixed: string): string {
  *     inserted commas into the exponent — `1e21` came out as "1e,+21" and `1e-7` as "1,e-7".
  *     Garbage, and silently so, because nothing in the corpus's tidy test numbers reached it.
  */
-export function formatNumber(value: number, locale = "en"): string {
+export function formatNumber(value: number, locale = appLocale()): string {
   if (!Number.isFinite(value)) return "";
   if (hasIntl()) return new Intl.NumberFormat(locale).format(value);
   // `toFixed` itself returns exponential notation at >=1e21, so anything that big keeps the
@@ -409,7 +411,7 @@ export function compareDateDesc(a: string, b: string): number {
 // Customers read that as sloppiness, and a whole "₪70" beside "₪69.50" reads as a different
 // kind of number. So: one money pattern, one clock, one range.
 
-// Money uses `formatCurrency(amount, currency, "en")` — the currency's NATURAL decimals
+// Money uses `formatCurrency(amount, currency)` — English unless the app pins another language, see app-locale — the currency's NATURAL decimals
 // ("₪70.00", "¥500") — for Shop, Menu and every other price. The one exception is a Bookings
 // SERVICE price (`_shared/wix-service-price.ts`): it drops the cents of a whole amount ("₪70",
 // "₪69.50"), the format the redesigned service screen and services list were approved with. It

package/templates/branded-lite/tier5-src/_shared/group-member-count.ts

@@ -0,0 +1,15 @@
+import { copyPlural } from "./himi-copy.js";
+
+/** "840 members" / "1 member" for a group, through the copy pack so a translated app reads its own
+ *  language. One key for every worker that shows the count: a screen that renders it must list the
+ *  `groups.` prefix in its `appear()` so the pack carries the key. */
+export function groupMemberCount(count: number): string {
+  return copyPlural("groups.memberCount", "{n, plural, one {# member} other {# members}}", count);
+}
+
+/** The label for a group read back from the offline cache. A cached row keeps the raw `count`, never
+ *  the formatted label, so a pinned app reads it in its own language. A row written before that (label
+ *  only) has no count and shows none, instead of a label in the wrong language. */
+export function cachedMemberCount(count: unknown): string {
+  return typeof count === "number" && Number.isFinite(count) ? groupMemberCount(count) : "";
+}

package/templates/branded-lite/tier5-src/_shared/himi-bookings.ts

@@ -17,6 +17,7 @@ export function categoryName(value: unknown): string {
   return typeof name === "string" ? name.trim() : "";
 }
 
+import { businessTimeZone } from "./app-locale.js";
 import { formatDateMedium, formatMonthDay, zoneOffsetAt } from "./engine-intl.js";
 import { formatServiceMoney, formatServicePrice, serviceCurrency } from "./wix-service-price.js";
 
@@ -72,7 +73,8 @@ export function slotIdAt(slots: Iterable<[string, { startDate?: string; timezone
 // the button never offers a course that the booking step then refuses.
 
 type CoursePolicyShape = {
-  schedule?: { id?: string; firstSessionStart?: string; lastSessionEnd?: string };
+  /** `timeZone`: the business's IANA zone, for a session time Wix lists as a bare local wall time. */
+  schedule?: { id?: string; firstSessionStart?: string; lastSessionEnd?: string; timeZone?: string };
   bookingPolicy?: {
     bookAfterStartPolicy?: { enabled?: boolean };
     limitEarlyBookingPolicy?: { enabled?: boolean; earliestBookingInMinutes?: number };
@@ -80,25 +82,63 @@ type CoursePolicyShape = {
   };
 };
 
+/** A bare local wall time placed in `timeZone`, as an instant (ms). NaN when the value is not a bare local
+ *  time, has an impossible calendar day, or the engine does not know the zone. */
+function placedInstant(value: string, timeZone: string | undefined): number {
+  const local = LOCAL_TIME.exec(value);
+  if (HAS_OFFSET.test(value) || !local || !timeZone || !validDate(value)) return NaN;
+  const wall = Date.UTC(+local[1], +local[2] - 1, +local[3], +local[4], +local[5], +(local[6] ?? 0));
+  const offset = zoneOffsetAt(wall, timeZone);
+  if (!Number.isFinite(offset)) return NaN;
+  // Once more at the corrected instant, so a wall time beside a DST change lands on the right side.
+  const again = zoneOffsetAt(wall - offset, timeZone);
+  return wall - (Number.isFinite(again) ? again : offset);
+}
+
+/** The zone that places a course's bare local session times: the schedule's own, else the app's
+ *  provisioned business zone. "" when there is none: a zone is never guessed. */
+const courseZone = (schedule: { timeZone?: string } | undefined): string => schedule?.timeZone || businessTimeZone();
+
+/** The instant (ms) of a course session time, for the "Ended" label. A time with an offset is exact. A
+ *  bare local wall time is the BUSINESS's wall time, so it is placed in its zone — never in the device's,
+ *  which would present another zone's clock as a confirmed instant. No zone, a date-only value, an
+ *  impossible calendar day or an engine that does not know the zone: unknown (NaN). */
+function sessionInstant(value: string, timeZone: string | undefined): number {
+  return HAS_OFFSET.test(value) ? validDate(value)?.getTime() ?? NaN : placedInstant(value, timeZone);
+}
+
+/** The same instant for the booking rules (window, read range): a bare local time the business zone can
+ *  place is placed there, so the list label, the service screen and the time screen agree. Everything else
+ *  keeps the read they always had (`Date.parse`), so an app with no provisioned zone is unchanged. */
+function courseInstant(value: string | undefined, timeZone: string | undefined): number {
+  const text = value ?? "";
+  const placed = placedInstant(text, timeZone);
+  return Number.isFinite(placed) ? placed : Date.parse(text);
+}
+
 /** A completed course, independent of whether bookings are currently allowed. Missing,
- *  invalid or reversed dates are unknown, never evidence that a course has ended. */
+ *  invalid or reversed dates are unknown, never evidence that a course has ended. A session time
+ *  without an offset counts only when the schedule names the business's `timeZone`. */
 export function courseHasEnded(service: CoursePolicyShape, now: number): boolean {
-  const start = service.schedule?.firstSessionStart ?? "";
-  const end = service.schedule?.lastSessionEnd ?? "";
-  // The schedule has no zone beside these fields. A local wall time must not be interpreted
-  // in the device's zone and presented as a confirmed business end instant.
-  if (!HAS_OFFSET.test(start) || !HAS_OFFSET.test(end)) return false;
-  const first = validDate(start)?.getTime() ?? NaN;
-  const last = validDate(end)?.getTime() ?? NaN;
+  const zone = courseZone(service.schedule);
+  const first = sessionInstant(service.schedule?.firstSessionStart ?? "", zone);
+  const last = sessionInstant(service.schedule?.lastSessionEnd ?? "", zone);
   return Number.isFinite(now) && Number.isFinite(first) && Number.isFinite(last) && first <= last && last <= now;
 }
 
+/** Does this course schedule hold a session time that is a bare local wall time, which only the
+ *  business's zone can place? A caller reads the zone only when this is true. */
+export function courseNeedsZone(schedule: { firstSessionStart?: string; lastSessionEnd?: string } | undefined): boolean {
+  return [schedule?.firstSessionStart, schedule?.lastSessionEnd].some((value) => !!value && !HAS_OFFSET.test(value) && LOCAL_TIME.test(value));
+}
+
 /** Whether the business takes course bookings at `now` (ms): the course has not ended, has not
  *  started (unless the policy lets people join late), and `now` is inside its booking window —
  *  which the early and late limits count from the first session. */
 export function courseWindowOpen(service: CoursePolicyShape, now: number): boolean {
-  const first = Date.parse(service.schedule?.firstSessionStart ?? "");
-  const last = Date.parse(service.schedule?.lastSessionEnd ?? "");
+  const zone = courseZone(service.schedule);
+  const first = courseInstant(service.schedule?.firstSessionStart, zone);
+  const last = courseInstant(service.schedule?.lastSessionEnd, zone);
   if (!Number.isFinite(first) || !Number.isFinite(last) || last <= now) return false;
   const policy = service.bookingPolicy;
   if (first < now && policy?.bookAfterStartPolicy?.enabled !== true) return false;
@@ -119,8 +159,9 @@ const DAY = 86_400_000;
  *  its last session (`complete`) and start at its first (`fromFirst`, so a count is the whole
  *  course). Empty when the course has no usable dates or has ended. */
 export function courseReadWindows(service: CoursePolicyShape, now: number, chunkDays = 14): { windows: Array<[number, number]>; complete: boolean; fromFirst: boolean } {
-  const first = Date.parse(service.schedule?.firstSessionStart ?? "");
-  const last = Date.parse(service.schedule?.lastSessionEnd ?? "");
+  const zone = courseZone(service.schedule);
+  const first = courseInstant(service.schedule?.firstSessionStart, zone);
+  const last = courseInstant(service.schedule?.lastSessionEnd, zone);
   if (!Number.isFinite(first) || !Number.isFinite(last)) return { windows: [], complete: false, fromFirst: false };
   const from = Math.max(first, now);
   const courseEnd = last + DAY;

package/templates/branded-lite/tier5-src/_shared/himi-copy.ts

@@ -12,10 +12,12 @@
 // and every read returns `fallback` verbatim — routing a worker string through
 // copyParam is byte-for-byte behavior-preserving.
 //
-// Pure + Hermes-safe (no host globals, no Node APIs, no imports): bundled into
+// Pure + Hermes-safe (no host globals, no Node APIs; its only import is the pure `app-locale` sibling): bundled into
 // every worker that emits user-facing copy, and copied verbatim into the
 // generated templates' tier5-src/_shared/.
 
+import { isSingular, setAppLocale, setBusinessTimeZone } from "./app-locale.js";
+
 /** Customer strings override every read; translated stock is valid only for its
  * original English fallback. Some existing keys serve more than one message. */
 export type CopyPackValue = string | { source: string; translation: string };
@@ -29,6 +31,12 @@ let copyReceived = false;
  *  stock fallbacks keep rendering. */
 export function stashCopy(arg: unknown): void {
   if (!arg || typeof arg !== "object") return;
+  // A param-carrying dispatch names the app language and business zone too (absent: the English house
+  // pattern, and no zone).
+  if ("copy" in arg || "locale" in arg || "businessTimeZone" in arg) {
+    setAppLocale((arg as Record<string, unknown>).locale);
+    setBusinessTimeZone((arg as Record<string, unknown>).businessTimeZone);
+  }
   const raw = (arg as Record<string, unknown>).copy;
   if (typeof raw !== "string" || !raw) return;
   try {
@@ -77,5 +85,5 @@ export function copyPlural(key: string, fallback: string, count: number): string
   const pattern = copyParam(key, fallback);
   const match = /^\{n, plural, one \{([^{}]*)\} other \{([^{}]*)\}\}$/.exec(pattern);
   if (!match) return copyTemplate(key, fallback, { n: count });
-  return (count === 1 ? match[1] : match[2])!.replace(/#/g, String(count));
+  return (isSingular(count) ? match[1] : match[2])!.replace(/#/g, String(count));
 }

package/templates/branded-lite/tier5-src/_shared/himi-restaurants.ts

@@ -104,7 +104,7 @@ export function itemPriceLine(item: WixItem): string {
   const currency = typeof info?.currency === "string" ? info.currency : "";
   if (!currency) return `${price}`;
   try {
-    return formatCurrency(Number(price), currency, "en");
+    return formatCurrency(Number(price), currency);
   } catch {
     return `${price}`;
   }
@@ -153,7 +153,7 @@ export function itemPriceVariants(item: WixItem): Array<{ id: string; variantId:
     let priceLine = `${price}`;
     if (currency) {
       try {
-        priceLine = formatCurrency(Number(price), currency, "en");
+        priceLine = formatCurrency(Number(price), currency);
       } catch { /* keep the bare amount */ }
     }
     const formatted = typeof node.priceInfo?.formattedPrice === "string" ? node.priceInfo.formattedPrice.trim() : "";

package/templates/branded-lite/tier5-src/_shared/restaurant-ordering.ts

@@ -74,7 +74,7 @@ export function decimal(value: unknown): number {
 
 /** Cart V2 money carries no formatted string: format the decimal with the cart's currency. */
 export function money(amount: unknown, currency: string | undefined): string {
-  return formatCurrency(decimal(amount), (currency ?? "").trim() || "USD", "en");
+  return formatCurrency(decimal(amount), (currency ?? "").trim() || "USD");
 }
 
 export function cartCurrency(cart: WixCartV2 | undefined): string {

package/templates/branded-lite/tier5-src/_shared/wix-service-price.ts

@@ -111,7 +111,7 @@ export function formatServiceMoney(money: unknown, fallbackCurrency = "USD"): st
   if (amount == null) return "";
   const currency = stringOf(m.currency) || fallbackCurrency;
   try {
-    return formatCurrency(amount, currency, "en", Number.isInteger(amount) ? 0 : undefined);
+    return formatCurrency(amount, currency, undefined, Number.isInteger(amount) ? 0 : undefined);
   } catch {
     return `${amount}`;
   }
@@ -139,7 +139,7 @@ export function formatServicePrice(service: unknown): string {
   try {
     // A whole amount drops its cents ("₪70", not "₪70.00"), as formatServiceMoney and the service
     // screen show it, so the same service reads the same price on every screen.
-    return formatCurrency(amount, currency, "en", Number.isInteger(amount) ? 0 : undefined);
+    return formatCurrency(amount, currency, undefined, Number.isInteger(amount) ? 0 : undefined);
   } catch {
     return `${amount}`;
   }

package/templates/branded-lite/tier5-src/himi-booking-services/index.ts

@@ -14,7 +14,8 @@ import { defineService } from "@himalaya/state";
 import { defineBackendCollection } from "../_shared/collection-service.js";
 import { COLLECTION_CHROME_MIN_ITEMS } from "../_shared/collection-contract.js";
 import { queryServiceCategories, queryServices, type WixService } from "@himalaya/wix-bookings";
-import { categoryName, courseDatesText, courseHasEnded, serviceDurationText, servicePriceLine, type BookingLabel } from "../_shared/himi-bookings.js";
+import { businessTimeZone } from "../_shared/app-locale.js";
+import { categoryName, courseDatesText, courseHasEnded, courseNeedsZone, serviceDurationText, servicePriceLine, type BookingLabel } from "../_shared/himi-bookings.js";
 import { formatServicePrice } from "../_shared/wix-service-price.js";
 import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { get as getAppInfo } from "@himalaya/app-info";
@@ -74,7 +75,7 @@ interface Row {
   noTypeTag: boolean;
   endedText: string;
   /** Retain course dates so a cached catalog can refresh its status after the course ends. */
-  courseSchedule?: { firstSessionStart?: string; lastSessionEnd?: string };
+  courseSchedule?: { firstSessionStart?: string; lastSessionEnd?: string; timeZone?: string };
   /** "1 hr · ₪70"; a course: "Nov 3 – Dec 15, 2026 · ₪1,200". "" when the record has neither. */
   meta: string;
   /** Online booking by time is possible: online booking is on and the service is not a course. */
@@ -269,11 +270,15 @@ function norm(service: WixService): Row {
   ].filter(Boolean);
   const image = imageUrl(service);
   const isCourse = service.type === "COURSE";
+  // A session time Wix lists without an offset is the business's wall time: the schedule carries the
+  // provisioned zone that places it (none provisioned: not Ended, never a guess), and the cached row
+  // keeps it so an offline list can still age out.
   const courseSchedule = isCourse ? {
     firstSessionStart: service.schedule?.firstSessionStart,
     lastSessionEnd: service.schedule?.lastSessionEnd,
+    ...(businessTimeZone() && courseNeedsZone(service.schedule) ? { timeZone: businessTimeZone() } : {}),
   } : undefined;
-  const endedText = isCourse && courseHasEnded(service, Date.now()) ? copyParam("services.ended", "Ended") : "";
+  const endedText = courseSchedule && courseHasEnded({ schedule: courseSchedule }, Date.now()) ? copyParam("services.ended", "Ended") : "";
   const price = servicePriceLine(service, listLabel).text;
   const meta = [isCourse ? courseDatesText(service) : serviceDurationText(service, listLabel), price].filter(Boolean).join(" · ");
   const typeTag = typeTagOf(service.type);

package/templates/branded-lite/tier5-src/himi-branded-lite-cart/index.ts

@@ -364,7 +364,7 @@ function calculatedDiscount(result: unknown, currency: string): string {
   const discount = (result as { summary?: { priceSummary?: { discount?: { amount?: string; convertedAmount?: string } } } } | null)?.summary?.priceSummary?.discount;
   const amount = Number(discount?.amount);
   if (!Number.isFinite(amount) || amount === 0 || !currency) return "";
-  return formattedDiscount(formatCurrency(Math.abs(amount), currency, "en"));
+  return formattedDiscount(formatCurrency(Math.abs(amount), currency));
 }
 
 function invalidCouponFailure(error: unknown): boolean {

package/templates/branded-lite/tier5-src/himi-branded-lite-group/index.ts

@@ -7,6 +7,7 @@ import { initials } from "../_shared/himi-text.js";
 import { groupImage } from "../_shared/himi-media.js";
 import { WIX_DETAIL_IMAGE } from "@himalaya/wix-media";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+import { cachedMemberCount, groupMemberCount } from "../_shared/group-member-count.js";
 import { get as dbGet, upsert as dbUpsert, type DbEntity } from "@himalaya/local-db";
 import { isOfflineFailure, writeMayHaveLanded } from "../_shared/owner-load-error";
 import { descriptionBody } from "../_shared/rich-body.js";
@@ -37,7 +38,7 @@ async function cachePutMembership(state: State, joined: boolean): Promise<void>
       id: state.id,
       title: state.name,
       subtitle: state.description,
-      meta: state.memberCount,
+      count: state.memberTotal,
       image: state.image,
       initial: state.initial,
       hasImage: state.hasImage,
@@ -58,6 +59,8 @@ interface State {
   hasDescriptionJson: boolean;
   privacy: string;
   memberCount: string;
+  /** The raw count behind `memberCount`, written to the offline cache instead of the label. */
+  memberTotal: number | null;
   /** Member avatar strip (photo or initials per member) — best-effort: the
    *  per-group members query + member profile resolution both degrade to an
    *  empty (collapsed) strip, never a failed screen. */
@@ -141,6 +144,7 @@ const initial: State = {
   hasDescriptionJson: false,
   privacy: "",
   memberCount: "",
+  memberTotal: null,
   memberAvatars: [],
   hasMemberAvatars: false,
   noMemberAvatars: true,
@@ -198,7 +202,8 @@ const svc = defineService<State, {
           descriptionJson: body.bodyJson,
           hasDescriptionJson: body.bodyJson !== "",
           privacy: privacyLabel,
-          memberCount: count == null ? "" : `${count} ${count === 1 ? "member" : "members"}`,
+          memberCount: count == null ? "" : groupMemberCount(count),
+          memberTotal: count ?? null,
           memberAvatars,
           hasMemberAvatars: memberAvatars.length > 0,
           noMemberAvatars: memberAvatars.length === 0,
@@ -232,7 +237,8 @@ const svc = defineService<State, {
             descriptionJson: body.bodyJson,
             hasDescriptionJson: body.bodyJson !== "",
             privacy: "Unknown",
-            memberCount: String(cached.meta ?? ""),
+            memberCount: cachedMemberCount(cached.count),
+            memberTotal: typeof cached.count === "number" ? cached.count : null,
             image,
             initial: (name[0] || "G").toUpperCase(),
             message: "",

package/templates/branded-lite/tier5-src/himi-branded-lite-group-about/index.ts

@@ -2,6 +2,7 @@ import { defineService } from "@himalaya/state";
 import { getGroup, listRules, type WixGroup, type WixGroupRule } from "@himalaya/wix-groups";
 import { WIX_DETAIL_IMAGE } from "@himalaya/wix-media";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+import { groupMemberCount } from "../_shared/group-member-count.js";
 import { groupImage } from "../_shared/himi-media.js";
 import { descriptionBody } from "../_shared/rich-body.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
@@ -171,7 +172,7 @@ function groupState(state: State, id: string, group: WixGroup): State {
     hasDescriptionJson: body.bodyJson !== "",
     privacy,
     createdDate: created,
-    memberCount: typeof count === "number" ? `${count} ${count === 1 ? "member" : "members"}` : "",
+    memberCount: typeof count === "number" ? groupMemberCount(count) : "",
     image,
     initial: (name[0] || "G").toUpperCase(),
     errorText: "",

package/templates/branded-lite/tier5-src/himi-branded-lite-groups/index.ts

@@ -2,6 +2,7 @@ import { defineService } from "../_shared/collection-service.js";
 import { queryGroups, type WixGroup } from "@himalaya/wix-groups";
 import { groupImage } from "../_shared/himi-media.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+import { cachedMemberCount, groupMemberCount } from "../_shared/group-member-count.js";
 import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { descriptionBody, ROW_IMAGE_WIDTH } from "../_shared/rich-body.js";
 
@@ -16,7 +17,7 @@ const ENTITY = "groups";
 async function readCached(): Promise<GroupRow[]> {
   try {
     const rows = (await getAll(ENTITY)) as unknown as GroupRow[];
-    return rows.map((row) => ({ ...row, subtitle: snippet(descriptionBody(row.subtitle).bodyText
+    return rows.map((row) => ({ ...row, meta: cachedMemberCount(row.count), subtitle: snippet(descriptionBody(row.subtitle).bodyText
       || descriptionBody(row.descriptionJson || row.description).bodyText) }));
   } catch { return []; }
 }
@@ -31,6 +32,8 @@ interface GroupRow {
   description: string;
   descriptionJson: string;
   meta: string;
+  /** The raw member count, kept so the cached label is rebuilt in the current language. */
+  count: number | null;
   image: string;
   initial: string;
   hasImage: boolean;
@@ -69,7 +72,8 @@ function groupRow(group: WixGroup): GroupRow {
     subtitle: snippet(teaser) || snippet(body.bodyText) || copyParam("groups.subtitleFallback", "Join the conversation."),
     description: body.bodyText,
     descriptionJson: body.bodyJson,
-    meta: count == null ? "" : `${count} ${count === 1 ? "member" : "members"}`,
+    meta: count == null ? "" : groupMemberCount(count),
+    count: count ?? null,
     image,
     initial: (title[0] || "G").toUpperCase(),
     hasImage: Boolean(image),

package/templates/branded-lite/tier5-src/himi-branded-lite-home/index.ts

@@ -19,6 +19,7 @@ import { formatServicePrice } from "../_shared/wix-service-price.js";
 import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { LAYOUT_KEY, type LayoutId, recommendLayout, resolveLayout } from "../_shared/himi-layouts.js";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
+import { groupMemberCount } from "../_shared/group-member-count.js";
 import { parseWeeklyGoal, weeklyGoalProgress, weeklySessionsFromPages } from "../_shared/weekly-goal.js";
 import { isBridgeUnavailable } from "../_shared/owner-load-error.js";
 import { formatDateMedium } from "../_shared/engine-intl.js";
@@ -736,7 +737,7 @@ function groupCard(group: WixGroup): GroupCard {
   return {
     id: group.id || title,
     title,
-    meta: count == null ? "" : `${count} ${count === 1 ? "member" : "members"}`,
+    meta: count == null ? "" : groupMemberCount(count),
     image,
     initial: (title[0] || "G").toUpperCase(),
     hasImage: !!image,

package/templates/branded-lite/tier5-src/himi-branded-lite-loyalty/index.ts

@@ -3,6 +3,7 @@ import { defineService } from "../_shared/collection-service.js";
 import { LOADING, loaded, loadFailed, type LoadCopy, type LoadFlags } from "../_shared/branded-load-state.js";
 import { copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { formatCurrency, formatNumber } from "../_shared/engine-intl.js";
+import { isSingular } from "../_shared/app-locale.js";
 import { memberAccess, assertMemberAccess } from "../_shared/member-access.js";
 import { getLoyaltyProgram, listLoyaltyRewards, listLoyaltyEarningRules, getCurrentMemberLoyaltyAccount, type WixLoyaltyReward, type WixLoyaltyEarningRule } from "@himalaya/wix-loyalty";
 
@@ -24,7 +25,7 @@ function baseConfig<T extends { tierId?: string }>(configs: T[] | undefined): T
   return base?.length === 1 ? base[0] : undefined;
 }
 function points(value: number, customUnit: string): string {
-  const unit = customUnit || copyParam(value === 1 ? "loyalty.pointOne" : "loyalty.pointMany", value === 1 ? "point" : "points");
+  const unit = customUnit || copyParam(isSingular(value) ? "loyalty.pointOne" : "loyalty.pointMany", isSingular(value) ? "point" : "points");
   return copyTemplate("loyalty.pointsLabel", "{points} {unit}", { points: formatNumber(value), unit });
 }
 function rewardLabel(reward: WixLoyaltyReward, customUnit: string): string {
@@ -44,7 +45,7 @@ function earningLabel(rule: WixLoyaltyEarningRule, customUnit: string, currency:
     return copyParam("loyalty.earningUnavailable", "Points details unavailable");
   }
   return copyTemplate("loyalty.pointsPerSpend", "{points} per {amount}", {
-    points: points(rate.points, customUnit), amount: formatCurrency(rate.moneyAmount, currency, "en", Number.isInteger(rate.moneyAmount) ? 0 : undefined),
+    points: points(rate.points, customUnit), amount: formatCurrency(rate.moneyAmount, currency, undefined, Number.isInteger(rate.moneyAmount) ? 0 : undefined),
   });
 }
 function businessStamp(): unknown {

package/templates/branded-lite/tier5-src/himi-branded-lite-my-groups/index.ts

@@ -2,6 +2,7 @@ import { defineService } from "@himalaya/state";
 import { getGroup, listMemberships, type WixGroup, type WixGroupMembership } from "@himalaya/wix-groups";
 import { getMyMember } from "@himalaya/wix-members";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+import { groupMemberCount } from "../_shared/group-member-count.js";
 import { groupImage } from "../_shared/himi-media.js";
 import { memberAccess, memberAccessDenied, type MemberAccess } from "../_shared/member-access.js";
 
@@ -103,7 +104,7 @@ function rowOf(group: WixGroup, membership: WixGroupMembership): MyGroupRow {
     id: String(membership.groupId),
     title,
     statusLabel: statusLabelOf(membership),
-    meta: typeof count === "number" ? `${count} ${count === 1 ? "member" : "members"}` : "",
+    meta: typeof count === "number" ? groupMemberCount(count) : "",
     image,
     initial: (title[0] || "G").toUpperCase(),
     hasImage: Boolean(image),

package/templates/branded-lite/tier5-src/himi-branded-lite-plans/index.ts

@@ -82,7 +82,7 @@ function money(plan: WixPlan): string {
   const raw = price?.value;
   if (raw == null || raw === "" || Number.isNaN(Number(raw))) return "";
   try {
-    return formatCurrency(Number(raw), price?.currency || "USD", "en");
+    return formatCurrency(Number(raw), price?.currency || "USD");
   } catch {
     return `${raw}`;
   }

package/templates/branded-lite/tier5-src/himi-branded-lite-program/index.ts

@@ -147,7 +147,7 @@ function priceOf(p: WixProgram): string {
   if (raw == null || raw === "" || Number.isNaN(Number(raw))) return "";
   if (Number(raw) === 0) return "";
   try {
-    return formatCurrency(Number(raw), price?.currency || "USD", "en");
+    return formatCurrency(Number(raw), price?.currency || "USD");
   } catch {
     return `${raw}`;
   }

package/templates/branded-lite/tier5-src/himi-events-detail/index.ts

@@ -243,7 +243,7 @@ function tierPrice(t: WixAvailableTicket): string {
   // as "25" — a price that reads as a quantity, and nothing downstream could tell it was a
   // formatting failure. `formatCurrency` uses real Intl where it exists and a symbol-carrying
   // fallback where it does not, diffed against ECMA-402 in engine-intl-fallback.test.ts.
-  return formatCurrency(Number(raw), t.price?.currency || "USD", "en");
+  return formatCurrency(Number(raw), t.price?.currency || "USD");
 }
 
 function tierAvailable(t: WixAvailableTicket): boolean {
@@ -286,7 +286,7 @@ function tierRows(defs: WixAvailableTicket[], selectedId: string): TicketTierRow
         priceAmount: Number(t.price?.amount ?? 0),
         ...(isGuestPrice ? { priceLine: detailCopy("event.payWhatYouWant", "Pay what you want") } : {}),
         ...(isGuestPrice ? { priceAmount: minPrice, isGuestPrice: true } : {}),
-        ...(isGuestPrice ? { minimumPriceLabel: detailCopy("event.minPrice", "Minimum {price}").replace("{price}", formatCurrency(minPrice, t.price?.currency || "USD", "en")) } : {}),
+        ...(isGuestPrice ? { minimumPriceLabel: detailCopy("event.minPrice", "Minimum {price}").replace("{price}", formatCurrency(minPrice, t.price?.currency || "USD")) } : {}),
       };
     });
 }
@@ -399,7 +399,7 @@ function derive(s: S): S {
     noFooterCaption: !s.footerCaption,
     hideFooter: s.status !== "ready" || s.errored || !s.footerLabel || s.rsvpState !== "none",
     checkoutDisabled: count === 0 || count > s.ticketLimitPerOrder || ticketCheckoutInFlight || !ticketCheckoutAllowed || s.ticketTiers.some((row) => row.isGuestPrice && (row.quantity ?? 0) > 0 && (!String(row.guestPrice ?? "").trim() || Number(row.guestPrice) < (row.minPrice ?? 0) || !Number.isFinite(Number(row.guestPrice)))) || s.ticketTiers.some((row) => (row.quantity ?? 0) > (row.maxQuantity ?? 99)),
-    ticketTotal: formatCurrency(total, s.ticketCurrency || "USD", "en"),
+    ticketTotal: formatCurrency(total, s.ticketCurrency || "USD"),
     ticketCountLabel: copyParam("event.ticketCount", "{n} tickets, plus fees").replace("{n}", String(count)),
     noSchedule: s.schedule.length === 0,
     noFullSchedule: s.fullSchedule.length === 0,
@@ -494,7 +494,7 @@ function detailMoney(money?: EventDetailMoney): string {
   if (money?.formattedValue) return money.formattedValue;
   const value = money?.value;
   if (value == null || String(value).trim() === "" || !money?.currency || !Number.isFinite(Number(value))) return "";
-  return formatCurrency(Number(value), money.currency, "en");
+  return formatCurrency(Number(value), money.currency);
 }
 
 function detailPlace(e: WixEvent): { value: string; mapUrl: string; hideMapTap: boolean; icon: string } {
@@ -617,7 +617,7 @@ const svc: ReturnType<typeof defineService<S, DetailActions>> = defineService<S,
     ticketSheetOpen: false,
     rsvpActionsOpen: false,
     cancelConfirmOpen: false,
-    ticketTotal: formatCurrency(0, "USD", "en"),
+    ticketTotal: formatCurrency(0, "USD"),
     ticketCountLabel: copyParam("event.ticketCount", "{n} tickets, plus fees").replace("{n}", "0"),
     checkoutDisabled: true,
     schedule: [],

package/templates/branded-lite/tier5-src/wix-spaces-member-detail/index.ts

@@ -42,8 +42,12 @@ function name(m: WixMember): string {
 function followLabelFor(isFollowing: boolean): string {
   return isFollowing ? "Following ✓" : "Follow";
 }
+/** Each counter on its own: a missing one is hidden, never shown as 0, and an explicit 0 stays visible. */
 function followCountFor(followers: number | null, following: number | null): string {
-  return followers === null || following === null ? "" : followers + " Followers · " + following + " Following";
+  return [
+    followers === null ? "" : followers + (followers === 1 ? " Follower" : " Followers"),
+    following === null ? "" : following + " Following",
+  ].filter(Boolean).join(" · ");
 }
 
 const INITIAL: S = {