From 73fdbdc0c37538f6abccf4ad6a76f8bfe1898b76 Mon Sep 17 00:00:00 2001 From: Maurice Date: Sat, 24 Oct 2026 20:05:32 +0200 Subject: [PATCH] feat(studio): Auto layout lays the book on the designed pages "The whole book" now lays the book on the designed templates through autoDesignedBook, in the book's own page format and theme (a recoloured one of its own included), its title kept and every page holding a locked element kept; each press takes a new seed, so a second press gives another book, one undo away as before. "This spread" lays the page on another design than the one on screen and its neighbours, its id kept, and now works on the cover, the summary and the countries too, so the menu offers it wherever the auto layout knows the page. Loose gallery photos reach the layout with the day they were taken, which it shares them out by. The menu's two hints say what the button now does, in every language. Nothing here places the classic summary, countries or marks any more. --- .../journeyStudio/useJourneyStudio.test.tsx | 57 +++++++++++++++++-- .../pages/journeyStudio/useJourneyStudio.ts | 34 +++++------ shared/src/i18n/ar/journey.ts | 4 +- shared/src/i18n/az/journey.ts | 4 +- shared/src/i18n/br/journey.ts | 4 +- shared/src/i18n/ca/journey.ts | 4 +- shared/src/i18n/cs/journey.ts | 4 +- shared/src/i18n/de/journey.ts | 4 +- shared/src/i18n/en/journey.ts | 4 +- shared/src/i18n/es/journey.ts | 4 +- shared/src/i18n/et/journey.ts | 4 +- shared/src/i18n/fr/journey.ts | 4 +- shared/src/i18n/gr/journey.ts | 4 +- shared/src/i18n/hu/journey.ts | 4 +- shared/src/i18n/id/journey.ts | 4 +- shared/src/i18n/it/journey.ts | 4 +- shared/src/i18n/ja/journey.ts | 4 +- shared/src/i18n/ko/journey.ts | 4 +- shared/src/i18n/nl/journey.ts | 4 +- shared/src/i18n/pl/journey.ts | 4 +- shared/src/i18n/ru/journey.ts | 4 +- shared/src/i18n/sk/journey.ts | 4 +- shared/src/i18n/sv/journey.ts | 4 +- shared/src/i18n/th/journey.ts | 4 +- shared/src/i18n/tr/journey.ts | 4 +- shared/src/i18n/uk/journey.ts | 4 +- shared/src/i18n/vi/journey.ts | 4 +- shared/src/i18n/zh-TW/journey.ts | 4 +- shared/src/i18n/zh/journey.ts | 4 +- shared/src/index.ts | 1 + 30 files changed, 124 insertions(+), 76 deletions(-) diff --git a/client/src/pages/journeyStudio/useJourneyStudio.test.tsx b/client/src/pages/journeyStudio/useJourneyStudio.test.tsx index 7b5506844..18c4c1dfa 100644 --- a/client/src/pages/journeyStudio/useJourneyStudio.test.tsx +++ b/client/src/pages/journeyStudio/useJourneyStudio.test.tsx @@ -37,10 +37,13 @@ vi.mock('../../api/websocket', async importOriginal => ({ // The auto layout lives in @trek/shared now; the hook's call into it is watched through a partial mock. const shared = await vi.importActual('@trek/shared') -const buildBook = vi.fn(shared.buildBook) +const autoDesignedBook = vi.fn(shared.autoDesignedBook) vi.mock('@trek/shared', async importOriginal => { const actual = await importOriginal() - return { ...actual, buildBook: (...args: Parameters) => buildBook(...args) } + return { + ...actual, + autoDesignedBook: (...args: Parameters) => autoDesignedBook(...args), + } }) import { useJourneyStudio } from './useJourneyStudio' @@ -67,7 +70,7 @@ function seedJourney() { beforeEach(() => { seedJourney() - buildBook.mockClear() + autoDesignedBook.mockClear() useStudioStore.setState({ doc: null, selection: [], activeSpread: 0, past: [], future: [], readOnly: false }) vi.spyOn(journeyApi, 'getBook').mockResolvedValue({ book: null } as never) vi.spyOn(journeyApi, 'saveBook').mockResolvedValue({} as never) @@ -140,8 +143,8 @@ describe('the auto layout input', () => { act(() => { result.current.relayoutBook() }) - expect(buildBook).toHaveBeenCalled() - const input = buildBook.mock.calls[buildBook.mock.calls.length - 1][0] + expect(autoDesignedBook).toHaveBeenCalled() + const input = autoDesignedBook.mock.calls[autoDesignedBook.mock.calls.length - 1][1] expect(input.path).toEqual([TRACK]) }) @@ -176,9 +179,51 @@ describe('the auto layout input', () => { act(() => { result.current.relayoutBook() }) - const input = buildBook.mock.calls[buildBook.mock.calls.length - 1][0] + const input = autoDesignedBook.mock.calls[autoDesignedBook.mock.calls.length - 1][1] expect(input.path).toEqual([]) }) + + it("lays the whole book on the designed pages in the book's own page format, theme and title", async () => { + const { result } = await mountStudio() + const theme = shared.bookThemeOf('midnight') + const page = { ...shared.bookPageSetupSchema.parse({}), pageWidth: 200 } + act(() => { + useStudioStore.getState().commit(d => ({ ...d, title: 'My own title', page, theme })) + }) + + act(() => { result.current.relayoutBook() }) + + const [doc, input, opts] = autoDesignedBook.mock.calls[autoDesignedBook.mock.calls.length - 1] + expect(input.page).toEqual(page) + expect(opts?.theme).toEqual(theme) + expect(doc?.title).toBe('My own title') + const laid = useStudioStore.getState().doc + expect(laid?.title).toBe('My own title') + expect(laid?.theme).toEqual(theme) + expect(laid?.page.pageWidth).toBe(200) + expect(laid?.spreads.some(s => s.role === 'inner' && s.entryId === 1)).toBe(true) + }) + + it('lays this spread on another design, its id kept, and knows the cover but not the back', async () => { + const { result } = await mountStudio() + act(() => { result.current.relayoutBook() }) + const before = useStudioStore.getState().doc + if (!before) throw new Error('a laid book') + const at = before.spreads.findIndex(s => s.role === 'inner' && s.entryId === 1) + act(() => { useStudioStore.getState().setActiveSpread(at) }) + expect(result.current.canRelayoutSpread).toBe(true) + const was = shared.matchDecoratedTemplate(before.spreads[at], before.page)?.id + + act(() => { result.current.relayoutCurrentSpread() }) + + const after = useStudioStore.getState().doc?.spreads[at] + expect(after?.id).toBe(before.spreads[at].id) + expect(shared.matchDecoratedTemplate(after as never, before.page)?.id).not.toBe(was) + act(() => { useStudioStore.getState().setActiveSpread(0) }) + expect(result.current.canRelayoutSpread).toBe(true) + act(() => { useStudioStore.getState().setActiveSpread(before.spreads.length - 1) }) + expect(result.current.canRelayoutSpread).toBe(false) + }) }) diff --git a/client/src/pages/journeyStudio/useJourneyStudio.ts b/client/src/pages/journeyStudio/useJourneyStudio.ts index b9f72d361..784c9e6e2 100644 --- a/client/src/pages/journeyStudio/useJourneyStudio.ts +++ b/client/src/pages/journeyStudio/useJourneyStudio.ts @@ -1,9 +1,9 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react' import { useLocation, useNavigate, useParams } from 'react-router' -import type { AutoEntry, AutoInput, AutoPhoto, BookElement, BookPageNumbers, JourneyStats } from '@trek/shared' +import type { AutoDesignedInput, AutoEntry, AutoPhoto, BookElement, BookPageNumbers, JourneyStats } from '@trek/shared' import { - autoEntriesWithStops, bookElementId as elementId, bookPageSetupSchema, bookPath, buildBook, distributeGallery, - emptyBook, layoutAroundLocks, relayoutSpread, + autoDesignedBook, autoEntriesWithStops, autoRelayoutKind, autoRelayoutSpread, bookElementId as elementId, + bookPageSetupSchema, bookPath, emptyBook, } from '@trek/shared' import { journeyApi } from '../../api/client' import { useJourneyStore, type GalleryPhoto, type JourneyEntry, type JourneyPhoto } from '../../store/journeyStore' @@ -153,7 +153,7 @@ export function useJourneyStudio() { * possible; rebuilding it from the journey on every click would be the same * work plus a chance of the two disagreeing. */ - const autoInput = useRef(null) + const autoInput = useRef(null) const journey = current && current.id === journeyId ? current : null @@ -274,15 +274,15 @@ export function useJourneyStudio() { })), })) + // When each loose photo was taken: the auto layout gives it to the entry of its day first. const gallery: AutoPhoto[] = (journey.gallery || []).map((p: GalleryPhoto) => ({ photoId: p.photo_id, width: p.width ?? null, height: p.height ?? null, caption: p.caption ?? null, + takenAt: p.taken_at ?? null, })) - const withPhotos = distributeGallery(entries, gallery) - /* * Give every entry what the journey's figures know about its stop: the * coordinates and country its place resolved to and which day it is, so a @@ -290,7 +290,7 @@ export function useJourneyStudio() { * is shared (autoEntriesWithStops) so the server's design tool reads the * same stops. */ - const placed = autoEntriesWithStops(withPhotos, stats) + const placed = autoEntriesWithStops(entries, stats) const preset = PAGE_PRESETS['square-210'] @@ -300,6 +300,8 @@ export function useJourneyStudio() { subtitle: journey.subtitle ?? null, coverPhotoId: gallery[0]?.photoId ?? null, entries: placed, + // The loose photos stay loose here: the layout shares them out itself, by day, and loses none. + gallery, page: { preset: preset.id, pageWidth: preset.pageWidthMm, @@ -375,7 +377,7 @@ export function useJourneyStudio() { * * The build effect runs as soon as the book and the figures are in, which is * usually before this answers, and what it froze is what the Auto layout - * buttons hand to buildBook afterwards. Without the patch a relayout drew + * buttons hand to the layout afterwards. Without the patch a relayout drew * the straight line between stops over a route somebody had walked. */ const applyPath = (p: [number, number][][]) => { @@ -471,8 +473,10 @@ export function useJourneyStudio() { const relayoutBook = useCallback(() => { const input = autoInput.current if (!input) return + // A new seed every press: "the whole book" twice gives two books, each one undo away. + const seed = Date.now() % 2 ** 31 commit(d => ({ - ...buildBook({ ...input, page: d.page }), + ...autoDesignedBook(d, { ...input, page: d.page }, { theme: d.theme, seed }), title: d.title, })) setActiveSpread(0) @@ -481,22 +485,20 @@ export function useJourneyStudio() { const relayoutCurrentSpread = useCallback(() => { const input = autoInput.current if (!input) return + const seed = Date.now() % 2 ** 31 commit(d => { - const sp = d.spreads[activeSpread] - if (!sp) return d - // Laid out around what is locked, as the assistant's auto layout leaves it. - const next = layoutAroundLocks(sp, free => relayoutSpread(free, { ...input, page: d.page })) + // Laid out around what is locked, its id kept, on another template than the one on screen. + const next = autoRelayoutSpread(d, activeSpread, { ...input, page: d.page }, { seed }) if (!next) return d return { ...d, spreads: d.spreads.map((x, i) => (i === activeSpread ? next : x)) } }) select([]) }, [commit, activeSpread, select]) - /** Whether the spread on screen came from an entry, and so can be redone. */ + /** Whether the auto layout knows the spread on screen (an entry's page, the cover, the summary, the countries). */ const canRelayoutSpread = !!( autoInput.current - && doc?.spreads[activeSpread]?.entryId != null - && doc.spreads[activeSpread].role === 'inner' + && autoRelayoutKind(doc?.spreads[activeSpread]) !== null ) /** Page numbers and anything else that belongs to the book rather than a page. */ diff --git a/shared/src/i18n/ar/journey.ts b/shared/src/i18n/ar/journey.ts index fbdfe8c36..61da03e0c 100644 --- a/shared/src/i18n/ar/journey.ts +++ b/shared/src/i18n/ar/journey.ts @@ -614,8 +614,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'يبدأ من', 'journey.studio.folioMargin': 'الهامش', 'journey.studio.relayoutSpread': 'هذه الصفحة', - 'journey.studio.relayoutSpreadHint': 'إعادة بنائها من مدخلها', - 'journey.studio.relayoutSpreadNone': 'هذه الصفحة ليست من مدخل', + 'journey.studio.relayoutSpreadHint': 'ضعها على تصميم آخر', + 'journey.studio.relayoutSpreadNone': 'لم ينشئ التخطيط التلقائي هذه الصفحة', 'journey.studio.relayoutBook': 'الكتاب كامل', 'journey.studio.relayoutBookHint': 'يستبدل كل الصفحات — يمكن التراجع', 'journey.studio.tpl.coverFull': 'بلا حواف', diff --git a/shared/src/i18n/az/journey.ts b/shared/src/i18n/az/journey.ts index 8ccb18fe2..12da0f8e6 100644 --- a/shared/src/i18n/az/journey.ts +++ b/shared/src/i18n/az/journey.ts @@ -640,8 +640,8 @@ const journey: TranslationStrings = { 'journey.studio.folioMargin': 'Kənar boşluğu', 'journey.studio.relayoutSpread': 'Bu açılım', - 'journey.studio.relayoutSpreadHint': 'Onu qeydindən yenidən qur', - 'journey.studio.relayoutSpreadNone': 'Bu səhifə qeyddən yaradılmayıb', + 'journey.studio.relayoutSpreadHint': 'Başqa dizayna yerləşdir', + 'journey.studio.relayoutSpreadNone': 'Bu səhifəni avtomatik tərtibat yaratmayıb', 'journey.studio.relayoutBook': 'Bütün kitab', 'journey.studio.relayoutBookHint': 'Bütün səhifələri əvəz edir — geri qaytarmaq mümkündür', diff --git a/shared/src/i18n/br/journey.ts b/shared/src/i18n/br/journey.ts index 8c9800d27..70a4ce5d5 100644 --- a/shared/src/i18n/br/journey.ts +++ b/shared/src/i18n/br/journey.ts @@ -589,8 +589,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Começa em', 'journey.studio.folioMargin': 'Margem', 'journey.studio.relayoutSpread': 'Esta página', - 'journey.studio.relayoutSpreadHint': 'Refazer a partir da entrada', - 'journey.studio.relayoutSpreadNone': 'Esta página não vem de uma entrada', + 'journey.studio.relayoutSpreadHint': 'Usar outro design', + 'journey.studio.relayoutSpreadNone': 'O layout automático não criou esta página', 'journey.studio.relayoutBook': 'O livro inteiro', 'journey.studio.relayoutBookHint': 'Substitui todas as páginas — reversível', 'journey.studio.tpl.coverFull': 'Sangria total', diff --git a/shared/src/i18n/ca/journey.ts b/shared/src/i18n/ca/journey.ts index 1c06c52b0..776e08032 100644 --- a/shared/src/i18n/ca/journey.ts +++ b/shared/src/i18n/ca/journey.ts @@ -588,8 +588,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Comença a', 'journey.studio.folioMargin': 'Marge', 'journey.studio.relayoutSpread': 'Aquesta pàgina', - 'journey.studio.relayoutSpreadHint': 'Refer-la des de l’entrada', - 'journey.studio.relayoutSpreadNone': 'Aquesta pàgina no ve d’una entrada', + 'journey.studio.relayoutSpreadHint': 'Posar-la en un altre disseny', + 'journey.studio.relayoutSpreadNone': 'El disseny automàtic no ha fet aquesta pàgina', 'journey.studio.relayoutBook': 'Tot el llibre', 'journey.studio.relayoutBookHint': 'Reemplaça totes les pàgines — reversible', 'journey.studio.tpl.coverFull': 'A sang', diff --git a/shared/src/i18n/cs/journey.ts b/shared/src/i18n/cs/journey.ts index 0f56bb9a1..db03333d7 100644 --- a/shared/src/i18n/cs/journey.ts +++ b/shared/src/i18n/cs/journey.ts @@ -593,8 +593,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Začíná na', 'journey.studio.folioMargin': 'Okraj', 'journey.studio.relayoutSpread': 'Tato strana', - 'journey.studio.relayoutSpreadHint': 'Znovu sestavit ze záznamu', - 'journey.studio.relayoutSpreadNone': 'Tato strana nevznikla ze záznamu', + 'journey.studio.relayoutSpreadHint': 'Použít jiný návrh', + 'journey.studio.relayoutSpreadNone': 'Tuto stranu nevytvořilo automatické rozvržení', 'journey.studio.relayoutBook': 'Celá kniha', 'journey.studio.relayoutBookHint': 'Nahradí všechny strany — lze vrátit', 'journey.studio.tpl.coverFull': 'Na spad', diff --git a/shared/src/i18n/de/journey.ts b/shared/src/i18n/de/journey.ts index 964aa9a95..e021e6653 100644 --- a/shared/src/i18n/de/journey.ts +++ b/shared/src/i18n/de/journey.ts @@ -590,8 +590,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Beginnt bei', 'journey.studio.folioMargin': 'Rand', 'journey.studio.relayoutSpread': 'Diese Seite', - 'journey.studio.relayoutSpreadHint': 'Aus ihrem Eintrag neu bauen', - 'journey.studio.relayoutSpreadNone': 'Diese Seite stammt aus keinem Eintrag', + 'journey.studio.relayoutSpreadHint': 'Auf ein anderes Design legen', + 'journey.studio.relayoutSpreadNone': 'Diese Seite stammt nicht vom automatischen Anordnen', 'journey.studio.relayoutBook': 'Das ganze Buch', 'journey.studio.relayoutBookHint': 'Ersetzt alle Seiten — widerrufbar', 'journey.studio.tpl.coverFull': 'Randlos', diff --git a/shared/src/i18n/en/journey.ts b/shared/src/i18n/en/journey.ts index c856b3f10..b14c000d5 100644 --- a/shared/src/i18n/en/journey.ts +++ b/shared/src/i18n/en/journey.ts @@ -585,8 +585,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Starts at', 'journey.studio.folioMargin': 'Margin', 'journey.studio.relayoutSpread': 'This spread', - 'journey.studio.relayoutSpreadHint': 'Rebuild it from its entry', - 'journey.studio.relayoutSpreadNone': 'This page was not built from an entry', + 'journey.studio.relayoutSpreadHint': 'Lay it on another design', + 'journey.studio.relayoutSpreadNone': 'The auto layout did not make this page', 'journey.studio.relayoutBook': 'The whole book', 'journey.studio.relayoutBookHint': 'Replaces every page — undoable', 'journey.studio.tpl.coverFull': 'Full bleed', diff --git a/shared/src/i18n/es/journey.ts b/shared/src/i18n/es/journey.ts index 6ab0743a9..72dc5ee4d 100644 --- a/shared/src/i18n/es/journey.ts +++ b/shared/src/i18n/es/journey.ts @@ -588,8 +588,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Empieza en', 'journey.studio.folioMargin': 'Margen', 'journey.studio.relayoutSpread': 'Esta página', - 'journey.studio.relayoutSpreadHint': 'Rehacerla desde su entrada', - 'journey.studio.relayoutSpreadNone': 'Esta página no viene de una entrada', + 'journey.studio.relayoutSpreadHint': 'Ponerla en otro diseño', + 'journey.studio.relayoutSpreadNone': 'El diseño automático no hizo esta página', 'journey.studio.relayoutBook': 'Todo el libro', 'journey.studio.relayoutBookHint': 'Reemplaza todas las páginas — reversible', 'journey.studio.tpl.coverFull': 'A sangre', diff --git a/shared/src/i18n/et/journey.ts b/shared/src/i18n/et/journey.ts index 4c4d94397..1abf6436d 100644 --- a/shared/src/i18n/et/journey.ts +++ b/shared/src/i18n/et/journey.ts @@ -586,8 +586,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Algab numbrist', 'journey.studio.folioMargin': 'Veeris', 'journey.studio.relayoutSpread': 'See lehepaar', - 'journey.studio.relayoutSpreadHint': 'Loo uuesti sissekande põhjal', - 'journey.studio.relayoutSpreadNone': 'See leht pole loodud sissekandest', + 'journey.studio.relayoutSpreadHint': 'Paiguta teise kujundusse', + 'journey.studio.relayoutSpreadNone': 'Seda lehte ei loonud automaatne paigutus', 'journey.studio.relayoutBook': 'Kogu raamat', 'journey.studio.relayoutBookHint': 'Asendab kõik lehed — saab tagasi võtta', 'journey.studio.tpl.coverFull': 'Servani', diff --git a/shared/src/i18n/fr/journey.ts b/shared/src/i18n/fr/journey.ts index 9526ea849..4e795d1cc 100644 --- a/shared/src/i18n/fr/journey.ts +++ b/shared/src/i18n/fr/journey.ts @@ -588,8 +588,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Commence à', 'journey.studio.folioMargin': 'Marge', 'journey.studio.relayoutSpread': 'Cette page', - 'journey.studio.relayoutSpreadHint': 'La refaire depuis son entrée', - 'journey.studio.relayoutSpreadNone': 'Cette page ne vient pas d’une entrée', + 'journey.studio.relayoutSpreadHint': 'La poser sur une autre maquette', + 'journey.studio.relayoutSpreadNone': 'La mise en page auto n’a pas fait cette page', 'journey.studio.relayoutBook': 'Tout le livre', 'journey.studio.relayoutBookHint': 'Remplace toutes les pages — annulable', 'journey.studio.tpl.coverFull': 'Pleine page', diff --git a/shared/src/i18n/gr/journey.ts b/shared/src/i18n/gr/journey.ts index 99d5af92a..9b4d0779f 100644 --- a/shared/src/i18n/gr/journey.ts +++ b/shared/src/i18n/gr/journey.ts @@ -594,8 +594,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Ξεκινά από', 'journey.studio.folioMargin': 'Περιθώριο', 'journey.studio.relayoutSpread': 'Αυτή η σελίδα', - 'journey.studio.relayoutSpreadHint': 'Ξαναχτίστε την από την καταχώριση', - 'journey.studio.relayoutSpreadNone': 'Αυτή η σελίδα δεν προήλθε από καταχώριση', + 'journey.studio.relayoutSpreadHint': 'Τοποθέτησέ την σε άλλο σχέδιο', + 'journey.studio.relayoutSpreadNone': 'Αυτή η σελίδα δεν φτιάχτηκε από την αυτόματη διάταξη', 'journey.studio.relayoutBook': 'Όλο το βιβλίο', 'journey.studio.relayoutBookHint': 'Αντικαθιστά κάθε σελίδα — αναιρέσιμο', 'journey.studio.tpl.coverFull': 'Ολοσέλιδο', diff --git a/shared/src/i18n/hu/journey.ts b/shared/src/i18n/hu/journey.ts index 69b45cad8..07eb1383e 100644 --- a/shared/src/i18n/hu/journey.ts +++ b/shared/src/i18n/hu/journey.ts @@ -585,8 +585,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Kezdete', 'journey.studio.folioMargin': 'Margó', 'journey.studio.relayoutSpread': 'Ez az oldal', - 'journey.studio.relayoutSpreadHint': 'Újraépítés a bejegyzésből', - 'journey.studio.relayoutSpreadNone': 'Ez az oldal nem bejegyzésből készült', + 'journey.studio.relayoutSpreadHint': 'Másik tervre helyezés', + 'journey.studio.relayoutSpreadNone': 'Ezt az oldalt nem az automatikus elrendezés készítette', 'journey.studio.relayoutBook': 'A teljes könyv', 'journey.studio.relayoutBookHint': 'Minden oldalt lecserél — visszavonható', 'journey.studio.tpl.coverFull': 'Kifutó', diff --git a/shared/src/i18n/id/journey.ts b/shared/src/i18n/id/journey.ts index e33735e26..e8814e9ea 100644 --- a/shared/src/i18n/id/journey.ts +++ b/shared/src/i18n/id/journey.ts @@ -578,8 +578,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Mulai dari', 'journey.studio.folioMargin': 'Margin', // same-as-en 'journey.studio.relayoutSpread': 'Halaman ini', - 'journey.studio.relayoutSpreadHint': 'Bangun ulang dari catatannya', - 'journey.studio.relayoutSpreadNone': 'Halaman ini bukan dari catatan', + 'journey.studio.relayoutSpreadHint': 'Pasang pada desain lain', + 'journey.studio.relayoutSpreadNone': 'Halaman ini tidak dibuat oleh tata letak otomatis', 'journey.studio.relayoutBook': 'Seluruh buku', 'journey.studio.relayoutBookHint': 'Mengganti semua halaman — bisa dibatalkan', 'journey.studio.tpl.coverFull': 'Penuh', diff --git a/shared/src/i18n/it/journey.ts b/shared/src/i18n/it/journey.ts index baa8d9b37..4f29f12f9 100644 --- a/shared/src/i18n/it/journey.ts +++ b/shared/src/i18n/it/journey.ts @@ -587,8 +587,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Inizia da', 'journey.studio.folioMargin': 'Margine', 'journey.studio.relayoutSpread': 'Questa pagina', - 'journey.studio.relayoutSpreadHint': 'Rifarla dalla sua voce', - 'journey.studio.relayoutSpreadNone': 'Questa pagina non viene da una voce', + 'journey.studio.relayoutSpreadHint': 'Metterla su un altro design', + 'journey.studio.relayoutSpreadNone': 'Questa pagina non l’ha fatta il layout automatico', 'journey.studio.relayoutBook': 'Tutto il libro', 'journey.studio.relayoutBookHint': 'Sostituisce ogni pagina — annullabile', 'journey.studio.tpl.coverFull': 'Al vivo', diff --git a/shared/src/i18n/ja/journey.ts b/shared/src/i18n/ja/journey.ts index 6013fc3a3..c70f526c4 100644 --- a/shared/src/i18n/ja/journey.ts +++ b/shared/src/i18n/ja/journey.ts @@ -577,8 +577,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': '開始番号', 'journey.studio.folioMargin': '余白', 'journey.studio.relayoutSpread': 'このページ', - 'journey.studio.relayoutSpreadHint': 'エントリーから作り直す', - 'journey.studio.relayoutSpreadNone': 'このページはエントリー由来ではありません', + 'journey.studio.relayoutSpreadHint': '別のデザインに配置する', + 'journey.studio.relayoutSpreadNone': 'このページは自動レイアウトで作られていません', 'journey.studio.relayoutBook': '本全体', 'journey.studio.relayoutBookHint': 'すべてのページを差し替え — 取り消せます', 'journey.studio.tpl.coverFull': '裁ち落とし', diff --git a/shared/src/i18n/ko/journey.ts b/shared/src/i18n/ko/journey.ts index c62fd4704..569e5677c 100644 --- a/shared/src/i18n/ko/journey.ts +++ b/shared/src/i18n/ko/journey.ts @@ -573,8 +573,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': '시작 번호', 'journey.studio.folioMargin': '여백', 'journey.studio.relayoutSpread': '이 페이지', - 'journey.studio.relayoutSpreadHint': '항목에서 다시 만들기', - 'journey.studio.relayoutSpreadNone': '이 페이지는 항목에서 만든 것이 아닙니다', + 'journey.studio.relayoutSpreadHint': '다른 디자인에 배치하기', + 'journey.studio.relayoutSpreadNone': '이 페이지는 자동 레이아웃으로 만든 것이 아닙니다', 'journey.studio.relayoutBook': '책 전체', 'journey.studio.relayoutBookHint': '모든 페이지 교체 — 되돌릴 수 있음', 'journey.studio.tpl.coverFull': '재단 여백', diff --git a/shared/src/i18n/nl/journey.ts b/shared/src/i18n/nl/journey.ts index b1a3128f4..efd67eceb 100644 --- a/shared/src/i18n/nl/journey.ts +++ b/shared/src/i18n/nl/journey.ts @@ -589,8 +589,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Begint bij', 'journey.studio.folioMargin': 'Marge', 'journey.studio.relayoutSpread': 'Deze pagina', - 'journey.studio.relayoutSpreadHint': 'Opnieuw opbouwen uit de notitie', - 'journey.studio.relayoutSpreadNone': 'Deze pagina komt niet uit een notitie', + 'journey.studio.relayoutSpreadHint': 'Op een ander ontwerp leggen', + 'journey.studio.relayoutSpreadNone': 'Deze pagina komt niet uit de automatische opmaak', 'journey.studio.relayoutBook': 'Het hele boek', 'journey.studio.relayoutBookHint': 'Vervangt alle pagina’s — ongedaan te maken', 'journey.studio.tpl.coverFull': 'Aflopend', diff --git a/shared/src/i18n/pl/journey.ts b/shared/src/i18n/pl/journey.ts index ff0310de8..00eacba8c 100644 --- a/shared/src/i18n/pl/journey.ts +++ b/shared/src/i18n/pl/journey.ts @@ -605,8 +605,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Zaczyna od', 'journey.studio.folioMargin': 'Margines', 'journey.studio.relayoutSpread': 'Ta strona', - 'journey.studio.relayoutSpreadHint': 'Zbuduj ponownie z wpisu', - 'journey.studio.relayoutSpreadNone': 'Ta strona nie pochodzi z wpisu', + 'journey.studio.relayoutSpreadHint': 'Ułóż na innym projekcie', + 'journey.studio.relayoutSpreadNone': 'Tej strony nie utworzył układ automatyczny', 'journey.studio.relayoutBook': 'Cała książka', 'journey.studio.relayoutBookHint': 'Zastępuje wszystkie strony — cofalne', 'journey.studio.tpl.coverFull': 'Na spad', diff --git a/shared/src/i18n/ru/journey.ts b/shared/src/i18n/ru/journey.ts index b53855dd2..32c3a406f 100644 --- a/shared/src/i18n/ru/journey.ts +++ b/shared/src/i18n/ru/journey.ts @@ -605,8 +605,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Начинать с', 'journey.studio.folioMargin': 'Отступ', 'journey.studio.relayoutSpread': 'Этот разворот', - 'journey.studio.relayoutSpreadHint': 'Собрать заново из записи', - 'journey.studio.relayoutSpreadNone': 'Этот разворот не из записи', + 'journey.studio.relayoutSpreadHint': 'Разложить по другому дизайну', + 'journey.studio.relayoutSpreadNone': 'Этот разворот сделан не автомакетом', 'journey.studio.relayoutBook': 'Вся книга', 'journey.studio.relayoutBookHint': 'Заменит все страницы — обратимо', 'journey.studio.tpl.coverFull': 'В обрез', diff --git a/shared/src/i18n/sk/journey.ts b/shared/src/i18n/sk/journey.ts index e894d2706..c3e054890 100644 --- a/shared/src/i18n/sk/journey.ts +++ b/shared/src/i18n/sk/journey.ts @@ -597,8 +597,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Začína na', 'journey.studio.folioMargin': 'Okraj', 'journey.studio.relayoutSpread': 'Táto dvojstrana', - 'journey.studio.relayoutSpreadHint': 'Znova zostaviť zo záznamu', - 'journey.studio.relayoutSpreadNone': 'Táto strana nevznikla zo záznamu', + 'journey.studio.relayoutSpreadHint': 'Použiť iný návrh', + 'journey.studio.relayoutSpreadNone': 'Túto stranu nevytvorilo automatické rozloženie', 'journey.studio.relayoutBook': 'Celá kniha', 'journey.studio.relayoutBookHint': 'Nahradí všetky strany — možno vrátiť späť', 'journey.studio.tpl.coverFull': 'Na spad', diff --git a/shared/src/i18n/sv/journey.ts b/shared/src/i18n/sv/journey.ts index edd6647f5..15be17a2a 100644 --- a/shared/src/i18n/sv/journey.ts +++ b/shared/src/i18n/sv/journey.ts @@ -585,8 +585,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Börjar på', 'journey.studio.folioMargin': 'Marginal', 'journey.studio.relayoutSpread': 'Detta uppslag', - 'journey.studio.relayoutSpreadHint': 'Bygg om från dess anteckning', - 'journey.studio.relayoutSpreadNone': 'Detta uppslag kommer inte från en anteckning', + 'journey.studio.relayoutSpreadHint': 'Lägg den på en annan design', + 'journey.studio.relayoutSpreadNone': 'Det här uppslaget gjordes inte av den automatiska layouten', 'journey.studio.relayoutBook': 'Hela boken', 'journey.studio.relayoutBookHint': 'Ersätter alla sidor — kan ångras', 'journey.studio.tpl.coverFull': 'Utfallande', diff --git a/shared/src/i18n/th/journey.ts b/shared/src/i18n/th/journey.ts index ec40ec278..25571ad3c 100644 --- a/shared/src/i18n/th/journey.ts +++ b/shared/src/i18n/th/journey.ts @@ -571,8 +571,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'เริ่มต้นที่', 'journey.studio.folioMargin': 'ขอบ', 'journey.studio.relayoutSpread': 'หน้าคู่นี้', - 'journey.studio.relayoutSpreadHint': 'สร้างใหม่จากรายการนี้', - 'journey.studio.relayoutSpreadNone': 'หน้านี้ไม่ได้ถูกสร้างขึ้นจากรายการ', + 'journey.studio.relayoutSpreadHint': 'จัดวางด้วยดีไซน์อื่น', + 'journey.studio.relayoutSpreadNone': 'หน้านี้ไม่ได้สร้างโดยเค้าโครงอัตโนมัติ', 'journey.studio.relayoutBook': 'หนังสือทั้งเล่ม', 'journey.studio.relayoutBookHint': 'แทนที่ทุกหน้า — เลิกทำได้', 'journey.studio.tpl.coverFull': 'เต็มขอบ', diff --git a/shared/src/i18n/tr/journey.ts b/shared/src/i18n/tr/journey.ts index 81bf316cb..f27776c39 100644 --- a/shared/src/i18n/tr/journey.ts +++ b/shared/src/i18n/tr/journey.ts @@ -588,8 +588,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Başlangıç', 'journey.studio.folioMargin': 'Kenar boşluğu', 'journey.studio.relayoutSpread': 'Bu sayfa', - 'journey.studio.relayoutSpreadHint': 'Kaydından yeniden oluştur', - 'journey.studio.relayoutSpreadNone': 'Bu sayfa bir kayıttan gelmiyor', + 'journey.studio.relayoutSpreadHint': 'Başka bir tasarıma yerleştir', + 'journey.studio.relayoutSpreadNone': 'Bu sayfayı otomatik yerleşim oluşturmadı', 'journey.studio.relayoutBook': 'Tüm kitap', 'journey.studio.relayoutBookHint': 'Tüm sayfaları değiştirir — geri alınabilir', 'journey.studio.tpl.coverFull': 'Taşmalı', diff --git a/shared/src/i18n/uk/journey.ts b/shared/src/i18n/uk/journey.ts index 9c4f13816..5bd2133e0 100644 --- a/shared/src/i18n/uk/journey.ts +++ b/shared/src/i18n/uk/journey.ts @@ -608,8 +608,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Починати з', 'journey.studio.folioMargin': 'Відступ', 'journey.studio.relayoutSpread': 'Цей розворот', - 'journey.studio.relayoutSpreadHint': 'Зібрати заново із запису', - 'journey.studio.relayoutSpreadNone': 'Цей розворот не з запису', + 'journey.studio.relayoutSpreadHint': 'Розкласти за іншим дизайном', + 'journey.studio.relayoutSpreadNone': 'Цей розворот зроблено не автомакетом', 'journey.studio.relayoutBook': 'Уся книга', 'journey.studio.relayoutBookHint': 'Замінить усі сторінки — оборотно', 'journey.studio.tpl.coverFull': 'Під обріз', diff --git a/shared/src/i18n/vi/journey.ts b/shared/src/i18n/vi/journey.ts index 6d2099ee4..b88284f98 100644 --- a/shared/src/i18n/vi/journey.ts +++ b/shared/src/i18n/vi/journey.ts @@ -577,8 +577,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': 'Bắt đầu từ', 'journey.studio.folioMargin': 'Lề', 'journey.studio.relayoutSpread': 'Trang này', - 'journey.studio.relayoutSpreadHint': 'Dựng lại từ mục nhật ký', - 'journey.studio.relayoutSpreadNone': 'Trang này không từ mục nhật ký', + 'journey.studio.relayoutSpreadHint': 'Đặt vào một thiết kế khác', + 'journey.studio.relayoutSpreadNone': 'Trang này không do bố cục tự động tạo', 'journey.studio.relayoutBook': 'Toàn bộ sách', 'journey.studio.relayoutBookHint': 'Thay mọi trang — có thể hoàn tác', 'journey.studio.tpl.coverFull': 'Tràn lề', diff --git a/shared/src/i18n/zh-TW/journey.ts b/shared/src/i18n/zh-TW/journey.ts index ca55c4889..7daa2881e 100644 --- a/shared/src/i18n/zh-TW/journey.ts +++ b/shared/src/i18n/zh-TW/journey.ts @@ -567,8 +567,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': '起始頁碼', 'journey.studio.folioMargin': '頁邊距', 'journey.studio.relayoutSpread': '本頁', - 'journey.studio.relayoutSpreadHint': '依條目重新排版', - 'journey.studio.relayoutSpreadNone': '此頁並非由條目產生', + 'journey.studio.relayoutSpreadHint': '換一種設計排版', + 'journey.studio.relayoutSpreadNone': '此頁並非由自動排版產生', 'journey.studio.relayoutBook': '整本書', 'journey.studio.relayoutBookHint': '取代所有頁面 — 可復原', 'journey.studio.tpl.coverFull': '出血滿版', diff --git a/shared/src/i18n/zh/journey.ts b/shared/src/i18n/zh/journey.ts index 654e0c588..0de654148 100644 --- a/shared/src/i18n/zh/journey.ts +++ b/shared/src/i18n/zh/journey.ts @@ -567,8 +567,8 @@ const journey: TranslationStrings = { 'journey.studio.folioStart': '起始页码', 'journey.studio.folioMargin': '页边距', 'journey.studio.relayoutSpread': '本页', - 'journey.studio.relayoutSpreadHint': '根据条目重新排版', - 'journey.studio.relayoutSpreadNone': '此页不是由条目生成的', + 'journey.studio.relayoutSpreadHint': '换一种设计排版', + 'journey.studio.relayoutSpreadNone': '此页不是由自动排版生成的', 'journey.studio.relayoutBook': '整本书', 'journey.studio.relayoutBookHint': '替换所有页面 — 可撤销', 'journey.studio.tpl.coverFull': '出血满版', diff --git a/shared/src/index.ts b/shared/src/index.ts index 42078c401..73e0340d3 100644 --- a/shared/src/index.ts +++ b/shared/src/index.ts @@ -215,6 +215,7 @@ export * from './book/theme/book-theme-photos'; export { bookThemeCatalogue, bookThemeLine } from './book/theme/book-theme-describe'; export * from './book/templates/template-format'; export * from './book/templates/template-catalogue'; +export * from './book/templates/template-match'; export * from './book/templates/template-apply'; export * from './book/templates/template-words'; export * from './book/templates/template-extract';