includio-cms 0.7.2 → 0.13.0

package/dist/admin/api/rest/routes/singletons.js

@@ -3,11 +3,12 @@ import { getCMS } from '../../../../core/cms.js';
 import { getRawEntries } from '../../../../core/server/entries/operations/get.js';
 import { createEntry } from '../../../../core/server/entries/operations/create.js';
 import { upsertDraftVersion } from '../../../../core/server/entries/operations/update.js';
-export async function GET(_event, slug) {
+export async function GET(event, slug) {
     const cms = getCMS();
     if (!cms.singles[slug]) {
         return json({ error: `Singleton "${slug}" not found` }, { status: 404 });
     }
+    const lang = event.url.searchParams.get('lang') || cms.languages[0] || 'en';
     const entries = await getRawEntries({ slug });
     const entry = entries[0];
     if (!entry) {
@@ -24,11 +25,10 @@ export async function GET(_event, slug) {
         type: entry.type,
         createdAt: entry.createdAt,
         updatedAt: entry.updatedAt,
-        publishedAt: entry.publishedAt,
-        draftData: entry.draftVersion?.data ?? null,
-        publishedData: entry.publishedVersion?.data ?? null,
-        draftVersionId: entry.draftVersion?.id ?? null,
-        publishedVersionId: entry.publishedVersion?.id ?? null
+        draftData: entry.draftVersions[lang]?.data ?? null,
+        publishedData: entry.publishedVersions[lang]?.data ?? null,
+        draftVersionId: entry.draftVersions[lang]?.id ?? null,
+        publishedVersionId: entry.publishedVersions[lang]?.id ?? null
     });
 }
 export async function PUT(event, slug) {
@@ -36,6 +36,7 @@ export async function PUT(event, slug) {
     if (!cms.singles[slug]) {
         return json({ error: `Singleton "${slug}" not found` }, { status: 404 });
     }
+    const lang = event.url.searchParams.get('lang') || cms.languages[0] || 'en';
     const body = await event.request.json().catch(() => null);
     if (!body?.data || typeof body.data !== 'object') {
         return json({ error: 'Request body must contain "data" object' }, { status: 400 });
@@ -51,7 +52,7 @@ export async function PUT(event, slug) {
             return json({ error: 'Failed to create singleton entry' }, { status: 500 });
         }
     }
-    const version = await upsertDraftVersion(entry.id, body.data, { skipValidation: true });
+    const version = await upsertDraftVersion(entry.id, body.data, lang, { skipValidation: true });
     return json({
         id: entry.id,
         versionId: version.id,

package/dist/admin/api/rest/routes/upload.d.ts

@@ -0,0 +1,2 @@
+import { type RequestEvent } from '@sveltejs/kit';
+export declare function POST(event: RequestEvent): Promise<Response>;

package/dist/admin/api/rest/routes/upload.js

@@ -0,0 +1,28 @@
+import { json } from '@sveltejs/kit';
+import { uploadFile } from '../../../../core/server/media/operations/uploadFile.js';
+import { getCMS } from '../../../../core/cms.js';
+const MAX_UPLOAD_SIZE = 50 * 1024 * 1024; // 50MB
+export async function POST(event) {
+    const form = await event.request.formData();
+    const file = form.get('file');
+    const tagIdsRaw = form.get('tagIds');
+    if (!file || file.size === 0) {
+        return json({ error: 'No file provided' }, { status: 400 });
+    }
+    if (file.size > MAX_UPLOAD_SIZE) {
+        return json({ error: 'File too large (max 50MB)' }, { status: 413 });
+    }
+    const dbFile = await uploadFile(file);
+    if (tagIdsRaw) {
+        try {
+            const tagIds = JSON.parse(tagIdsRaw);
+            if (Array.isArray(tagIds) && tagIds.length > 0) {
+                await getCMS().databaseAdapter.setMediaFileTags(dbFile.id, tagIds);
+            }
+        }
+        catch {
+            // ignore invalid tagIds JSON
+        }
+    }
+    return json(dbFile, { status: 201 });
+}

package/dist/admin/api/upload.js

@@ -1,11 +1,13 @@
 import { requireAuth } from '../remote/middleware/auth.js';
 import { uploadFile } from '../../core/server/media/operations/uploadFile.js';
+import { getCMS } from '../../core/cms.js';
 import { json } from '@sveltejs/kit';
 const MAX_UPLOAD_SIZE = 50 * 1024 * 1024; // 50MB
 export const POST = async ({ request }) => {
     requireAuth();
     const form = await request.formData();
     const file = form.get('file');
+    const tagIdsRaw = form.get('tagIds');
     if (!file || file.size === 0) {
         return new Response('No file', { status: 400 });
     }
@@ -13,5 +15,16 @@ export const POST = async ({ request }) => {
         return new Response('File too large', { status: 413 });
     }
     const dbFile = await uploadFile(file);
+    if (tagIdsRaw) {
+        try {
+            const tagIds = JSON.parse(tagIdsRaw);
+            if (Array.isArray(tagIds) && tagIds.length > 0) {
+                await getCMS().databaseAdapter.setMediaFileTags(dbFile.id, tagIds);
+            }
+        }
+        catch {
+            // ignore invalid tagIds JSON
+        }
+    }
     return json(dbFile);
 };

package/dist/admin/client/collection/collection-entries.svelte

@@ -378,8 +378,20 @@
 		pendingDeleteId = null;
 	}
 
+	function getVersionData(entry: RawEntry): Record<string, unknown> | undefined {
+		const lang = contentLanguage.current;
+		const draft = entry.draftVersions[lang];
+		const published = entry.publishedVersions[lang];
+		if (draft?.data) return draft.data as Record<string, unknown>;
+		if (published?.data) return published.data as Record<string, unknown>;
+		// Fallback: any lang
+		for (const v of Object.values(entry.draftVersions)) if (v?.data) return v.data as Record<string, unknown>;
+		for (const v of Object.values(entry.publishedVersions)) if (v?.data) return v.data as Record<string, unknown>;
+		return undefined;
+	}
+
 	function getSearchText(entry: RawEntry): string {
-		const data = entry.draftVersion?.data || entry.publishedVersion?.data;
+		const data = getVersionData(entry);
 		if (!data) return '';
 		return extractTextValues(data).join(' ').toLowerCase();
 	}
@@ -404,7 +416,7 @@
 
 	function extractSlug(entry: RawEntry): string | undefined {
 		if (!seoField) return undefined;
-		const data = entry.draftVersion?.data || entry.publishedVersion?.data;
+		const data = getVersionData(entry);
 		if (!data) return undefined;
 		const seoData = data[seoField.slug];
 		if (seoData && typeof seoData === 'object' && 'slug' in seoData) {
@@ -414,7 +426,7 @@
 	}
 
 	function countA11yWarnings(entry: RawEntry): number {
-		const data = entry.draftVersion?.data || entry.publishedVersion?.data;
+		const data = getVersionData(entry);
 		if (!data) return 0;
 		const a11yLang = interfaceLanguage.current === 'pl' ? a11yLangPl : a11yLangEn;
 		const issues = validateA11y(data as Record<string, unknown>, collection.fields, a11yLang);
@@ -429,7 +441,7 @@
 			uuidsByCollection.set(field.collection, new Set());
 		}
 		for (const entry of entries) {
-			const data = entry.publishedVersion?.data || entry.draftVersion?.data;
+			const data = getVersionData(entry);
 			if (!data) continue;
 			for (const field of relationListFields) {
 				const raw = (data as Record<string, unknown>)[field.slug];
@@ -454,9 +466,10 @@
 	}
 
 	function mapEntryToRow(entry: RawEntry, lookup: Record<string, string> = {}): CollectionDataTableRow {
-		const data = entry.draftVersion?.data || entry.publishedVersion?.data || {};
+		const data = getVersionData(entry) || {};
 		// For custom columns, prefer published data (complete) over draft (may be partial)
-		const columnData = entry.publishedVersion?.data || entry.draftVersion?.data || {};
+		const lang = contentLanguage.current;
+		const columnData = entry.publishedVersions[lang]?.data || entry.draftVersions[lang]?.data || data;
 		const customData: Record<string, unknown> = {};
 		if (collection.listColumns) {
 			for (const fieldSlug of collection.listColumns) {

package/dist/admin/client/entry/entry.svelte

@@ -28,8 +28,6 @@
 	import { createHybridContext } from './hybrid/hybrid-context.svelte.js';
 	import { onMount } from 'svelte';
 	import { get } from 'svelte/store';
-	import { computeTranslationStatus } from '../../utils/translationStatus.js';
-
 	const contentLanguage = getContentLanguage();
 	const remotes = getRemotes();
 	const interfaceLanguage = useInterfaceLanguage();
@@ -142,10 +140,11 @@
 	let { collection } = entry;
 	const isArchived = $derived(!!entry.archivedAt);
 
-	// Create form once at component level
+	// Create form once at component level — localized: false since data is flat single-language
 	const collectionSchema = generateZodSchemaFromFields(
 		getFieldsFromConfig(collection),
-		contentLanguage.all
+		contentLanguage.all,
+		{ localized: false }
 	);
 	const form = superForm(defaults(editingEntry.data, zod4(collectionSchema)), {
 		validators: zod4Client(collectionSchema),
@@ -166,15 +165,6 @@
 
 	const AUTOSAVE_DELAY = 30000; // 30 seconds
 
-	// Reactive translation status — must live here where we can subscribe to form.form store
-	const formStore = form.form;
-	const collectionFields = getFieldsFromConfig(collection);
-	const translationStatus = $derived.by(() => {
-		if (contentLanguage.all.length <= 1) return null;
-		const data = $formStore;
-		return computeTranslationStatus(data, collectionFields, contentLanguage.all);
-	});
-
 	function scheduleAutosave() {
 		if (isArchived) return;
 		if (autosaveTimer) {
@@ -195,15 +185,18 @@
 
 		saveStatus = 'saving';
 		try {
+			const currentLang = contentLanguage.current;
 			const result = await remotes.updateEntryVersionCommand({
 				entryId: entry.id,
+				lang: currentLang,
 				data: currentFormData,
 				type: 'draft'
 			});
 			lastSavedData = currentData;
 			saveStatus = 'saved';
 			// If we're editing the published version and saved a draft, track it for the banner
-			if (entry.publishedVersion && editingEntry.id === entry.publishedVersion.id && result?.id) {
+			const publishedVersion = entry.publishedVersions[currentLang];
+			if (publishedVersion && editingEntry.id === publishedVersion.id && result?.id) {
 				savedDraftVersionId = result.id;
 			}
 			// Reset to idle after 3s
@@ -270,6 +263,7 @@
 			try {
 				await remotes.updateEntryVersionCommand({
 					entryId: entry.id,
+					lang: contentLanguage.current,
 					data: get(form.form),
 					type
 				});
@@ -298,6 +292,7 @@
 			try {
 				await remotes.updateEntryVersionCommand({
 					entryId: entry.id,
+					lang: contentLanguage.current,
 					data: validatedForm.data,
 					type,
 					scheduledAt
@@ -501,21 +496,25 @@
 		}
 	});
 
+	// Per-language version lookups
+	const currentPublishedVersion = $derived(entry.publishedVersions[contentLanguage.current]);
+	const currentDraftVersion = $derived(entry.draftVersions[contentLanguage.current]);
+
 	// Banner: viewing published version + a separate draft exists
 	const showDraftBanner = $derived(
-		entry.publishedVersion != null &&
-			editingEntry.id === entry.publishedVersion.id &&
-			entry.draftVersion != null &&
-			entry.draftVersion.id !== entry.publishedVersion.id &&
-			entry.draftVersion.createdAt > entry.publishedVersion.createdAt
+		currentPublishedVersion != null &&
+			editingEntry.id === currentPublishedVersion.id &&
+			currentDraftVersion != null &&
+			currentDraftVersion.id !== currentPublishedVersion.id &&
+			currentDraftVersion.createdAt > currentPublishedVersion.createdAt
 	);
 
 	// Banner: viewing draft + a published version exists
 	const showPublishedBanner = $derived(
-		entry.publishedVersion != null && editingEntry.id !== entry.publishedVersion.id
+		currentPublishedVersion != null && editingEntry.id !== currentPublishedVersion.id
 	);
 
-	const draftVersionId = $derived(entry.draftVersion?.id ?? savedDraftVersionId);
+	const draftVersionId = $derived(currentDraftVersion?.id ?? savedDraftVersionId);
 
 	const scrollToIssue = (fieldSlug: string) => {
 		const fieldEl = document.querySelector(`[data-field-path="${fieldSlug}"]`);
@@ -554,7 +553,6 @@
 		fields={getFieldsFromConfig(collection)}
 		getFormData={() => get(form.form)}
 		onScrollToIssue={scrollToIssue}
-		{translationStatus}
 	/>
 
 	{#if validationErrors.length > 0}
@@ -620,7 +618,7 @@
 			<button
 				type="button"
 				class="font-semibold text-[var(--primary)] hover:underline"
-				onclick={() => goto(`?version=${entry.publishedVersion!.id}`)}
+				onclick={() => goto(`?version=${currentPublishedVersion!.id}`)}
 			>
 				{lang[interfaceLanguage.current].switchToPublished}
 			</button>

package/dist/admin/client/entry/header/a11y-validator.js

@@ -198,7 +198,7 @@ function tryExtractDoc(val) {
 function extractDocs(data, fields) {
     const result = [];
     for (const field of fields) {
-        if (field.type !== 'content' && field.type !== 'richtext')
+        if (field.type !== 'content')
             continue;
         const val = data[field.slug];
         const docs = tryExtractDoc(val);
@@ -212,7 +212,7 @@ function extractDocs(data, fields) {
 function extractDocsForLang(data, fields, language) {
     const result = [];
     for (const field of fields) {
-        if (field.type !== 'content' && field.type !== 'richtext')
+        if (field.type !== 'content')
             continue;
         const val = data[field.slug];
         if (!val || typeof val !== 'object')

package/dist/admin/client/entry/header/publish-panel.svelte

@@ -16,10 +16,9 @@
 	import InfoCircle from '@tabler/icons-svelte/icons/info-circle';
 	import Shield from '@tabler/icons-svelte/icons/shield';
 	import CircleCheck from '@tabler/icons-svelte/icons/circle-check';
-	import { getEntryStatus } from '../utils.js';
+	import { getEntryStatusForLang } from '../utils.js';
 	import { validateA11y, a11yLangPl, a11yLangEn, type A11yIssue } from './a11y-validator.js';
 	import { getContentLanguage } from '../../../state/content-language.svelte.js';
-	import { computeTranslationStatus, type LangStatus } from '../../../utils/translationStatus.js';
 	import LanguageIcon from '@tabler/icons-svelte/icons/language';
 
 	const lang: Record<
@@ -131,19 +130,13 @@
 	let dateValue = $state('');
 	let timeValue = $state('');
 	let a11yIssues = $state<A11yIssue[]>([]);
-	let translationStatus = $state<Record<string, LangStatus> | null>(null);
 
-	const entryStatus = $derived(getEntryStatus(entry));
+	// Status is per current language
+	const entryStatus = $derived(getEntryStatusForLang(entry, contentLanguage.current));
 	const t = $derived(lang[interfaceLanguage.current]);
 
 	const hasA11yWarnings = $derived(a11yIssues.some((i) => i.type === 'warning'));
-	const hasIncompleteTranslations = $derived(
-		translationStatus != null &&
-			Object.values(translationStatus).some((s) => s.status !== 'complete')
-	);
-	const showTranslationSection = $derived(
-		contentLanguage.all.length > 1 && translationStatus != null
-	);
+	const showLangStatusSection = $derived(contentLanguage.all.length > 1);
 
 	const scheduleLabel = $derived.by(() => {
 		switch (entryStatus) {
@@ -173,8 +166,9 @@
 	}
 
 	function setDefaultValues() {
-		if (entryStatus === 'scheduled' && entry.publishedAt) {
-			const scheduled = new Date(entry.publishedAt);
+		const scheduledVersion = entry.scheduledVersions[contentLanguage.current];
+		if (entryStatus === 'scheduled' && scheduledVersion?.publishedAt) {
+			const scheduled = new Date(scheduledVersion.publishedAt);
 			dateValue = scheduled.toISOString().slice(0, 10);
 			timeValue = `${String(scheduled.getHours()).padStart(2, '0')}:${String(scheduled.getMinutes()).padStart(2, '0')}`;
 		} else {
@@ -229,20 +223,10 @@
 		a11yIssues = validateA11y(data, fields, a11yLang, contentLanguage.all);
 	}
 
-	function runTranslationCheck() {
-		if (contentLanguage.all.length <= 1 || !fields.length) {
-			translationStatus = null;
-			return;
-		}
-		const data = getFormData ? getFormData() : version.data;
-		translationStatus = computeTranslationStatus(data, fields, contentLanguage.all);
-	}
-
 	$effect(() => {
 		if (open) {
 			setDefaultValues();
 			runA11yValidation();
-			runTranslationCheck();
 		}
 	});
 </script>
@@ -284,92 +268,56 @@
 					</div>
 				</div>
 
-				{#if entryStatus === 'published' && entry.publishedAt}
+				{#if entryStatus === 'published' && entry.publishedVersions[contentLanguage.current]?.publishedAt}
 					<div class="publish-detail-row">
 						<span>{t.publishedAt}</span>
-						<span class="tabular-nums">{formatDateTime(entry.publishedAt)}</span>
+						<span class="tabular-nums">{formatDateTime(entry.publishedVersions[contentLanguage.current]?.publishedAt)}</span>
 					</div>
 				{/if}
 
-				{#if entryStatus === 'scheduled' && entry.publishedAt}
+				{#if entryStatus === 'scheduled' && entry.publishedVersions[contentLanguage.current]?.publishedAt}
 					<div class="publish-detail-row">
 						<span>{t.scheduledFor}</span>
-						<span class="tabular-nums">{formatDateTime(entry.publishedAt)}</span>
+						<span class="tabular-nums">{formatDateTime(entry.publishedVersions[contentLanguage.current]?.publishedAt)}</span>
 					</div>
 				{/if}
 
-				{#if entry.publishedVersion && entry.publishedVersion.id !== version.id}
+				{#if entry.publishedVersions[contentLanguage.current] && entry.publishedVersions[contentLanguage.current].id !== version.id}
 					<div class="publish-detail-row">
 						<span>{t.publishedVersion}</span>
-						<span class="tabular-nums">{formatDateTime(entry.publishedVersion.createdAt)}</span>
+						<span class="tabular-nums">{formatDateTime(entry.publishedVersions[contentLanguage.current].createdAt)}</span>
 					</div>
 				{/if}
 			</div>
 
-			<!-- Translation section -->
-		{#if showTranslationSection && translationStatus}
+			<!-- Per-language status section -->
+		{#if showLangStatusSection}
 			<div class="sheet-section">
 				<div class="sheet-section-title">
 					<LanguageIcon class="size-3.5" />
 					{t.translations}
 				</div>
 
-				{#each contentLanguage.all as lang}
-					{@const status = translationStatus[lang]}
-					{#if status}
-						<div class="translation-lang-row">
-							<div class="translation-lang-header">
-								<span class="translation-lang-label">{lang.toUpperCase()}</span>
-								<span class="translation-lang-pct {status.status === 'complete' ? 'complete' : status.status === 'partial' ? 'partial' : 'empty'}">
-									{#if status.status === 'complete'}&#10003;{:else}{status.percentage}%{/if}
-								</span>
-							</div>
-							<div class="translation-progress-track">
-								<div
-									class="translation-progress-fill {status.status === 'complete' ? 'complete' : status.status === 'partial' ? 'partial' : ''}"
-									style="width: {status.percentage}%"
-								></div>
-							</div>
+				{#each contentLanguage.all as langCode}
+					{@const langPub = entry.publishedVersions[langCode]}
+					{@const langSch = entry.scheduledVersions[langCode]}
+					{@const langDraft = entry.draftVersions[langCode]}
+					{@const langStatus = langPub ? 'published' : langSch ? 'scheduled' : 'draft'}
+					<div class="translation-lang-row">
+						<div class="translation-lang-header">
+							<span class="translation-lang-label">{langCode.toUpperCase()}</span>
+							<span class="translation-lang-pct {langStatus === 'published' ? 'complete' : langStatus === 'scheduled' ? 'partial' : 'empty'}">
+								{t.statusLabels[langStatus]}
+							</span>
 						</div>
-					{/if}
+						<div class="translation-progress-track">
+							<div
+								class="translation-progress-fill {langStatus === 'published' ? 'complete' : langStatus === 'scheduled' ? 'partial' : ''}"
+								style="width: {langStatus === 'published' ? 100 : langStatus === 'scheduled' ? 66 : langDraft ? 33 : 0}%"
+							></div>
+						</div>
+					</div>
 				{/each}
-
-				{#if hasIncompleteTranslations}
-					{#each contentLanguage.all as lang}
-						{@const status = translationStatus[lang]}
-						{#if status && status.missingFields.length > 0}
-							<div class="translation-missing">
-								<div class="translation-missing-title">{t.missingFieldsLabel(lang)}</div>
-								{#each status.missingFields as field}
-									{#if onScrollToIssue}
-										<button
-											type="button"
-											class="a11y-item warning a11y-item-clickable"
-											onclick={() => {
-												contentLanguage.current = lang;
-												open = false;
-												setTimeout(() => onScrollToIssue!(field.slug, 0), 200);
-											}}
-										>
-											<div class="a11y-item-icon">
-												<AlertTriangle class="size-4" />
-											</div>
-											<span class="a11y-item-text">{field.label}</span>
-										</button>
-									{:else}
-										<div class="a11y-item warning">
-											<div class="a11y-item-icon">
-												<AlertTriangle class="size-4" />
-											</div>
-											<span class="a11y-item-text">{field.label}</span>
-										</div>
-									{/if}
-								{/each}
-							</div>
-						{/if}
-					{/each}
-					<p class="a11y-hint">{t.translationsHint}</p>
-				{/if}
 			</div>
 		{/if}
 

package/dist/admin/client/entry/header/status-badge.svelte

@@ -45,8 +45,8 @@
 
 	let { entry, version }: Props = $props();
 
-	const isPublishedVersion = $derived(entry.publishedVersion?.id === version.id);
-	const isScheduledVersion = $derived(entry.scheduledVersion?.id === version.id);
+	const isPublishedVersion = $derived(entry.publishedVersions[version.lang]?.id === version.id);
+	const isScheduledVersion = $derived(entry.scheduledVersions[version.lang]?.id === version.id);
 
 	const currentStatus = $derived.by((): EntryVersionStatus => {
 		if (isPublishedVersion) return 'published';

package/dist/admin/client/entry/header/version-history-sheet.svelte

@@ -89,8 +89,8 @@
 	}
 
 	function getDotClass(version: DbEntryVersion): string {
-		const isPublished = entry.publishedVersionId === version.id && entryStatus === 'published';
-		const isScheduled = entry.publishedVersionId === version.id && entryStatus === 'scheduled';
+		const isPublished = entry.publishedVersions[version.lang]?.id === version.id && entryStatus === 'published';
+		const isScheduled = entry.publishedVersions[version.lang]?.id === version.id && entryStatus === 'scheduled';
 		const isCurrent = version.id === currentVersionId;
 
 		if (isPublished) return 'dot-published';
@@ -109,7 +109,7 @@
 			// Always keep current version
 			if (version.id === currentVersionId) return true;
 			// Always keep published/scheduled
-			if (entry.publishedVersionId === version.id) return true;
+			if (entry.publishedVersions[version.lang]?.id === version.id) return true;
 			// Keep versions with actual data changes vs previous
 			const prevVersion = sortedVersions[idx + 1];
 			if (!prevVersion) return true; // first version
@@ -132,8 +132,8 @@
 		const groups: Map<string, DbEntryVersion[]> = new Map();
 
 		for (const version of timelineVersions) {
-			const isPublished = entry.publishedVersionId === version.id && entryStatus === 'published';
-			const isScheduled = entry.publishedVersionId === version.id && entryStatus === 'scheduled';
+			const isPublished = entry.publishedVersions[version.lang]?.id === version.id && entryStatus === 'published';
+			const isScheduled = entry.publishedVersions[version.lang]?.id === version.id && entryStatus === 'scheduled';
 
 			let key: string;
 			if (isPublished) {
@@ -193,12 +193,12 @@
 							<div class="vh-item-left">
 								<span class="vh-time">{formatTime(currentVersion.createdAt)}</span>
 								<Badge class="vh-badge-editing">{t.editing}</Badge>
-								{#if entry.publishedVersionId === currentVersion.id && entryStatus === 'published'}
+								{#if entry.publishedVersions[currentVersion.lang]?.id === currentVersion.id && entryStatus === 'published'}
 									<Badge class="vh-badge-published">
 										<SquareCheckFilled class="size-2.5 mr-0.5" />
 										{t.published}
 									</Badge>
-								{:else if entry.publishedVersionId === currentVersion.id && entryStatus === 'scheduled'}
+								{:else if entry.publishedVersions[currentVersion.lang]?.id === currentVersion.id && entryStatus === 'scheduled'}
 									<Badge class="vh-badge-scheduled">
 										{t.scheduled}
 									</Badge>
@@ -233,8 +233,8 @@
 						<div class="vh-timeline-line"></div>
 
 						{#each versions as version}
-							{@const isPublished = entry.publishedVersionId === version.id && entryStatus === 'published'}
-							{@const isScheduled = entry.publishedVersionId === version.id && entryStatus === 'scheduled'}
+							{@const isPublished = entry.publishedVersions[version.lang]?.id === version.id && entryStatus === 'published'}
+							{@const isScheduled = entry.publishedVersions[version.lang]?.id === version.id && entryStatus === 'scheduled'}
 							{@const prevVersion = sortedVersions.find(
 								(v) => v.versionNumber === version.versionNumber - 1
 							)}

package/dist/admin/client/entry/header/visibility.svelte

@@ -1,11 +1,12 @@
 <script lang="ts">
+	import { getContentLanguage } from '../../../state/content-language.svelte.js';
 	import { useInterfaceLanguage } from '../../../state/interface-language.svelte.js';
 	import type { RawEntry } from '../../../../types/entries.js';
 	import type { InterfaceLanguage } from '../../../../types/languages.js';
 	import ClockFilled from '@tabler/icons-svelte/icons/clock-filled';
 	import FileFilled from '@tabler/icons-svelte/icons/file-filled';
 	import SquareCheckFilled from '@tabler/icons-svelte/icons/square-check-filled';
-	import { getEntryStatus } from '../utils.js';
+	import { getEntryStatusForLang } from '../utils.js';
 
 	const lang: Record<
 		InterfaceLanguage,
@@ -34,6 +35,7 @@
 	};
 
 	const interfaceLanguage = useInterfaceLanguage();
+	const contentLanguage = getContentLanguage();
 
 	type Props = {
 		entry: RawEntry;
@@ -41,34 +43,38 @@
 
 	let { entry }: Props = $props();
 
-	const entryStatus = $derived(getEntryStatus(entry));
+	const currentLang = $derived(contentLanguage.current);
+	const entryStatus = $derived(getEntryStatusForLang(entry, currentLang));
+	const publishedVersion = $derived(entry.publishedVersions[currentLang]);
+	const scheduledVersion = $derived(entry.scheduledVersions[currentLang]);
+	const draftVersion = $derived(entry.draftVersions[currentLang]);
 </script>
 
 <div class="flex items-center gap-1 text-sm">
 	<span class="text-muted-foreground"> {lang[interfaceLanguage.current].status}:</span>
 
-	{#if entryStatus === 'published' && entry.publishedVersion}
+	{#if entryStatus === 'published' && publishedVersion}
 		<span class="flex items-center gap-1">
 			<SquareCheckFilled />
-			{lang[interfaceLanguage.current].published} (v{entry.publishedVersion.versionNumber}, {entry.publishedAt?.toLocaleString(
+			{lang[interfaceLanguage.current].published} (v{publishedVersion.versionNumber}, {publishedVersion.publishedAt ? new Date(publishedVersion.publishedAt).toLocaleString(
 				interfaceLanguage.current
-			)})</span
+			) : ''})</span
 		>
 	{/if}
 
-	{#if entryStatus === 'scheduled' && entry.scheduledVersion}
+	{#if entryStatus === 'scheduled' && scheduledVersion}
 		<span class="flex items-center gap-1">
 			<ClockFilled />
-			{lang[interfaceLanguage.current].scheduled} v{entry.scheduledVersion.versionNumber}
+			{lang[interfaceLanguage.current].scheduled} v{scheduledVersion.versionNumber}
 			{lang[interfaceLanguage.current].on}
-			{entry.publishedAt?.toLocaleString(interfaceLanguage.current)})</span
+			{scheduledVersion.publishedAt ? new Date(scheduledVersion.publishedAt).toLocaleString(interfaceLanguage.current) : ''})</span
 		>
 	{/if}
 
-	{#if entryStatus === 'draft' && entry.draftVersion}
+	{#if entryStatus === 'draft' && draftVersion}
 		<span class="flex items-center gap-1">
 			<FileFilled />
-			{lang[interfaceLanguage.current].draft} (v{entry.draftVersion.versionNumber})</span
+			{lang[interfaceLanguage.current].draft} (v{draftVersion.versionNumber})</span
 		>
 	{/if}
 </div>

package/dist/admin/client/entry/utils.d.ts

@@ -1,3 +1,6 @@
 import type { DbEntryVersion, EntryStatus, EntryVersionStatus, RawEntry } from '../../../types/entries.js';
 export declare function getEntryVersionStatus(version: DbEntryVersion): EntryVersionStatus;
+/** Get entry status for a specific language */
+export declare function getEntryStatusForLang(entry: RawEntry, lang: string): EntryStatus;
+/** Get overall entry status — published if any lang is published */
 export declare function getEntryStatus(entry: RawEntry): EntryStatus;