diff --git a/src/uix/eidos/components/badge/badge.svelte b/src/uix/eidos/components/badge/badge.svelte index 1c42c97ac..dfc4783a6 100644 --- a/src/uix/eidos/components/badge/badge.svelte +++ b/src/uix/eidos/components/badge/badge.svelte @@ -13,7 +13,6 @@ */ import './badge.css'; import { ActiveEidos } from '$uix/eidos'; - import { getActiveUix } from '$active-uix'; import { BADGE_LANGS } from './langs'; import type { BadgeProps } from './types'; @@ -32,12 +31,11 @@ }: BadgeProps = $props(); const eidos = ActiveEidos.require(); - const uix = getActiveUix(); const resolvedSize = $derived(eidos.resolve(size, 'md')); const resolvedRounded = $derived(eidos.resolve(rounded, 'full')); const resolvedRemoveLabel = $derived( - removeLabel ?? uix.langs.ts(BADGE_LANGS.REMOVE) + removeLabel ?? eidos.langs.ts(BADGE_LANGS.REMOVE) ); diff --git a/src/uix/eidos/components/format-date/format-date.svelte b/src/uix/eidos/components/format-date/format-date.svelte index e0ad1faa4..7c5ac221a 100644 --- a/src/uix/eidos/components/format-date/format-date.svelte +++ b/src/uix/eidos/components/format-date/format-date.svelte @@ -1,16 +1,16 @@ {#if image?.status === 'error'} diff --git a/src/uix/eidos/components/image/image-fallback.svelte b/src/uix/eidos/components/image/image-fallback.svelte index 4cad1c46b..2415e04db 100644 --- a/src/uix/eidos/components/image/image-fallback.svelte +++ b/src/uix/eidos/components/image/image-fallback.svelte @@ -7,7 +7,7 @@ * No parent Image? Always renders — useful for static placeholders * outside a managed image surface. */ - import { getActiveUix } from '$active-uix'; + import { ActiveEidos } from '$uix/eidos'; import { IMAGE_LANGS } from './langs'; import type { ImageFallbackProps } from './types'; import { getImageEidosContext } from './image-context'; @@ -19,8 +19,8 @@ }: ImageFallbackProps = $props(); const image = getImageEidosContext(); - const uix = getActiveUix(); - const resolvedLabel = $derived(ariaLabel ?? uix.langs.ts(IMAGE_LANGS.LOADING_LABEL)); + const eidos = ActiveEidos.require(); + const resolvedLabel = $derived(ariaLabel ?? eidos.langs.ts(IMAGE_LANGS.LOADING_LABEL)); {#if (image?.fallbackVisible ?? true) && image?.status !== 'error'} diff --git a/src/uix/eidos/components/image/image.svelte b/src/uix/eidos/components/image/image.svelte index 4a071453f..59788ea6c 100644 --- a/src/uix/eidos/components/image/image.svelte +++ b/src/uix/eidos/components/image/image.svelte @@ -21,7 +21,6 @@ import { ImageProvider } from '$soma/layers'; import { ActiveEidos } from '$uix/eidos'; import { COLOR_ROLES } from '$uix/eidos/lib/config-types'; - import { getActiveUix } from '$active-uix'; import { IMAGE_LANGS } from './langs'; import type { ImageProps, ImageStatusValue } from './types'; import { setImageEidosContext } from './image-context'; @@ -58,7 +57,6 @@ }: ImageProps = $props(); const eidos = ActiveEidos.require(); - const uix = getActiveUix(); const resolvedFit = $derived(eidos.resolve(fit, 'cover')); const resolvedPosition = $derived(eidos.resolve(position, 'center')); @@ -123,8 +121,8 @@ // Translated default labels — exposed to the Fallback / Error // children as `aria-label` defaults via context. - const loadingLabel = $derived(uix.langs.ts(IMAGE_LANGS.LOADING_LABEL)); - const errorLabel = $derived(uix.langs.ts(IMAGE_LANGS.ERROR_LABEL)); + const loadingLabel = $derived(eidos.langs.ts(IMAGE_LANGS.LOADING_LABEL)); + const errorLabel = $derived(eidos.langs.ts(IMAGE_LANGS.ERROR_LABEL)); const fallbackIsString = $derived(typeof fallback === 'string'); const errorFallbackIsString = $derived(typeof errorFallback === 'string'); diff --git a/src/uix/eidos/components/password-field/password-field-caps-lock-indicator.svelte b/src/uix/eidos/components/password-field/password-field-caps-lock-indicator.svelte index b72432069..4116eafb6 100644 --- a/src/uix/eidos/components/password-field/password-field-caps-lock-indicator.svelte +++ b/src/uix/eidos/components/password-field/password-field-caps-lock-indicator.svelte @@ -1,5 +1,5 @@ diff --git a/src/uix/eidos/components/picker-shell/picker-shell-cancel.svelte b/src/uix/eidos/components/picker-shell/picker-shell-cancel.svelte index 74a38e0bf..4b6a505bc 100644 --- a/src/uix/eidos/components/picker-shell/picker-shell-cancel.svelte +++ b/src/uix/eidos/components/picker-shell/picker-shell-cancel.svelte @@ -1,6 +1,6 @@ diff --git a/src/uix/eidos/components/skeleton/skeleton.svelte b/src/uix/eidos/components/skeleton/skeleton.svelte index 2d15dd5cc..49cea628e 100644 --- a/src/uix/eidos/components/skeleton/skeleton.svelte +++ b/src/uix/eidos/components/skeleton/skeleton.svelte @@ -13,7 +13,6 @@ */ import './skeleton.css'; import { ActiveEidos } from '$uix/eidos'; - import { getActiveUix } from '$active-uix'; import { SKELETON_LANGS } from './langs'; import type { SkeletonProps } from './types'; @@ -29,11 +28,10 @@ }: SkeletonProps = $props(); const eidos = ActiveEidos.require(); - const uix = getActiveUix(); const resolvedShape = $derived(eidos.resolve(shape, 'rect')); const resolvedSize = $derived(eidos.resolve(size, 'md')); - const resolvedLabel = $derived(ariaLabel ?? uix.langs.ts(SKELETON_LANGS.LABEL)); + const resolvedLabel = $derived(ariaLabel ?? eidos.langs.ts(SKELETON_LANGS.LABEL)); // Stagger widths for multi-line text skeletons so the block reads as // a paragraph rather than a solid rectangle. Last line always shorter. diff --git a/src/uix/eidos/components/spinner/spinner.svelte b/src/uix/eidos/components/spinner/spinner.svelte index f6ba54d06..d0e7ac67c 100644 --- a/src/uix/eidos/components/spinner/spinner.svelte +++ b/src/uix/eidos/components/spinner/spinner.svelte @@ -12,7 +12,6 @@ */ import './spinner.css'; import { ActiveEidos } from '$uix/eidos'; - import { getActiveUix } from '$active-uix'; import { SPINNER_LANGS } from './langs'; import type { SpinnerProps } from './types'; @@ -26,10 +25,9 @@ }: SpinnerProps = $props(); const eidos = ActiveEidos.require(); - const uix = getActiveUix(); const resolvedSize = $derived(eidos.resolve(size, 'md')); - const resolvedLabel = $derived(ariaLabel ?? uix.langs.ts(SPINNER_LANGS.LABEL)); + const resolvedLabel = $derived(ariaLabel ?? eidos.langs.ts(SPINNER_LANGS.LABEL));
[0], params, locale); + const result = eidos.langs.t(path as Parameters[0], params, locale); // langs.t returns the path itself when missing — fall back to // the captured children text if available. if (result === path && capturedText) return capturedText; @@ -66,7 +66,7 @@ // idlangrefs (`#?path|fallback`) and literal strings alike. const source = value ?? capturedText; if (source === undefined) return ''; - return uix.langs.ts(source as LangString, locale); + return eidos.langs.ts(source as LangString, locale); }); // `hasSource` is true once we have any source string to render.