From ec132044edea7213da74496cbca38c13bcd539b8 Mon Sep 17 00:00:00 2001 From: boojack Date: Mon, 16 Nov 2026 20:52:10 +0800 Subject: [PATCH] fix(web): stabilize login and memo save button states --- web/package.json | 2 +- web/pnpm-lock.yaml | 10 +- .../components/IdentityProviderButtons.tsx | 2 +- web/src/components/MemoEditor/README.md | 2 +- .../MemoEditor/edit/Toolbar/EditorToolbar.tsx | 51 ++++------ .../MemoEditor/edit/hooks/useMemoSave.ts | 17 +--- .../edit/services/validationService.ts | 4 +- .../MemoEditor/edit/state/actions.ts | 5 - .../MemoEditor/edit/state/reducer.ts | 9 -- .../components/MemoEditor/edit/state/types.ts | 6 -- web/src/components/PasswordSignInForm.tsx | 2 +- web/src/locales/ar.json | 6 +- web/src/locales/az.json | 6 +- web/src/locales/bg.json | 6 +- web/src/locales/ca.json | 6 +- web/src/locales/cs.json | 6 +- web/src/locales/da.json | 6 +- web/src/locales/de.json | 6 +- web/src/locales/el.json | 6 +- web/src/locales/en-GB.json | 6 +- web/src/locales/en.json | 6 +- web/src/locales/es.json | 6 +- web/src/locales/et.json | 6 +- web/src/locales/fa.json | 6 +- web/src/locales/fi.json | 6 +- web/src/locales/fr.json | 6 +- web/src/locales/gl.json | 6 +- web/src/locales/he.json | 6 +- web/src/locales/hi.json | 6 +- web/src/locales/hr.json | 6 +- web/src/locales/hu.json | 6 +- web/src/locales/id.json | 6 +- web/src/locales/it.json | 6 +- web/src/locales/ja.json | 6 +- web/src/locales/ka-GE.json | 6 +- web/src/locales/ko.json | 6 +- web/src/locales/lt.json | 6 +- web/src/locales/lv.json | 6 +- web/src/locales/mr.json | 6 +- web/src/locales/nb.json | 6 +- web/src/locales/nl.json | 6 +- web/src/locales/nn.json | 6 +- web/src/locales/pl.json | 6 +- web/src/locales/pt-BR.json | 6 +- web/src/locales/pt-PT.json | 6 +- web/src/locales/ro.json | 6 +- web/src/locales/ru.json | 6 +- web/src/locales/sk.json | 6 +- web/src/locales/sl.json | 6 +- web/src/locales/sr.json | 6 +- web/src/locales/sv.json | 6 +- web/src/locales/th.json | 6 +- web/src/locales/tr.json | 6 +- web/src/locales/uk.json | 6 +- web/src/locales/vi.json | 6 +- web/src/locales/zh-Hans.json | 6 +- web/src/locales/zh-Hant.json | 6 +- web/tests/drawing-sheet.test.tsx | 5 +- web/tests/editor-commit-button.test.tsx | 94 +++++++++++++++++-- web/tests/memo-editor-upload-retry.test.tsx | 1 - web/tests/password-sign-in-form.test.tsx | 63 ++++++++++++- web/tests/sso-auth-pages.test.tsx | 18 +++- web/tests/use-memo-save.test.tsx | 76 ++++++++++++--- 63 files changed, 487 insertions(+), 156 deletions(-) diff --git a/web/package.json b/web/package.json index b1c69c40e..c8b73ff5e 100644 --- a/web/package.json +++ b/web/package.json @@ -29,7 +29,7 @@ "@tanstack/react-query-devtools": "^5.100.9", "@usememos/canvas": "26.11.3", "@usememos/editor": "26.11.5", - "@usememos/ui": "26.11.21", + "@usememos/ui": "26.11.22", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "copy-to-clipboard": "^4.0.2", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 42e51dec4..8152f5d97 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -45,8 +45,8 @@ importers: specifier: 26.11.5 version: 26.11.5(react-dom@19.2.6(react@19.2.6))(react@19.2.6) '@usememos/ui': - specifier: 26.11.21 - version: 26.11.21(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6) + specifier: 26.11.22 + version: 26.11.22(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6) class-variance-authority: specifier: ^0.7.1 version: 0.7.1 @@ -981,8 +981,8 @@ packages: react-dom: optional: true - '@usememos/ui@26.11.21': - resolution: {integrity: sha512-HFLA+raEM7u3yj4M5SsJ3z1XhVhVj+Yu0pR/MAPO7+3rFKaWoyRgzQSiWTV9+BKN3OHk5YQzdVi/fs8wrgPEeA==} + '@usememos/ui@26.11.22': + resolution: {integrity: sha512-DumtNXp1zePyBNdL+ecxgN1sGX8eWtMcRMx4aHXxLSuQFBKdwVgcFP7/DTH/2XLN8xapWw0WWhjJaWKZyGt2Pg==} peerDependencies: '@base-ui/react': 1.9.0 lucide-react: '>=1.0.0' @@ -2414,7 +2414,7 @@ snapshots: react: 19.2.6 react-dom: 19.2.6(react@19.2.6) - '@usememos/ui@26.11.21(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)': + '@usememos/ui@26.11.22(@base-ui/react@1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(lucide-react@1.34.0(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)': dependencies: '@base-ui/react': 1.9.0(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6) lucide-react: 1.34.0(react@19.2.6) diff --git a/web/src/components/IdentityProviderButtons.tsx b/web/src/components/IdentityProviderButtons.tsx index f3b4768b8..b58febbcf 100644 --- a/web/src/components/IdentityProviderButtons.tsx +++ b/web/src/components/IdentityProviderButtons.tsx @@ -85,7 +85,7 @@ const IdentityProviderButtons = ({ identityProviderList, redirectTarget, autoSig variant="neutral" disabled={Boolean(pendingProvider)} loading={pendingProvider?.name === identityProvider.name} - loadingLabel={t("auth.continue-with", { provider: identityProvider.title })} + loadingLabel={t("auth.redirecting-to-provider", { provider: identityProvider.title })} onClick={() => void handleSignInWithIdentityProvider(identityProvider)} > {t("auth.continue-with", { provider: identityProvider.title })} diff --git a/web/src/components/MemoEditor/README.md b/web/src/components/MemoEditor/README.md index a34ba8b15..4a29ef0fb 100644 --- a/web/src/components/MemoEditor/README.md +++ b/web/src/components/MemoEditor/README.md @@ -53,7 +53,7 @@ Formatting is the editor's own: its toolbar appears over selected text, the slas ### Saving -`useMemoSave` validates the draft, uploads local files, and hands the save to `memoService.save` with the operations it runs: the server's current copy (fetched into the detail cache to diff against), `useUpdateMemo` and `useCreateMemo`. Hosts that close after saving (edit, comment) hold a brief "Saved" confirmation before the session resets; the in-place composer resets at once. Uploads that landed before a failed save stay on the draft as attachments so a retry does not upload them again. The save keeps the draft's attachment order (`edit/utils/attachmentOrder.ts`): new files land where they were dragged among the saved ones, not after them. +`useMemoSave` validates the draft, uploads local files, and hands the save to `memoService.save` with the operations it runs: the server's current copy (fetched into the detail cache to diff against), `useUpdateMemo` and `useCreateMemo`. A successful save resets the session and notifies the host immediately; editing and comment hosts close without a timed confirmation, and the in-place composer is ready for the next memo. The commit button stays mounted with its original label through validation and saving; its spinner and any drawing-save error use the same leading slot. Uploads that landed before a failed save stay on the draft as attachments so a retry does not upload them again. The save keeps the draft's attachment order (`edit/utils/attachmentOrder.ts`): new files land where they were dragged among the saved ones, not after them. ### Attachments, links and place diff --git a/web/src/components/MemoEditor/edit/Toolbar/EditorToolbar.tsx b/web/src/components/MemoEditor/edit/Toolbar/EditorToolbar.tsx index d4aed8faa..d3c96bec8 100644 --- a/web/src/components/MemoEditor/edit/Toolbar/EditorToolbar.tsx +++ b/web/src/components/MemoEditor/edit/Toolbar/EditorToolbar.tsx @@ -1,5 +1,5 @@ import { Button, Tooltip } from "@usememos/ui"; -import { CheckIcon, CircleAlertIcon } from "lucide-react"; +import { CircleAlertIcon } from "lucide-react"; import { type FC, useId } from "react"; import { type Location, Visibility } from "@/types/proto/api/memo_service_pb"; import { useTranslate } from "@/utils/i18n"; @@ -33,15 +33,11 @@ export const EditorToolbar: FC = ({ const blockedReasonDetail = useEditorSelector((s) => validationService.canSave(s).detail); const isSaving = useEditorSelector((s) => s.ui.isLoading.saving); const drawingSaveError = useEditorSelector((s) => s.drawingSaveError); - const justSaved = useEditorSelector((s) => s.ui.justSaved); const isUploading = useEditorSelector((s) => s.ui.isLoading.uploading); const location = useEditorSelector((s) => s.metadata.location); const visibility = useEditorSelector((s) => s.metadata.visibility); - // The save transaction is in flight or its confirmation is holding the - // editor open; either way the toolbar is frozen. - const committing = isSaving || justSaved; const blockedMessage = - valid || committing + valid || isSaving ? undefined : blockedReason ? t(blockedReason, blockedReasonDetail ? { url: blockedReasonDetail } : undefined) @@ -50,6 +46,7 @@ export const EditorToolbar: FC = ({ // updated, a reply becomes a comment, and a new memo is simply saved. A memo // is stored with a visibility, not posted, so messaging verbs stay out. const commitLabel = memoName ? t("common.update") : parentMemoName ? t("editor.comment") : t("editor.save"); + const loadingLabel = memoName ? t("editor.updating") : parentMemoName ? t("editor.commenting") : t("editor.saving"); const handleLocationChange = (next?: Location) => { dispatch(actions.setMetadata({ location: next })); @@ -64,34 +61,19 @@ export const EditorToolbar: FC = ({ }; const blockedReasonId = useId(); - const commitButton = justSaved ? ( - - ) : blockedMessage ? ( - // The disabled button stays focusable; its tooltip and its description say why it can't save. - - }> - {commitLabel} - - {blockedMessage} - - {blockedMessage} - - - ) : ( - // The same trigger stays mounted through the save so the button keeps focus; - // only its tooltip is switched off. Both modifiers save (see - // buildEditorExtensions), so both are announced. + const commitButton = ( : undefined} + icon={drawingSaveError ? : undefined} onClick={onSave} + disabled={Boolean(blockedMessage)} + focusableWhenDisabled loading={isSaving} - loadingLabel={commitLabel} + loadingLabel={loadingLabel} + aria-describedby={blockedMessage ? blockedReasonId : undefined} aria-keyshortcuts="Meta+Enter Control+Enter" /> } @@ -99,9 +81,14 @@ export const EditorToolbar: FC = ({ {commitLabel} {/* The save shortcut shows in the tooltip, so the primary action reads as a plain verb. */} - - {drawingSaveError ? t(drawingSaveError) : commitLabel} + + {blockedMessage ?? (drawingSaveError ? t(drawingSaveError) : commitLabel)} + {blockedMessage && ( + + {blockedMessage} + + )} ); @@ -112,7 +99,7 @@ export const EditorToolbar: FC = ({
= ({ space={space} onChange={handleVisibilityChange} onSpaceChange={canChooseSpace ? handleSpaceChange : undefined} - disabled={committing} + disabled={isSaving} />
{onCancel && ( - )} diff --git a/web/src/components/MemoEditor/edit/hooks/useMemoSave.ts b/web/src/components/MemoEditor/edit/hooks/useMemoSave.ts index b1a8843d7..dd1bcd766 100644 --- a/web/src/components/MemoEditor/edit/hooks/useMemoSave.ts +++ b/web/src/components/MemoEditor/edit/hooks/useMemoSave.ts @@ -16,9 +16,6 @@ import { useEditorContext } from "../state"; import { renameUploadedKeys } from "../utils/attachmentOrder"; import { restampDefaultCreateTime } from "../utils/deriveDefaultCreateTime"; -/** How long a closing host shows "Saved" before it unmounts the editor. */ -const SAVED_CONFIRMATION_MS = 900; - interface UseMemoSaveOptions { memoName?: string; parentMemoName?: string; @@ -55,9 +52,7 @@ export function useMemoSave({ return useCallback(async () => { const state = getState(); - // A repeated shortcut during the saved confirmation is not an error worth - // a toast; the save already landed and the host is closing. - if (state.ui.justSaved) return; + if (state.ui.isLoading.saving) return; const { valid, reason, detail } = validationService.canSave(state); if (!valid) { showErrorToast(reason ? t(reason, detail ? { url: detail } : undefined) : t("editor.validation.cannot-save")); @@ -137,15 +132,6 @@ export function useMemoSave({ toast.add({ title: t("memo.moved"), type: "success" }); } - // Hosts that close after saving (edit, comment) hold a brief "Saved" - // confirmation on the toolbar while the caches refresh underneath. The - // in-place composer clears immediately, so it shows nothing. - if (memoName || parentMemoName) { - dispatch(actions.setLoading("saving", false)); - dispatch(actions.setJustSaved(true)); - await new Promise((resolve) => setTimeout(resolve, SAVED_CONFIRMATION_MS)); - } - dispatch(actions.reset()); if (!memoName && defaultVisibility) { dispatch(actions.setMetadata({ visibility: defaultVisibility })); @@ -187,7 +173,6 @@ export function useMemoSave({ }); } finally { dispatch(actions.setLoading("saving", false)); - dispatch(actions.setJustSaved(false)); } }, [ actions, diff --git a/web/src/components/MemoEditor/edit/services/validationService.ts b/web/src/components/MemoEditor/edit/services/validationService.ts index 875649ebd..234e8da55 100644 --- a/web/src/components/MemoEditor/edit/services/validationService.ts +++ b/web/src/components/MemoEditor/edit/services/validationService.ts @@ -45,9 +45,7 @@ export const validationService = { return { valid: false, reason: "editor.validation.finish-audio-recording" }; } - // Cannot save while already saving, or while the saved confirmation holds - // the editor open for its closing host. - if (state.ui.isLoading.saving || state.ui.justSaved) { + if (state.ui.isLoading.saving) { return { valid: false, reason: "editor.validation.save-in-progress" }; } diff --git a/web/src/components/MemoEditor/edit/state/actions.ts b/web/src/components/MemoEditor/edit/state/actions.ts index 62a074f83..cfe12a357 100644 --- a/web/src/components/MemoEditor/edit/state/actions.ts +++ b/web/src/components/MemoEditor/edit/state/actions.ts @@ -56,11 +56,6 @@ export const editorActions = { payload: timestamps, }), - setJustSaved: (value: boolean): EditorAction => ({ - type: "SET_JUST_SAVED", - payload: value, - }), - setRecorderBusy: (value: boolean): EditorAction => ({ type: "SET_RECORDER_BUSY", payload: value, diff --git a/web/src/components/MemoEditor/edit/state/reducer.ts b/web/src/components/MemoEditor/edit/state/reducer.ts index 22d914dfa..aecb245df 100644 --- a/web/src/components/MemoEditor/edit/state/reducer.ts +++ b/web/src/components/MemoEditor/edit/state/reducer.ts @@ -105,15 +105,6 @@ export function editorReducer(state: EditorState, action: EditorAction): EditorS recorderBusy: action.payload, }; - case "SET_JUST_SAVED": - return { - ...state, - ui: { - ...state.ui, - justSaved: action.payload, - }, - }; - case "RESET": return createInitialState(); diff --git a/web/src/components/MemoEditor/edit/state/types.ts b/web/src/components/MemoEditor/edit/state/types.ts index 2fa10aa3a..fb6c28e38 100644 --- a/web/src/components/MemoEditor/edit/state/types.ts +++ b/web/src/components/MemoEditor/edit/state/types.ts @@ -24,10 +24,6 @@ export interface EditorState { loading: boolean; transcribing: boolean; }; - /** Save landed and the editor is about to close; the toolbar shows a brief - * confirmation instead of the commit verb. Only hosts that unmount after - * saving set it; the in-place composer resets immediately. */ - justSaved: boolean; }; timestamps: { createTime?: Date; @@ -59,7 +55,6 @@ export type EditorAction = | { type: "SET_PENDING_INLINE_IMAGE_INSERTIONS"; payload: number } | { type: "SET_TIMESTAMPS"; payload: Partial } | { type: "SET_RECORDER_BUSY"; payload: boolean } - | { type: "SET_JUST_SAVED"; payload: boolean } | { type: "ACCEPT_SUGGESTION"; payload: string } | { type: "SET_DRAWING_SAVE_ERROR"; payload: EditorState["drawingSaveError"] } | { type: "SET_DRAWING_MEMO_UPDATE"; payload: boolean } @@ -83,7 +78,6 @@ const defaultState: EditorState = { loading: false, transcribing: false, }, - justSaved: false, }, timestamps: { createTime: undefined, diff --git a/web/src/components/PasswordSignInForm.tsx b/web/src/components/PasswordSignInForm.tsx index 626ea4201..42a6bdc58 100644 --- a/web/src/components/PasswordSignInForm.tsx +++ b/web/src/components/PasswordSignInForm.tsx @@ -103,7 +103,7 @@ function PasswordSignInForm({ redirectPath }: PasswordSignInFormProps) { /> {error && {error.message}} - diff --git a/web/src/locales/ar.json b/web/src/locales/ar.json index 7a0a75b3a..b6e77c521 100644 --- a/web/src/locales/ar.json +++ b/web/src/locales/ar.json @@ -33,6 +33,8 @@ "admin-sign-in": "تسجيل دخول المسؤول", "back-to-sign-in": "العودة إلى صفحة تسجيل الدخول", "continue-with": "المتابعة مع {{provider}}", + "redirecting-to-provider": "جارٍ الانتقال إلى {{provider}}…", + "signing-in": "جارٍ تسجيل الدخول…", "create-admin-account": "إنشاء حساب مدير", "setup-description": "إنشاء حساب المدير لهذه النسخة.", "setup-title": "إعداد النسخة", @@ -163,6 +165,9 @@ "markdown-mode": "وضع Markdown", "no-changes-detected": "لم يتم الكشف عن تغييرات", "save": "حفظ", + "saving": "جارٍ الحفظ…", + "updating": "جارٍ التحديث…", + "commenting": "جارٍ إرسال التعليق…", "insert-menu": { "add-location": "أضف الموقع", "link-memo": "مذكرة الارتباط", @@ -256,7 +261,6 @@ "footnotes": "الحواشي", "back-to-reference": "الرجوع إلى المرجع", "new-memo": "مذكرة جديدة", - "saved": "تم الحفظ", "validation": { "cannot-save": "تعذر الحفظ", "content-required": "المحتوى أو المرفق أو الملف مطلوب", diff --git a/web/src/locales/az.json b/web/src/locales/az.json index bd3393342..00528c95e 100644 --- a/web/src/locales/az.json +++ b/web/src/locales/az.json @@ -48,6 +48,8 @@ "back-to-sign-in": "Girişə qayıt", "callback-failed-title": "Giriş tamamlana bilmədi", "continue-with": "{{provider}} ilə davam et", + "redirecting-to-provider": "{{provider}} xidmətinə yönləndirilir…", + "signing-in": "Daxil olunur…", "create-admin-account": "Admin hesabı yarat", "create-your-account": "Hesabınızı yaradın", "hide-password": "Şifrəni gizlət", @@ -342,7 +344,9 @@ "new-memo": "Yeni qeyd", "no-changes-detected": "Dəyişiklik aşkarlanmadı", "save": "Yadda saxla", - "saved": "Yadda saxlanıldı", + "saving": "Yadda saxlanılır…", + "updating": "Yenilənir…", + "commenting": "Şərh göndərilir…", "validation": { "cannot-save": "Yadda saxlamaq mümkün deyil", "content-required": "Məzmun, qoşma və ya fayl tələb olunur", diff --git a/web/src/locales/bg.json b/web/src/locales/bg.json index d3086bc59..153ae4ad0 100644 --- a/web/src/locales/bg.json +++ b/web/src/locales/bg.json @@ -33,6 +33,8 @@ "admin-sign-in": "Вход като администратор", "back-to-sign-in": "Обратно към влизане", "continue-with": "Продължете с {{provider}}", + "redirecting-to-provider": "Пренасочване към {{provider}}…", + "signing-in": "Влизане…", "create-admin-account": "Създаване на администраторски акаунт", "setup-description": "Създаване на администраторски акаунт за този екземпляр.", "setup-title": "Настройване на вашия екземпляр", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Не са открити промени", "save": "Запазване", + "saving": "Запазване…", + "updating": "Обновяване…", + "commenting": "Изпращане на коментар…", "audio-recorder": { "attachment-label": "Аудио запис", "attachment-label-with-time": "Аудио запис {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Бележки под линия", "back-to-reference": "Назад към препратката", "new-memo": "Нова бележка", - "saved": "Запазена", "validation": { "cannot-save": "Не може да се запази", "content-required": "Необходимо е съдържание, прикачен файл или файл", diff --git a/web/src/locales/ca.json b/web/src/locales/ca.json index 6da8bbab7..ac992da17 100644 --- a/web/src/locales/ca.json +++ b/web/src/locales/ca.json @@ -33,6 +33,8 @@ "admin-sign-in": "Inici de sessió d'administrador", "back-to-sign-in": "Torna a iniciar la sessió", "continue-with": "Continua amb {{provider}}", + "redirecting-to-provider": "S’està redirigint a {{provider}}…", + "signing-in": "S’està iniciant la sessió…", "create-admin-account": "Crea un compte d'administrador", "setup-description": "Crea el compte d'administrador per a aquesta instància.", "setup-title": "Configura la teva instància", @@ -221,6 +223,9 @@ }, "no-changes-detected": "No s'han detectat canvis", "save": "Guarda", + "saving": "S’està desant…", + "updating": "S’està actualitzant…", + "commenting": "S’està enviant el comentari…", "audio-recorder": { "attachment-label": "Gravació d'àudio", "attachment-label-with-time": "Gravació d'àudio {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Notes al peu", "back-to-reference": "Torna a la referència", "new-memo": "Nova nota", - "saved": "Desada", "validation": { "cannot-save": "No es pot desar", "content-required": "Cal contingut, fitxer adjunt o fitxer", diff --git a/web/src/locales/cs.json b/web/src/locales/cs.json index 28fc2f9f1..d63f5743c 100644 --- a/web/src/locales/cs.json +++ b/web/src/locales/cs.json @@ -33,6 +33,8 @@ "admin-sign-in": "Přihlášení správce", "back-to-sign-in": "Zpět k přihlášení", "continue-with": "Pokračovat s {{provider}}", + "redirecting-to-provider": "Přesměrování na {{provider}}…", + "signing-in": "Přihlašování…", "create-admin-account": "Vytvořit administrátorský účet", "setup-description": "Vytvořit administrátorský účet pro tuto instanci.", "setup-title": "Nastavení instance", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Nebyly zjištěny žádné změny", "save": "Uložit", + "saving": "Ukládání…", + "updating": "Aktualizace…", + "commenting": "Odesílání komentáře…", "audio-recorder": { "attachment-label": "Záznam zvuku", "attachment-label-with-time": "Záznam zvuku {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Poznámky pod čarou", "back-to-reference": "Zpět na odkaz", "new-memo": "Nová poznámka", - "saved": "Uloženo", "validation": { "cannot-save": "Nelze uložit", "content-required": "Je vyžadován obsah, příloha nebo soubor", diff --git a/web/src/locales/da.json b/web/src/locales/da.json index 7dac0201b..886d5eb02 100644 --- a/web/src/locales/da.json +++ b/web/src/locales/da.json @@ -33,6 +33,8 @@ "admin-sign-in": "Administratorlogin", "back-to-sign-in": "Tilbage til login", "continue-with": "Fortsæt med {{provider}}", + "redirecting-to-provider": "Omdirigerer til {{provider}}…", + "signing-in": "Logger ind…", "create-admin-account": "Opret administratorkonto", "setup-description": "Opret administratorkontoen for denne instans.", "setup-title": "Konfigurer din instans", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Ingen ændringer registreret", "save": "Spare", + "saving": "Gemmer…", + "updating": "Opdaterer…", + "commenting": "Sender kommentar…", "audio-recorder": { "attachment-label": "Lydoptagelse", "attachment-label-with-time": "Lydoptagelse {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Fodnoter", "back-to-reference": "Tilbage til referencen", "new-memo": "Nyt notat", - "saved": "Gemt", "validation": { "cannot-save": "Kan ikke gemmes", "content-required": "Indhold, vedhæftet fil eller fil kræves", diff --git a/web/src/locales/de.json b/web/src/locales/de.json index 8c27f83a4..1f00713d3 100644 --- a/web/src/locales/de.json +++ b/web/src/locales/de.json @@ -33,6 +33,8 @@ "admin-sign-in": "Administrator-Anmeldung", "back-to-sign-in": "Zurück zur Anmeldung", "continue-with": "Weiter mit {{provider}}", + "redirecting-to-provider": "Weiterleitung zu {{provider}}…", + "signing-in": "Anmeldung läuft…", "create-admin-account": "Administratorkonto erstellen", "setup-description": "Administratorkonto für diese Instanz erstellen.", "setup-title": "Instanz einrichten", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Keine Änderungen erkannt", "save": "Speichern", + "saving": "Wird gespeichert…", + "updating": "Wird aktualisiert…", + "commenting": "Kommentar wird gesendet…", "audio-recorder": { "attachment-label": "Audioaufnahme", "attachment-label-with-time": "Audioaufnahme {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Fußnoten", "back-to-reference": "Zurück zur Referenz", "new-memo": "Neues Memo", - "saved": "Gespeichert", "validation": { "cannot-save": "Speichern nicht möglich", "content-required": "Inhalt, Anhang oder Datei erforderlich", diff --git a/web/src/locales/el.json b/web/src/locales/el.json index 67c730f26..ab7957888 100644 --- a/web/src/locales/el.json +++ b/web/src/locales/el.json @@ -33,6 +33,8 @@ "admin-sign-in": "Σύνδεση διαχειριστή", "back-to-sign-in": "Επιστροφή στη σύνδεση", "continue-with": "Συνέχεια με {{provider}}", + "redirecting-to-provider": "Ανακατεύθυνση στο {{provider}}…", + "signing-in": "Σύνδεση…", "create-admin-account": "Δημιουργία λογαριασμού διαχειριστή", "setup-description": "Δημιουργία λογαριασμού διαχειριστή για αυτήν την παρουσία.", "setup-title": "Ρύθμιση της παρουσίας σας", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Δεν εντοπίστηκαν αλλαγές", "save": "Εκτός", + "saving": "Αποθήκευση…", + "updating": "Ενημέρωση…", + "commenting": "Αποστολή σχολίου…", "audio-recorder": { "attachment-label": "Ηχογράφηση", "attachment-label-with-time": "Εγγραφή ήχου {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Υποσημειώσεις", "back-to-reference": "Επιστροφή στην αναφορά", "new-memo": "Νέο σημείωμα", - "saved": "Αποθηκεύτηκε", "validation": { "cannot-save": "Δεν είναι δυνατή η αποθήκευση", "content-required": "Απαιτείται περιεχόμενο, συνημμένο ή αρχείο", diff --git a/web/src/locales/en-GB.json b/web/src/locales/en-GB.json index fd00f557b..9eddb3efa 100644 --- a/web/src/locales/en-GB.json +++ b/web/src/locales/en-GB.json @@ -33,6 +33,8 @@ "admin-sign-in": "Administrator sign-in", "back-to-sign-in": "Back to sign in", "continue-with": "Continue with {{provider}}", + "redirecting-to-provider": "Redirecting to {{provider}}…", + "signing-in": "Signing in…", "create-admin-account": "Create admin account", "setup-description": "Create the administrator account for this instance.", "setup-title": "Set up your instance", @@ -221,6 +223,9 @@ }, "no-changes-detected": "No changes detected", "save": "Save", + "saving": "Saving…", + "updating": "Updating…", + "commenting": "Sending comment…", "audio-recorder": { "attachment-label": "Audio recording", "attachment-label-with-time": "Audio recording {{time}}", @@ -256,7 +261,6 @@ "link": "Link" }, "new-memo": "New memo", - "saved": "Saved", "validation": { "cannot-save": "Cannot save", "content-required": "Content, attachment, or file required", diff --git a/web/src/locales/en.json b/web/src/locales/en.json index 437aff2e6..d6912643a 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -48,6 +48,8 @@ "back-to-sign-in": "Back to sign in", "callback-failed-title": "Couldn't finish signing in", "continue-with": "Continue with {{provider}}", + "redirecting-to-provider": "Redirecting to {{provider}}…", + "signing-in": "Signing in…", "create-admin-account": "Create admin account", "create-your-account": "Create your account", "hide-password": "Hide password", @@ -342,7 +344,9 @@ "new-memo": "New memo", "no-changes-detected": "No changes detected", "save": "Save", - "saved": "Saved", + "saving": "Saving…", + "updating": "Updating…", + "commenting": "Sending comment…", "validation": { "cannot-save": "Cannot save", "content-required": "Content, attachment, or file required", diff --git a/web/src/locales/es.json b/web/src/locales/es.json index e3cc6c0c6..7d28fc988 100644 --- a/web/src/locales/es.json +++ b/web/src/locales/es.json @@ -33,6 +33,8 @@ "admin-sign-in": "Inicio de sesión de administrador", "back-to-sign-in": "Volver al inicio de sesión", "continue-with": "Continuar con {{provider}}", + "redirecting-to-provider": "Redirigiendo a {{provider}}…", + "signing-in": "Iniciando sesión…", "create-admin-account": "Crear cuenta de administrador", "setup-description": "Crear la cuenta de administrador para esta instancia.", "setup-title": "Configurar la instancia", @@ -221,6 +223,9 @@ }, "no-changes-detected": "No se detectaron cambios", "save": "Guardar", + "saving": "Guardando…", + "updating": "Actualizando…", + "commenting": "Enviando comentario…", "audio-recorder": { "attachment-label": "Grabación de audio", "attachment-label-with-time": "Grabación de audio {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Notas al pie", "back-to-reference": "Volver a la referencia", "new-memo": "Nuevo memo", - "saved": "Guardado", "validation": { "cannot-save": "No se puede guardar", "content-required": "Se requiere contenido, adjunto o archivo", diff --git a/web/src/locales/et.json b/web/src/locales/et.json index 69cfffdae..882ce11dd 100644 --- a/web/src/locales/et.json +++ b/web/src/locales/et.json @@ -33,6 +33,8 @@ "admin-sign-in": "Administraatori sisselogimine", "back-to-sign-in": "Tagasi sisselogimiseks", "continue-with": "Jätka {{provider}}-ga", + "redirecting-to-provider": "Suunamine teenusesse {{provider}}…", + "signing-in": "Sisselogimine…", "create-admin-account": "Loo administraatori konto", "setup-description": "Loo selle eksemplari jaoks administraatori konto.", "setup-title": "Seadistage oma eksemplar", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Muudatusi ei tuvastatud", "save": "Salvesta", + "saving": "Salvestamine…", + "updating": "Uuendamine…", + "commenting": "Kommentaari saatmine…", "audio-recorder": { "attachment-label": "Helisalvestus", "attachment-label-with-time": "Helisalvestus {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Allmärkused", "back-to-reference": "Tagasi viite juurde", "new-memo": "Uus memo", - "saved": "Salvestatud", "validation": { "cannot-save": "Ei saa salvestada", "content-required": "Vaja on sisu, manust või faili", diff --git a/web/src/locales/fa.json b/web/src/locales/fa.json index c5cd3d87a..9a8db65f4 100644 --- a/web/src/locales/fa.json +++ b/web/src/locales/fa.json @@ -33,6 +33,8 @@ "admin-sign-in": "ورود مدیر", "back-to-sign-in": "بازگشت به ورود", "continue-with": "ادامه با {{provider}}", + "redirecting-to-provider": "در حال انتقال به {{provider}}…", + "signing-in": "در حال ورود…", "create-admin-account": "ایجاد حساب کاربری ادمین", "setup-description": "ایجاد حساب کاربری ادمین برای این نمونه.", "setup-title": "راه‌اندازی نمونه شما", @@ -163,6 +165,9 @@ "markdown-mode": "حالت Markdown", "no-changes-detected": "تغییری شناسایی نشد", "save": "ذخیره", + "saving": "در حال ذخیره…", + "updating": "در حال به‌روزرسانی…", + "commenting": "در حال ارسال نظر…", "insert-menu": { "add-location": "اضافه کردن مکان", "link-memo": "پیوند یادداشت", @@ -256,7 +261,6 @@ "footnotes": "پانویس‌ها", "back-to-reference": "بازگشت به مرجع", "new-memo": "یادداشت جدید", - "saved": "ذخیره شد", "validation": { "cannot-save": "نمی‌توانم ذخیره کنم", "content-required": "محتوا، پیوست یا فایل مورد نیاز است", diff --git a/web/src/locales/fi.json b/web/src/locales/fi.json index 2a9e5cfb5..03806131f 100644 --- a/web/src/locales/fi.json +++ b/web/src/locales/fi.json @@ -33,6 +33,8 @@ "admin-sign-in": "Järjestelmänvalvojan kirjautuminen", "back-to-sign-in": "Takaisin sisäänkirjautumiseen", "continue-with": "Jatka kohdasta {{provider}}", + "redirecting-to-provider": "Siirrytään palveluun {{provider}}…", + "signing-in": "Kirjaudutaan sisään…", "create-admin-account": "Luo järjestelmänvalvojan tili", "setup-description": "Luo järjestelmänvalvojan tili tälle instanssille.", "setup-title": "Määritä instanssisi", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Muutoksia ei havaittu", "save": "Tallentaa", + "saving": "Tallennetaan…", + "updating": "Päivitetään…", + "commenting": "Lähetetään kommenttia…", "audio-recorder": { "attachment-label": "Äänen tallennus", "attachment-label-with-time": "Äänen tallennus {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Alaviitteet", "back-to-reference": "Takaisin viitteeseen", "new-memo": "Uusi muistio", - "saved": "Tallennettu", "validation": { "cannot-save": "Ei voida tallentaa", "content-required": "Sisältö, liite tai tiedosto vaaditaan", diff --git a/web/src/locales/fr.json b/web/src/locales/fr.json index b5cdbacd7..dad540e8c 100644 --- a/web/src/locales/fr.json +++ b/web/src/locales/fr.json @@ -33,6 +33,8 @@ "admin-sign-in": "Connexion administrateur", "back-to-sign-in": "Retour à la connexion", "continue-with": "Continuer avec {{provider}}", + "redirecting-to-provider": "Redirection vers {{provider}}…", + "signing-in": "Connexion en cours…", "create-admin-account": "Créer un compte administrateur", "setup-description": "Créer le compte administrateur de cette instance.", "setup-title": "Configurer votre instance", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Aucun changement détecté", "save": "Enregistrer", + "saving": "Enregistrement en cours…", + "updating": "Mise à jour en cours…", + "commenting": "Envoi du commentaire…", "audio-recorder": { "attachment-label": "Enregistrement audio", "attachment-label-with-time": "Enregistrement audio {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Notes de bas de page", "back-to-reference": "Retour à la référence", "new-memo": "Nouvelle note", - "saved": "Enregistrée", "validation": { "cannot-save": "Impossible d'enregistrer", "content-required": "Contenu, pièce jointe ou fichier requis", diff --git a/web/src/locales/gl.json b/web/src/locales/gl.json index 6da788c38..a0c7866d8 100644 --- a/web/src/locales/gl.json +++ b/web/src/locales/gl.json @@ -33,6 +33,8 @@ "admin-sign-in": "Inicio de sesión do administrador", "back-to-sign-in": "Volver ao inicio de sesión", "continue-with": "Continuar con {{provider}}", + "redirecting-to-provider": "Redirixindo a {{provider}}…", + "signing-in": "Iniciando sesión…", "create-admin-account": "Crear conta de administrador", "setup-description": "Crear a conta de administrador para esta instancia.", "setup-title": "Configurar a túa instancia", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Non se detectaron cambios", "save": "Gardar", + "saving": "Gardando…", + "updating": "Actualizando…", + "commenting": "Enviando comentario…", "audio-recorder": { "attachment-label": "Gravación de audio", "attachment-label-with-time": "Gravación de audio {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Notas ao pé", "back-to-reference": "Volver á referencia", "new-memo": "Nova nota", - "saved": "Gardada", "validation": { "cannot-save": "Non se pode gardar", "content-required": "Necesítase contido, anexo ou ficheiro", diff --git a/web/src/locales/he.json b/web/src/locales/he.json index 7a90e88e9..39fb16d4d 100644 --- a/web/src/locales/he.json +++ b/web/src/locales/he.json @@ -25,6 +25,8 @@ "back-to-sign-in": "חזרה להתחברות", "callback-failed-title": "לא ניתן היה להשלים את הכניסה", "continue-with": "המשיכו עם {{provider}}", + "redirecting-to-provider": "מתבצעת הפניה אל {{provider}}…", + "signing-in": "מתבצעת התחברות…", "create-admin-account": "צור חשבון מנהל", "create-your-account": "צרו את החשבון שלכם", "hide-password": "הסתרת הסיסמה", @@ -307,6 +309,9 @@ }, "no-changes-detected": "לא זוהו שינויים", "save": "שמור", + "saving": "מתבצעת שמירה…", + "updating": "מתבצע עדכון…", + "commenting": "מתבצעת שליחת תגובה…", "validation": { "cannot-save": "לא ניתן לשמור", "content-required": "נדרש תוכן, קובץ מצורף או קובץ", @@ -337,7 +342,6 @@ "footnotes": "הערות שוליים", "back-to-reference": "חזרה להפניה", "new-memo": "תזכיר חדש", - "saved": "נשמר", "blocks": { "task": "משימה", "quote": "ציטוט", diff --git a/web/src/locales/hi.json b/web/src/locales/hi.json index 2606f658f..2120b0e60 100644 --- a/web/src/locales/hi.json +++ b/web/src/locales/hi.json @@ -33,6 +33,8 @@ "admin-sign-in": "एडमिनिस्ट्रेटर साइन-इन", "back-to-sign-in": "साइन इन पर वापस जाएं", "continue-with": "{{provider}} के साथ जारी रखें", + "redirecting-to-provider": "{{provider}} पर ले जाया जा रहा है…", + "signing-in": "साइन इन हो रहा है…", "create-admin-account": "एडमिन अकाउंट बनाएं", "setup-description": "इस इंस्टेंस के लिए एडमिनिस्ट्रेटर अकाउंट बनाएं।", "setup-title": "अपना इंस्टेंस सेट अप करें", @@ -163,6 +165,9 @@ "markdown-mode": "Markdown मोड", "no-changes-detected": "कोई बदलाव नहीं पाया गया", "save": "सहेजें", + "saving": "सहेजा जा रहा है…", + "updating": "अपडेट हो रहा है…", + "commenting": "टिप्पणी भेजी जा रही है…", "insert-menu": { "add-location": "स्थान जोड़ें", "link-memo": "लिंक मेमो", @@ -256,7 +261,6 @@ "footnotes": "पादटिप्पणियाँ", "back-to-reference": "संदर्भ पर वापस जाएँ", "new-memo": "नया मेमो", - "saved": "सेव किया गया", "validation": { "cannot-save": "सेव नहीं किया जा सकता", "content-required": "कंटेंट, अटैचमेंट, या फ़ाइल ज़रूरी है", diff --git a/web/src/locales/hr.json b/web/src/locales/hr.json index 6e77349e7..e7b6d0243 100644 --- a/web/src/locales/hr.json +++ b/web/src/locales/hr.json @@ -33,6 +33,8 @@ "admin-sign-in": "Prijava administratora", "back-to-sign-in": "Natrag na prijavu", "continue-with": "Nastavi s {{provider}}", + "redirecting-to-provider": "Preusmjeravanje na {{provider}}…", + "signing-in": "Prijava u tijeku…", "create-admin-account": "Izradi administratorski račun", "setup-description": "Izradi administratorski račun za ovu instancu.", "setup-title": "Postavi svoju instancu", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Nema promjena", "save": "Sačuvaj", + "saving": "Spremanje…", + "updating": "Ažuriranje…", + "commenting": "Slanje komentara…", "audio-recorder": { "attachment-label": "Audio snimanje", "attachment-label-with-time": "Audio snimak {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Bilješke", "back-to-reference": "Natrag na referencu", "new-memo": "Novi podsjetnik", - "saved": "Spremljeno", "validation": { "cannot-save": "Spremanje nije moguće", "content-required": "Potreban je sadržaj, privitak ili datoteka", diff --git a/web/src/locales/hu.json b/web/src/locales/hu.json index 8cfffea7b..e3e93ddd1 100644 --- a/web/src/locales/hu.json +++ b/web/src/locales/hu.json @@ -33,6 +33,8 @@ "admin-sign-in": "Rendszergazdai bejelentkezés", "back-to-sign-in": "Vissza a bejelentkezéshez", "continue-with": "Folytatás ezzel: {{provider}}", + "redirecting-to-provider": "Átirányítás ide: {{provider}}…", + "signing-in": "Bejelentkezés…", "create-admin-account": "Rendszergazdai fiók létrehozása", "setup-description": "Rendszergazdai fiók létrehozása ehhez a példányhoz.", "setup-title": "Példány beállítása", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Nincs változás", "save": "Mentés", + "saving": "Mentés…", + "updating": "Frissítés…", + "commenting": "Hozzászólás küldése…", "audio-recorder": { "attachment-label": "Hangfelvétel", "attachment-label-with-time": "Hangfelvétel {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Lábjegyzetek", "back-to-reference": "Vissza a hivatkozáshoz", "new-memo": "Új feljegyzés", - "saved": "Mentve", "validation": { "cannot-save": "Nem lehet menteni", "content-required": "Tartalom, melléklet vagy fájl szükséges", diff --git a/web/src/locales/id.json b/web/src/locales/id.json index cf523a87b..513c95c93 100644 --- a/web/src/locales/id.json +++ b/web/src/locales/id.json @@ -33,6 +33,8 @@ "admin-sign-in": "Masuk administrator", "back-to-sign-in": "Kembali ke halaman masuk", "continue-with": "Lanjutkan dengan {{provider}}", + "redirecting-to-provider": "Mengalihkan ke {{provider}}…", + "signing-in": "Sedang masuk…", "create-admin-account": "Buat akun admin", "setup-description": "Buat akun administrator untuk instance ini.", "setup-title": "Siapkan instance Anda", @@ -163,6 +165,9 @@ "markdown-mode": "Mode Markdown", "no-changes-detected": "Tidak ada perubahan yang terdeteksi", "save": "Simpan", + "saving": "Menyimpan…", + "updating": "Memperbarui…", + "commenting": "Mengirim komentar…", "insert-menu": { "add-location": "Tambahkan lokasi", "link-memo": "Tautan memo", @@ -256,7 +261,6 @@ "footnotes": "Catatan kaki", "back-to-reference": "Kembali ke referensi", "new-memo": "Memo baru", - "saved": "Tersimpan", "validation": { "cannot-save": "Tidak dapat menyimpan", "content-required": "Konten, lampiran, atau file diperlukan", diff --git a/web/src/locales/it.json b/web/src/locales/it.json index 79aacc7ee..ff48f53c6 100644 --- a/web/src/locales/it.json +++ b/web/src/locales/it.json @@ -33,6 +33,8 @@ "admin-sign-in": "Accesso amministratore", "back-to-sign-in": "Torna alla pagina di accesso", "continue-with": "Continua con {{provider}}", + "redirecting-to-provider": "Reindirizzamento a {{provider}}…", + "signing-in": "Accesso in corso…", "create-admin-account": "Crea un account amministratore", "setup-description": "Crea l'account amministratore per questa istanza.", "setup-title": "Configura la tua istanza", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Nessuna modifica rilevata", "save": "Salva", + "saving": "Salvataggio…", + "updating": "Aggiornamento…", + "commenting": "Invio del commento…", "audio-recorder": { "attachment-label": "Registrazione audio", "attachment-label-with-time": "Registrazione audio {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Note a piè di pagina", "back-to-reference": "Torna al riferimento", "new-memo": "Nuovo memo", - "saved": "Salvato", "validation": { "cannot-save": "Impossibile salvare", "content-required": "Contenuto, allegato o file richiesti", diff --git a/web/src/locales/ja.json b/web/src/locales/ja.json index d88d9cbac..648572d1e 100644 --- a/web/src/locales/ja.json +++ b/web/src/locales/ja.json @@ -25,6 +25,8 @@ "back-to-sign-in": "サインインに戻る", "callback-failed-title": "サインインを完了できませんでした", "continue-with": "{{provider}}で続行", + "redirecting-to-provider": "{{provider}} に移動しています…", + "signing-in": "ログインしています…", "create-admin-account": "管理者アカウントを作成", "create-your-account": "アカウントを作成", "hide-password": "パスワードを隠す", @@ -163,6 +165,9 @@ "markdown-mode": "Markdown モード", "no-changes-detected": "変更はありません", "save": "保存", + "saving": "保存しています…", + "updating": "更新しています…", + "commenting": "コメントを送信しています…", "insert-menu": { "add-location": "場所を追加", "link-memo": "リンクメモ", @@ -256,7 +261,6 @@ "footnotes": "脚注", "back-to-reference": "参照箇所に戻る", "new-memo": "新しいメモ", - "saved": "保存済み", "validation": { "cannot-save": "保存できません", "content-required": "コンテンツ、添付ファイル、またはファイルが必要です", diff --git a/web/src/locales/ka-GE.json b/web/src/locales/ka-GE.json index b7b302d3c..3aae14a6b 100644 --- a/web/src/locales/ka-GE.json +++ b/web/src/locales/ka-GE.json @@ -33,6 +33,8 @@ "admin-sign-in": "ადმინისტრატორის შესვლა", "back-to-sign-in": "დაბრუნება შესვლაზე", "continue-with": "გაგრძელება {{provider}}-ით", + "redirecting-to-provider": "მიმდინარეობს {{provider}}-ზე გადამისამართება…", + "signing-in": "შესვლა მიმდინარეობს…", "create-admin-account": "ადმინისტრატორის ანგარიშის შექმნა", "setup-description": "ამ ინსტანციისთვის ადმინისტრატორის ანგარიშის შექმნა.", "setup-title": "თქვენი ინსტანციის დაყენება", @@ -221,6 +223,9 @@ }, "no-changes-detected": "ცვლილებები არ აღმოჩენილა", "save": "შენახვა", + "saving": "მიმდინარეობს შენახვა…", + "updating": "მიმდინარეობს განახლება…", + "commenting": "მიმდინარეობს კომენტარის გაგზავნა…", "audio-recorder": { "attachment-label": "აუდიო ჩანაწერი", "attachment-label-with-time": "აუდიო ჩანაწერი {{time}}", @@ -256,7 +261,6 @@ "footnotes": "სქოლიოები", "back-to-reference": "მითითებაზე დაბრუნება", "new-memo": "ახალი მემო", - "saved": "შენახულია", "validation": { "cannot-save": "შენახვა შეუძლებელია", "content-required": "საჭიროა კონტენტი, დანართი ან ფაილი", diff --git a/web/src/locales/ko.json b/web/src/locales/ko.json index 0e71ae312..6eafed01f 100644 --- a/web/src/locales/ko.json +++ b/web/src/locales/ko.json @@ -33,6 +33,8 @@ "admin-sign-in": "관리자 로그인", "back-to-sign-in": "로그인으로 돌아가기", "continue-with": "{{provider}}으로 계속 진행", + "redirecting-to-provider": "{{provider}} 로그인 페이지로 이동 중…", + "signing-in": "로그인 중…", "create-admin-account": "관리자 계정 생성", "setup-description": "이 인스턴스의 관리자 계정을 생성합니다.", "setup-title": "인스턴스 설정", @@ -163,6 +165,9 @@ "markdown-mode": "Markdown 모드", "no-changes-detected": "변경사항이 없습니다", "save": "저장", + "saving": "저장 중…", + "updating": "업데이트 중…", + "commenting": "댓글 전송 중…", "insert-menu": { "add-location": "위치 추가", "link-memo": "링크 메모", @@ -256,7 +261,6 @@ "footnotes": "각주", "back-to-reference": "참조로 돌아가기", "new-memo": "새 메모", - "saved": "저장됨", "validation": { "cannot-save": "저장할 수 없음", "content-required": "콘텐츠, 첨부 파일 또는 파일이 필요합니다", diff --git a/web/src/locales/lt.json b/web/src/locales/lt.json index 26c258b76..ad53014d0 100644 --- a/web/src/locales/lt.json +++ b/web/src/locales/lt.json @@ -33,6 +33,8 @@ "admin-sign-in": "Administratoriaus prisijungimas", "back-to-sign-in": "Grįžti prie prisijungimo", "continue-with": "Tęsti su {{provider}}", + "redirecting-to-provider": "Nukreipiama į {{provider}}…", + "signing-in": "Prisijungiama…", "create-admin-account": "Sukurti administratoriaus paskyrą", "setup-description": "Sukurti administratoriaus paskyrą šiai instancijai.", "setup-title": "Nustatyti savo instanciją", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Pakeitimų neaptikta", "save": "Išsaugoti", + "saving": "Išsaugoma…", + "updating": "Atnaujinama…", + "commenting": "Siunčiamas komentaras…", "audio-recorder": { "attachment-label": "Garso įrašymas", "attachment-label-with-time": "Garso įrašymas {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Išnašos", "back-to-reference": "Grįžti į nuorodą", "new-memo": "Naujas priminimas", - "saved": "Išsaugota", "validation": { "cannot-save": "Nepavyksta išsaugoti", "content-required": "Reikalingas turinys, priedas arba failas", diff --git a/web/src/locales/lv.json b/web/src/locales/lv.json index ba5888198..415bfd2f1 100644 --- a/web/src/locales/lv.json +++ b/web/src/locales/lv.json @@ -33,6 +33,8 @@ "admin-sign-in": "Administratora pieteikšanās", "back-to-sign-in": "Atpakaļ, lai pierakstītos", "continue-with": "Turpināt ar {{provider}}", + "redirecting-to-provider": "Notiek novirzīšana uz {{provider}}…", + "signing-in": "Notiek pierakstīšanās…", "create-admin-account": "Izveidot administratora kontu", "setup-description": "Izveidojiet administratora kontu šai instancei.", "setup-title": "Iestatiet savu instanci", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Izmaiņas nav konstatētas", "save": "Saglabāt", + "saving": "Notiek saglabāšana…", + "updating": "Notiek atjaunināšana…", + "commenting": "Notiek komentāra sūtīšana…", "audio-recorder": { "attachment-label": "Audio ieraksts", "attachment-label-with-time": "Audio ieraksts {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Vēres", "back-to-reference": "Atpakaļ pie atsauces", "new-memo": "Jauna piezīme", - "saved": "Saglabāts", "validation": { "cannot-save": "Nevar saglabāt", "content-required": "Nepieciešams saturs, pielikums vai fails", diff --git a/web/src/locales/mr.json b/web/src/locales/mr.json index a0d75fd6a..dee2d0bf4 100644 --- a/web/src/locales/mr.json +++ b/web/src/locales/mr.json @@ -33,6 +33,8 @@ "admin-sign-in": "प्रशासक साइन-इन", "back-to-sign-in": "साइन इन वर परत जा", "continue-with": "{{provider}} सह सुरू ठेवा", + "redirecting-to-provider": "{{provider}} कडे पाठवत आहे…", + "signing-in": "साइन इन करत आहे…", "create-admin-account": "प्रशासक खाते तयार करा", "setup-description": "या इन्स्टन्ससाठी प्रशासक खाते तयार करा.", "setup-title": "तुमचा इन्स्टन्स सेट अप करा", @@ -163,6 +165,9 @@ "markdown-mode": "Markdown मोड", "no-changes-detected": "कोणतेही बदल आढळले नाहीत", "save": "जतन", + "saving": "जतन करत आहे…", + "updating": "अद्ययावत करत आहे…", + "commenting": "टिप्पणी पाठवत आहे…", "insert-menu": { "add-location": "स्थान जोडा", "link-memo": "लिंक मेमो", @@ -256,7 +261,6 @@ "footnotes": "तळटीपा", "back-to-reference": "संदर्भाकडे परत जा", "new-memo": "नवीन मेमो", - "saved": "जतन केले", "validation": { "cannot-save": "जतन करू शकत नाही", "content-required": "सामग्री, संलग्नक किंवा फाईल आवश्यक आहे", diff --git a/web/src/locales/nb.json b/web/src/locales/nb.json index 58d9032ef..691f65972 100644 --- a/web/src/locales/nb.json +++ b/web/src/locales/nb.json @@ -33,6 +33,8 @@ "admin-sign-in": "Administratorpålogging", "back-to-sign-in": "Tilbake til pålogging", "continue-with": "Fortsett med {{provider}}", + "redirecting-to-provider": "Videresender til {{provider}}…", + "signing-in": "Logger inn…", "create-admin-account": "Opprett administratorkonto", "setup-description": "Opprett administratorkontoen for denne instansen.", "setup-title": "Konfigurer instansen din", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Ingen endringer oppdaget", "save": "Lagre", + "saving": "Lagrer…", + "updating": "Oppdaterer…", + "commenting": "Sender kommentar…", "audio-recorder": { "attachment-label": "Lydopptak", "attachment-label-with-time": "Lydopptak {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Fotnoter", "back-to-reference": "Tilbake til referansen", "new-memo": "Nytt notat", - "saved": "Lagret", "validation": { "cannot-save": "Kan ikke lagre", "content-required": "Innhold, vedlegg eller fil kreves", diff --git a/web/src/locales/nl.json b/web/src/locales/nl.json index 959a07188..4f6f167c6 100644 --- a/web/src/locales/nl.json +++ b/web/src/locales/nl.json @@ -33,6 +33,8 @@ "admin-sign-in": "Aanmelden als beheerder", "back-to-sign-in": "Terug naar aanmelden", "continue-with": "Doorgaan met {{provider}}", + "redirecting-to-provider": "Doorsturen naar {{provider}}…", + "signing-in": "Bezig met aanmelden…", "create-admin-account": "Beheerdersaccount aanmaken", "setup-description": "Maak het beheerdersaccount voor deze instantie aan.", "setup-title": "Stel uw instantie in", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Geen wijzigingen gedetecteerd", "save": "Opslaan", + "saving": "Bezig met opslaan…", + "updating": "Bezig met bijwerken…", + "commenting": "Reactie wordt verzonden…", "audio-recorder": { "attachment-label": "Audio-opname", "attachment-label-with-time": "Audio-opname {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Voetnoten", "back-to-reference": "Terug naar de verwijzing", "new-memo": "Nieuwe memo", - "saved": "Opgeslagen", "validation": { "cannot-save": "Kan niet opslaan", "content-required": "Inhoud, bijlage of bestand vereist", diff --git a/web/src/locales/nn.json b/web/src/locales/nn.json index 2e77373c3..6ddb3b8d5 100644 --- a/web/src/locales/nn.json +++ b/web/src/locales/nn.json @@ -91,6 +91,8 @@ "back-to-sign-in": "Attende til innlogging", "callback-failed-title": "Kunne ikkje fullføre innlogginga", "continue-with": "Hald fram med {{provider}}", + "redirecting-to-provider": "Vidaresender til {{provider}}…", + "signing-in": "Loggar inn…", "create-admin-account": "Opprett administratorkonto", "create-your-account": "Opprett kontoen din", "hide-password": "Skjul passord", @@ -331,7 +333,9 @@ "new-memo": "Nytt notat", "no-changes-detected": "Ingen endringar funne", "save": "Lagre", - "saved": "Lagra", + "saving": "Lagrar…", + "updating": "Oppdaterer…", + "commenting": "Sender kommentar…", "suggestions": "Framlegg", "validation": { "cannot-save": "Kan ikkje lagre", diff --git a/web/src/locales/pl.json b/web/src/locales/pl.json index bcd30c7f4..de4fa5d26 100644 --- a/web/src/locales/pl.json +++ b/web/src/locales/pl.json @@ -33,6 +33,8 @@ "admin-sign-in": "Logowanie administratora", "back-to-sign-in": "Powrót do logowania", "continue-with": "Kontynuuj z {{provider}}", + "redirecting-to-provider": "Przekierowywanie do {{provider}}…", + "signing-in": "Logowanie…", "create-admin-account": "Utwórz konto administratora", "setup-description": "Utwórz konto administratora dla tej instancji.", "setup-title": "Skonfiguruj swoją instancję", @@ -236,6 +238,9 @@ }, "no-changes-detected": "Brak wykrytych zmian", "save": "Zapisz", + "saving": "Zapisywanie…", + "updating": "Aktualizowanie…", + "commenting": "Wysyłanie komentarza…", "audio-recorder": { "attachment-label": "Nagrywanie dźwięku", "attachment-label-with-time": "Nagranie dźwięku {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Przypisy", "back-to-reference": "Wróć do odniesienia", "new-memo": "Nowa notatka", - "saved": "Zapisano", "validation": { "cannot-save": "Nie można zapisać", "content-required": "Wymagana treść, załącznik lub plik", diff --git a/web/src/locales/pt-BR.json b/web/src/locales/pt-BR.json index 615edd39b..b68900909 100644 --- a/web/src/locales/pt-BR.json +++ b/web/src/locales/pt-BR.json @@ -33,6 +33,8 @@ "admin-sign-in": "Login de administrador", "back-to-sign-in": "Voltar para fazer login", "continue-with": "Continuar com {{provider}}", + "redirecting-to-provider": "Redirecionando para {{provider}}…", + "signing-in": "Entrando…", "create-admin-account": "Criar conta de administrador", "setup-description": "Criar a conta de administrador para esta instância.", "setup-title": "Configurar sua instância", @@ -163,6 +165,9 @@ "markdown-mode": "Modo Markdown", "no-changes-detected": "Nenhuma alteração detectada", "save": "Salvar", + "saving": "Salvando…", + "updating": "Atualizando…", + "commenting": "Enviando comentário…", "insert-menu": { "add-location": "Adicionar local", "link-memo": "Vincular memorando", @@ -256,7 +261,6 @@ "footnotes": "Notas de rodapé", "back-to-reference": "Voltar à referência", "new-memo": "Novo memorando", - "saved": "Salvo", "validation": { "cannot-save": "Não é possível salvar", "content-required": "Conteúdo, anexo ou arquivo necessário", diff --git a/web/src/locales/pt-PT.json b/web/src/locales/pt-PT.json index 385e497ef..768bc5d0a 100644 --- a/web/src/locales/pt-PT.json +++ b/web/src/locales/pt-PT.json @@ -33,6 +33,8 @@ "admin-sign-in": "Login de administrador", "back-to-sign-in": "Voltar para iniciar sessão", "continue-with": "Continuar com {{provider}}", + "redirecting-to-provider": "A redirecionar para {{provider}}…", + "signing-in": "A iniciar sessão…", "create-admin-account": "Criar conta de administrador", "setup-description": "Criar a conta de administrador para esta instância.", "setup-title": "Configurar a sua instância", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Nenhuma alteração detetada", "save": "Guardar", + "saving": "A guardar…", + "updating": "A atualizar…", + "commenting": "A enviar comentário…", "audio-recorder": { "attachment-label": "Gravação de áudio", "attachment-label-with-time": "Gravação de áudio {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Notas de rodapé", "back-to-reference": "Voltar à referência", "new-memo": "Novo memorando", - "saved": "Salvo", "validation": { "cannot-save": "Não é possível guardar", "content-required": "Conteúdo, anexo ou ficheiro necessário", diff --git a/web/src/locales/ro.json b/web/src/locales/ro.json index c1abad572..f08386dcc 100644 --- a/web/src/locales/ro.json +++ b/web/src/locales/ro.json @@ -33,6 +33,8 @@ "admin-sign-in": "Conectare administrator", "back-to-sign-in": "Înapoi la conectare", "continue-with": "Continuați cu {{provider}}", + "redirecting-to-provider": "Redirecționare către {{provider}}…", + "signing-in": "Autentificare…", "create-admin-account": "Creați cont de administrator", "setup-description": "Creați contul de administrator pentru această instanță.", "setup-title": "Configurați instanța", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Nu au fost detectate modificări", "save": "Salva", + "saving": "Se salvează…", + "updating": "Se actualizează…", + "commenting": "Se trimite comentariul…", "audio-recorder": { "attachment-label": "Înregistrare audio", "attachment-label-with-time": "Înregistrare audio {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Note de subsol", "back-to-reference": "Înapoi la referință", "new-memo": "Memo nou", - "saved": "Salvat", "validation": { "cannot-save": "Nu se poate salva", "content-required": "Este necesar conținut, atașament sau fișier", diff --git a/web/src/locales/ru.json b/web/src/locales/ru.json index a01b2bdc4..3d49ba687 100644 --- a/web/src/locales/ru.json +++ b/web/src/locales/ru.json @@ -33,6 +33,8 @@ "admin-sign-in": "Вход для администратора", "back-to-sign-in": "Назад ко входу", "continue-with": "Продолжить через {{provider}}", + "redirecting-to-provider": "Перенаправление в {{provider}}…", + "signing-in": "Вход…", "create-admin-account": "Создать учётную запись администратора", "setup-description": "Создайте учётную запись администратора этого сервера.", "setup-title": "Настройка сервера", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Изменений не обнаружено", "save": "Сохранить", + "saving": "Сохранение…", + "updating": "Обновление…", + "commenting": "Отправка комментария…", "audio-recorder": { "attachment-label": "Аудиозапись", "attachment-label-with-time": "Аудиозапись {{time}}", @@ -266,7 +271,6 @@ "footnotes": "Примечания", "back-to-reference": "Назад к ссылке", "new-memo": "Новая заметка", - "saved": "Сохранено", "blocks": { "task": "Задача", "quote": "Цитата", diff --git a/web/src/locales/sk.json b/web/src/locales/sk.json index 52b6c8c19..dc6643c7f 100644 --- a/web/src/locales/sk.json +++ b/web/src/locales/sk.json @@ -33,6 +33,8 @@ "admin-sign-in": "Prihlásenie správcu", "back-to-sign-in": "Späť na prihlásenie", "continue-with": "Pokračovať s {{provider}}", + "redirecting-to-provider": "Presmerovanie na {{provider}}…", + "signing-in": "Prihlasovanie…", "create-admin-account": "Vytvoriť administrátorský účet", "setup-description": "Vytvoriť administrátorský účet pre túto inštanciu.", "setup-title": "Nastavte si inštanciu", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Nezistili sa žiadne zmeny", "save": "Uložiť", + "saving": "Ukladanie…", + "updating": "Aktualizácia…", + "commenting": "Odosielanie komentára…", "audio-recorder": { "attachment-label": "Zvukový záznam", "attachment-label-with-time": "Záznam zvuku {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Poznámky pod čiarou", "back-to-reference": "Späť na odkaz", "new-memo": "Nová poznámka", - "saved": "Uložené", "validation": { "cannot-save": "Nedá sa uložiť", "content-required": "Vyžaduje sa obsah, príloha alebo súbor", diff --git a/web/src/locales/sl.json b/web/src/locales/sl.json index 32ba8c264..7609ee6a0 100644 --- a/web/src/locales/sl.json +++ b/web/src/locales/sl.json @@ -33,6 +33,8 @@ "admin-sign-in": "Prijava skrbnika", "back-to-sign-in": "Nazaj na prijavo", "continue-with": "Nadaljuj z {{provider}}", + "redirecting-to-provider": "Preusmerjanje na {{provider}}…", + "signing-in": "Prijavljanje…", "create-admin-account": "Ustvari skrbniški račun", "setup-description": "Ustvari skrbniški račun za ta primerek.", "setup-title": "Nastavi svoj primerek", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Ni zaznanih sprememb", "save": "Shrani", + "saving": "Shranjevanje…", + "updating": "Posodabljanje…", + "commenting": "Pošiljanje komentarja…", "audio-recorder": { "attachment-label": "Zvočni posnetek", "attachment-label-with-time": "Zvočni posnetek {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Opombe", "back-to-reference": "Nazaj na sklic", "new-memo": "Nov zapisek", - "saved": "Shranjeno", "validation": { "cannot-save": "Shranjevanje ni mogoče", "content-required": "Zahtevana je vsebina, priloga ali datoteka", diff --git a/web/src/locales/sr.json b/web/src/locales/sr.json index eb60d968b..c691f1394 100644 --- a/web/src/locales/sr.json +++ b/web/src/locales/sr.json @@ -33,6 +33,8 @@ "admin-sign-in": "Пријава администратора", "back-to-sign-in": "Назад на пријаву", "continue-with": "Наставите са {{provider}}", + "redirecting-to-provider": "Преусмеравање на {{provider}}…", + "signing-in": "Пријављивање…", "create-admin-account": "Креирајте администраторски налог", "setup-description": "Креирајте администраторски налог за ову инстанцу.", "setup-title": "Подесите своју инстанцу", @@ -259,6 +261,9 @@ }, "no-changes-detected": "Нису откривене промене", "save": "Сачувај", + "saving": "Чување…", + "updating": "Ажурирање…", + "commenting": "Слање коментара…", "audio-recorder": { "attachment-label": "Аудио снимак", "attachment-label-with-time": "Аудио запис {{time}}", @@ -294,7 +299,6 @@ "footnotes": "Фусноте", "back-to-reference": "Назад на референцу", "new-memo": "Нова белешка", - "saved": "Сачувано", "validation": { "cannot-save": "Не могу да сачувам", "content-required": "Потребан је садржај, прилог или датотека", diff --git a/web/src/locales/sv.json b/web/src/locales/sv.json index 75a740a4b..910d8727d 100644 --- a/web/src/locales/sv.json +++ b/web/src/locales/sv.json @@ -33,6 +33,8 @@ "admin-sign-in": "Administratörsinloggning", "back-to-sign-in": "Tillbaka till inloggning", "continue-with": "Fortsätt med {{provider}}", + "redirecting-to-provider": "Omdirigerar till {{provider}}…", + "signing-in": "Loggar in…", "create-admin-account": "Skapa administratörskonto", "setup-description": "Skapa administratörskontot för den här instansen.", "setup-title": "Konfigurera din instans", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Inga ändringar upptäckta", "save": "Spara", + "saving": "Sparar…", + "updating": "Uppdaterar…", + "commenting": "Skickar kommentar…", "audio-recorder": { "attachment-label": "Ljudinspelning", "attachment-label-with-time": "Ljudinspelning {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Fotnoter", "back-to-reference": "Tillbaka till referensen", "new-memo": "Nytt memo", - "saved": "Sparat", "validation": { "cannot-save": "Kan inte spara", "content-required": "Innehåll, bilaga eller fil krävs", diff --git a/web/src/locales/th.json b/web/src/locales/th.json index bd94bdc6c..459bc42d3 100644 --- a/web/src/locales/th.json +++ b/web/src/locales/th.json @@ -33,6 +33,8 @@ "admin-sign-in": "เข้าสู่ระบบผู้ดูแลระบบ", "back-to-sign-in": "กลับไปที่หน้าเข้าสู่ระบบ", "continue-with": "ดำเนินการต่อด้วย {{provider}}", + "redirecting-to-provider": "กำลังเปลี่ยนเส้นทางไปยัง {{provider}}…", + "signing-in": "กำลังเข้าสู่ระบบ…", "create-admin-account": "สร้างบัญชีผู้ดูแลระบบ", "setup-description": "สร้างบัญชีผู้ดูแลระบบสำหรับอินสแตนซ์นี้", "setup-title": "ตั้งค่าอินสแตนซ์ของคุณ", @@ -163,6 +165,9 @@ "markdown-mode": "โหมด Markdown", "no-changes-detected": "ไม่มีการเปลี่ยนแปลง", "save": "บันทึก", + "saving": "กำลังบันทึก…", + "updating": "กำลังอัปเดต…", + "commenting": "กำลังส่งความคิดเห็น…", "insert-menu": { "add-location": "เพิ่มสถานที่", "link-memo": "บันทึกการเชื่อมโยง", @@ -256,7 +261,6 @@ "footnotes": "เชิงอรรถ", "back-to-reference": "กลับไปยังการอ้างอิง", "new-memo": "บันทึกใหม่", - "saved": "บันทึกแล้ว", "validation": { "cannot-save": "ไม่สามารถบันทึกได้", "content-required": "ต้องมีเนื้อหา ไฟล์แนบ หรือไฟล์", diff --git a/web/src/locales/tr.json b/web/src/locales/tr.json index 81109cf96..8d9ecd65e 100644 --- a/web/src/locales/tr.json +++ b/web/src/locales/tr.json @@ -48,6 +48,8 @@ "back-to-sign-in": "Giriş ekranına dön", "callback-failed-title": "Giriş tamamlanamadı", "continue-with": "{{provider}} ile devam et", + "redirecting-to-provider": "{{provider}} sağlayıcısına yönlendiriliyor…", + "signing-in": "Giriş yapılıyor…", "create-admin-account": "Yönetici hesabı oluştur", "create-your-account": "Hesabını oluştur", "hide-password": "Şifreyi gizle", @@ -271,7 +273,9 @@ "new-memo": "Yeni not", "no-changes-detected": "Herhangi bir değişiklik yok", "save": "Kaydet", - "saved": "Kaydedildi", + "saving": "Kaydediliyor…", + "updating": "Güncelleniyor…", + "commenting": "Yorum gönderiliyor…", "validation": { "cannot-save": "Kaydedilemiyor", "content-required": "İçerik, ek veya dosya girmelisin", diff --git a/web/src/locales/uk.json b/web/src/locales/uk.json index 74e3f52af..e2348525e 100644 --- a/web/src/locales/uk.json +++ b/web/src/locales/uk.json @@ -33,6 +33,8 @@ "admin-sign-in": "Вхід адміністратора", "back-to-sign-in": "Повернутися до входу", "continue-with": "Продовжити з {{provider}}", + "redirecting-to-provider": "Перенаправлення до {{provider}}…", + "signing-in": "Вхід…", "create-admin-account": "Створити обліковий запис адміністратора", "setup-description": "Створити обліковий запис адміністратора для цього екземпляра.", "setup-title": "Налаштувати екземпляр", @@ -221,6 +223,9 @@ }, "no-changes-detected": "Змін не виявлено", "save": "Зберегти", + "saving": "Збереження…", + "updating": "Оновлення…", + "commenting": "Надсилання коментаря…", "audio-recorder": { "attachment-label": "Аудіозапис", "attachment-label-with-time": "Аудіозапис {{time}}", @@ -256,7 +261,6 @@ "footnotes": "Примітки", "back-to-reference": "Назад до посилання", "new-memo": "Нова нотатка", - "saved": "Збережено", "validation": { "cannot-save": "Не вдається зберегти", "content-required": "Потрібен контент, вкладення або файл", diff --git a/web/src/locales/vi.json b/web/src/locales/vi.json index 080fdb32f..35953767d 100644 --- a/web/src/locales/vi.json +++ b/web/src/locales/vi.json @@ -33,6 +33,8 @@ "admin-sign-in": "Đăng nhập quản trị viên", "back-to-sign-in": "Quay lại trang đăng nhập", "continue-with": "Tiếp tục với {{provider}}", + "redirecting-to-provider": "Đang chuyển hướng đến {{provider}}…", + "signing-in": "Đang đăng nhập…", "create-admin-account": "Tạo tài khoản quản trị viên", "setup-description": "Tạo tài khoản quản trị viên cho phiên bản này.", "setup-title": "Thiết lập phiên bản của bạn", @@ -163,6 +165,9 @@ "markdown-mode": "Chế độ Markdown", "no-changes-detected": "Không phát hiện thay đổi", "save": "Lưu", + "saving": "Đang lưu…", + "updating": "Đang cập nhật…", + "commenting": "Đang gửi bình luận…", "insert-menu": { "add-location": "Thêm vị trí", "link-memo": "Liên kết bản ghi nhớ", @@ -256,7 +261,6 @@ "footnotes": "Chú thích", "back-to-reference": "Quay lại tham chiếu", "new-memo": "Ghi chú mới", - "saved": "Đã lưu", "validation": { "cannot-save": "Không thể lưu", "content-required": "Cần nội dung, tệp đính kèm hoặc tệp tin", diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.json index 3c6ae8742..525fa00e5 100644 --- a/web/src/locales/zh-Hans.json +++ b/web/src/locales/zh-Hans.json @@ -48,6 +48,8 @@ "back-to-sign-in": "返回登录", "callback-failed-title": "无法完成登录", "continue-with": "使用 {{provider}} 继续", + "redirecting-to-provider": "正在跳转至 {{provider}}…", + "signing-in": "正在登录…", "create-admin-account": "创建管理员账号", "create-your-account": "创建您的账户", "hide-password": "隐藏密码", @@ -215,6 +217,9 @@ "new-memo": "新建备忘录", "no-changes-detected": "未检测到更改", "save": "保存", + "saving": "正在保存…", + "updating": "正在更新…", + "commenting": "正在发送评论…", "validation": { "cannot-save": "无法保存", "content-required": "需要填写正文或添加附件", @@ -302,7 +307,6 @@ "comment": "评论", "footnotes": "脚注", "back-to-reference": "返回引用处", - "saved": "已保存", "blocks": { "task": "任务", "quote": "引用", diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json index 1c70f4a38..8a0a8a671 100644 --- a/web/src/locales/zh-Hant.json +++ b/web/src/locales/zh-Hant.json @@ -25,6 +25,8 @@ "back-to-sign-in": "返回登入", "callback-failed-title": "無法完成登入", "continue-with": "使用 {{provider}} 繼續", + "redirecting-to-provider": "正在跳轉至 {{provider}}…", + "signing-in": "正在登入…", "create-admin-account": "建立管理員帳號", "create-your-account": "建立您的帳號", "hide-password": "隱藏密碼", @@ -316,6 +318,9 @@ "new-memo": "新增備忘錄", "no-changes-detected": "未發現變更", "save": "儲存", + "saving": "正在儲存…", + "updating": "正在更新…", + "commenting": "正在傳送評論…", "validation": { "cannot-save": "無法儲存", "content-required": "需要填寫正文或新增附件", @@ -345,7 +350,6 @@ "comment": "評論", "footnotes": "腳註", "back-to-reference": "返回引用處", - "saved": "已儲存", "blocks": { "task": "任務", "quote": "引用", diff --git a/web/tests/drawing-sheet.test.tsx b/web/tests/drawing-sheet.test.tsx index 02d1094c8..7b476d1ad 100644 --- a/web/tests/drawing-sheet.test.tsx +++ b/web/tests/drawing-sheet.test.tsx @@ -201,13 +201,16 @@ describe("DrawingSheet", () => { const onDone = vi.fn(); render(); - const done = screen.getByRole("button", { name: "editor.blocks.loading" }); + const done = screen.getByRole("button", { name: "common.add" }); + expect(done).toHaveAccessibleDescription("editor.blocks.loading"); + expect(done).toHaveTextContent("common.add"); await waitFor(() => expect(handle.insertImage).toHaveBeenCalled()); expect(done).toHaveAttribute("aria-disabled", "true"); expect(screen.getByRole("img").parentElement).toHaveAttribute("aria-busy", "true"); finishInsert("image1"); await waitFor(() => expect(screen.getByRole("button", { name: "common.add" })).not.toHaveAttribute("aria-disabled")); + expect(done).not.toHaveAttribute("aria-description"); expect(screen.getByRole("img").parentElement).not.toHaveAttribute("aria-busy"); }); diff --git a/web/tests/editor-commit-button.test.tsx b/web/tests/editor-commit-button.test.tsx index 7fa5d83c7..b4ddfca0b 100644 --- a/web/tests/editor-commit-button.test.tsx +++ b/web/tests/editor-commit-button.test.tsx @@ -1,6 +1,6 @@ import { act, fireEvent, render, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; -import { createInitialState, EditorProvider, useEditorContext } from "@/components/MemoEditor/edit/state"; +import { createInitialState, EditorProvider, type EditorState, useEditorContext } from "@/components/MemoEditor/edit/state"; import { EditorToolbar } from "@/components/MemoEditor/edit/Toolbar/EditorToolbar"; vi.mock("@/components/MemoEditor/edit/Toolbar/InsertMenu", () => ({ default: () => null })); @@ -8,13 +8,20 @@ vi.mock("@/components/MemoEditor/edit/Toolbar/AudienceMenu", () => ({ default: ( vi.mock("@/utils/i18n", () => ({ useTranslate: () => (key: string) => key })); let dispatchSaving: ((saving: boolean) => void) | undefined; +let dispatchContent: ((content: string) => void) | undefined; +let dispatchDrawingError: ((error: EditorState["drawingSaveError"]) => void) | undefined; +const onSave = vi.fn(); -const Toolbar = () => { +const Toolbar = ({ memoName, parentMemoName }: { memoName?: string; parentMemoName?: string }) => { const { actions, dispatch } = useEditorContext(); dispatchSaving = (saving) => dispatch(actions.setLoading("saving", saving)); + dispatchContent = (content) => dispatch(actions.updateContent(content)); + dispatchDrawingError = (error) => dispatch(actions.setDrawingSaveError(error)); return ( { ); }; -const renderToolbar = (content: string) => { +const renderToolbar = (content: string, props: { memoName?: string; parentMemoName?: string } = {}) => { const initial = createInitialState(); initial.content = content; render( - + , ); }; @@ -54,14 +61,87 @@ describe("EditorToolbar commit button", () => { expect(tooltip.querySelector(".mu-tooltip-shortcut")).toHaveTextContent("Enter"); }); - it("keeps the same button mounted while saving", () => { + it("keeps the same button, label and spinner slot while saving", async () => { renderToolbar("A thought"); const button = screen.getByRole("button", { name: "editor.save" }); + const label = button.querySelector(".mu-button-label"); + const slot = button.querySelector(".mu-button-loading-slot"); + expect(slot).not.toBeNull(); act(() => dispatchSaving?.(true)); - expect(screen.getByRole("button")).toBe(button); + expect(screen.getByRole("button", { name: "editor.save" })).toBe(button); expect(button).toHaveAttribute("aria-busy", "true"); expect(button).toHaveAttribute("aria-disabled", "true"); + expect(button).toHaveAccessibleDescription("editor.saving"); + await waitFor(() => expect(button.querySelector(".mu-spinner")).toBe(slot)); + expect(button.querySelector(".mu-button-label")).toBe(label); + expect(label).toHaveTextContent("editor.save"); + + act(() => dispatchSaving?.(false)); + + expect(screen.getByRole("button", { name: "editor.save" })).toBe(button); + expect(button.querySelector(".mu-button-loading-slot")).toBe(slot); + expect(button.querySelector(".mu-spinner")).toBeNull(); + expect(button).not.toHaveAttribute("aria-busy"); + }); + + it("keeps the button, label, slot and keyboard focus when validation changes", () => { + renderToolbar(""); + const button = screen.getByRole("button", { name: "editor.save" }); + const label = button.querySelector(".mu-button-label"); + const slot = button.querySelector(".mu-button-loading-slot"); + expect(slot).not.toBeNull(); + expect(button).toHaveAttribute("aria-disabled", "true"); + expect(button).toHaveAccessibleDescription("editor.validation.content-required"); + act(() => button.focus()); + fireEvent.click(button); + expect(onSave).not.toHaveBeenCalled(); + + act(() => dispatchContent?.("A thought")); + expect(screen.getByRole("button", { name: "editor.save" })).toBe(button); + expect(button).not.toHaveAttribute("aria-disabled", "true"); + expect(button.querySelector(".mu-button-label")).toBe(label); + expect(button.querySelector(".mu-button-loading-slot")).toBe(slot); + expect(button).toHaveFocus(); + fireEvent.click(button); + expect(onSave).toHaveBeenCalledOnce(); + + act(() => dispatchContent?.("")); + expect(screen.getByRole("button", { name: "editor.save" })).toBe(button); + expect(button).toHaveAttribute("aria-disabled", "true"); + expect(button.querySelector(".mu-button-loading-slot")).toBe(slot); + expect(button).toHaveFocus(); + }); + + it.each([ + { props: {}, label: "editor.save", description: "editor.saving" }, + { props: { memoName: "memos/existing" }, label: "common.update", description: "editor.updating" }, + { props: { parentMemoName: "memos/parent" }, label: "editor.comment", description: "editor.commenting" }, + ])("keeps $label as the name while describing the pending action", ({ props, label, description }) => { + renderToolbar("A thought", props); + const button = screen.getByRole("button", { name: label }); + act(() => dispatchSaving?.(true)); + expect(button).toHaveAccessibleName(label); + expect(button).toHaveAccessibleDescription(description); + fireEvent.click(button); + expect(onSave).not.toHaveBeenCalled(); + }); + + it("uses the leading slot for drawing failures without replacing the button or label", async () => { + renderToolbar("A thought"); + const button = screen.getByRole("button", { name: "editor.save" }); + const label = button.querySelector(".mu-button-label"); + act(() => button.focus()); + act(() => dispatchDrawingError?.("editor.drawing.saved-needs-update")); + expect(button.firstElementChild?.tagName.toLowerCase()).toBe("svg"); + expect(button.querySelector(".mu-button-label")).toBe(label); + act(() => dispatchSaving?.(true)); + await waitFor(() => expect(button.firstElementChild).toHaveClass("mu-spinner")); + act(() => dispatchSaving?.(false)); + expect(screen.getByRole("button", { name: "editor.save" })).toBe(button); + expect(button.firstElementChild?.tagName.toLowerCase()).toBe("svg"); + expect(button.querySelector(".mu-button-label")).toBe(label); + expect(button).toHaveFocus(); }); }); diff --git a/web/tests/memo-editor-upload-retry.test.tsx b/web/tests/memo-editor-upload-retry.test.tsx index f7b146fb4..a89fbf88a 100644 --- a/web/tests/memo-editor-upload-retry.test.tsx +++ b/web/tests/memo-editor-upload-retry.test.tsx @@ -35,7 +35,6 @@ vi.mock("@/components/MemoEditor/edit/state", () => ({ actions: { reset: () => ({ type: "reset" }), setLoading: () => ({ type: "noop" }), - setJustSaved: () => ({ type: "noop" }), setMetadata: (metadata: Partial) => ({ type: "set-metadata", metadata }), setLocalFiles: (localFiles: LocalFile[]) => ({ type: "set-local-files", localFiles }), setAttachmentOrder: (attachmentOrder: string[]) => ({ type: "set-attachment-order", attachmentOrder }), diff --git a/web/tests/password-sign-in-form.test.tsx b/web/tests/password-sign-in-form.test.tsx index 757ffdf44..94bf4e708 100644 --- a/web/tests/password-sign-in-form.test.tsx +++ b/web/tests/password-sign-in-form.test.tsx @@ -1,9 +1,11 @@ import { Code, ConnectError } from "@connectrpc/connect"; -import { fireEvent, render, screen } from "@testing-library/react"; +import { act, fireEvent, render, screen, waitFor } from "@testing-library/react"; import { beforeEach, describe, expect, it, vi } from "vitest"; import PasswordSignInForm from "@/components/PasswordSignInForm"; const signIn = vi.hoisted(() => vi.fn()); +const initialize = vi.hoisted(() => vi.fn()); +const navigateTo = vi.hoisted(() => vi.fn()); vi.mock("@/auth-state", () => ({ setAccessToken: vi.fn() })); @@ -12,7 +14,7 @@ vi.mock("@/connect", () => ({ })); vi.mock("@/contexts/AuthContext", () => ({ - useAuth: () => ({ initialize: vi.fn() }), + useAuth: () => ({ initialize }), })); // The challenge widget reads the instance profile; no challenge is configured here. @@ -21,7 +23,7 @@ vi.mock("@/contexts/InstanceContext", () => ({ })); vi.mock("@/hooks/useNavigateTo", () => ({ - default: () => vi.fn(), + default: () => navigateTo, })); vi.mock("@/utils/i18n", () => ({ @@ -38,6 +40,7 @@ const fill = () => { describe("", () => { beforeEach(() => { signIn.mockReset(); + initialize.mockResolvedValue(undefined); vi.spyOn(console, "error").mockImplementation(() => {}); }); @@ -81,4 +84,58 @@ describe("", () => { fireEvent.click(screen.getByRole("button", { name: "auth.hide-password" })); expect(password).toHaveAttribute("type", "password"); }); + + it("keeps the login label and focus while signing in and initializing the session", async () => { + let finishSignIn!: () => void; + let finishInitialize!: () => void; + signIn.mockReturnValue(new Promise((resolve) => (finishSignIn = () => resolve({})))); + initialize.mockReturnValue(new Promise((resolve) => (finishInitialize = resolve))); + render(); + const button = screen.getByRole("button", { name: "common.sign-in" }); + const slot = button.querySelector(".mu-button-loading-slot"); + expect(slot).not.toBeNull(); + act(() => button.focus()); + + fill(); + fireEvent.submit(button.closest("form")!); + + expect(signIn).toHaveBeenCalledOnce(); + expect(button).toHaveAccessibleName("common.sign-in"); + expect(button).toHaveAccessibleDescription("auth.signing-in"); + expect(button).toHaveAttribute("aria-disabled", "true"); + expect(screen.getByLabelText("common.username")).toHaveAttribute("readonly"); + expect(screen.getByLabelText("common.password")).toHaveAttribute("readonly"); + await waitFor(() => expect(button.querySelector(".mu-spinner")).toBe(slot)); + expect(button).toHaveTextContent("common.sign-in"); + expect(button).toHaveFocus(); + + await act(async () => finishSignIn()); + expect(initialize).toHaveBeenCalledOnce(); + expect(navigateTo).not.toHaveBeenCalled(); + expect(button).toHaveAttribute("aria-busy", "true"); + + await act(async () => finishInitialize()); + expect(navigateTo).toHaveBeenCalledWith("/memos/example", { replace: true }); + }); + + it("restores the same login button after failure and allows retry", async () => { + signIn.mockRejectedValueOnce(new ConnectError("offline", Code.Unavailable)); + render(); + const button = screen.getByRole("button", { name: "common.sign-in" }); + const slot = button.querySelector(".mu-button-loading-slot"); + + fill(); + + await screen.findByRole("alert"); + expect(screen.getByRole("button", { name: "common.sign-in" })).toBe(button); + expect(button).not.toHaveAttribute("aria-busy"); + expect(button).not.toHaveAttribute("aria-description"); + expect(button.querySelector(".mu-button-loading-slot")).toBe(slot); + expect(screen.getByLabelText("common.password")).not.toHaveAttribute("readonly"); + + signIn.mockResolvedValueOnce({}); + fill(); + await waitFor(() => expect(navigateTo).toHaveBeenCalledOnce()); + expect(signIn).toHaveBeenCalledTimes(2); + }); }); diff --git a/web/tests/sso-auth-pages.test.tsx b/web/tests/sso-auth-pages.test.tsx index 5c07eb39b..23c8fdac1 100644 --- a/web/tests/sso-auth-pages.test.tsx +++ b/web/tests/sso-auth-pages.test.tsx @@ -86,6 +86,7 @@ describe("automatic SSO auth pages", () => { const button = screen.getByRole("button", { name: "auth.continue-with: Company SSO" }); expect(button).toHaveAttribute("aria-disabled", "true"); expect(button).toHaveAttribute("aria-busy", "true"); + expect(button).toHaveAccessibleDescription("auth.redirecting-to-provider: Company SSO"); await waitFor(() => expect(button.querySelector(".mu-spinner")).toBeInTheDocument()); expect(screen.queryByText("auth.redirecting-to-provider: Company SSO")).not.toBeInTheDocument(); }); @@ -177,25 +178,35 @@ describe("automatic SSO auth pages", () => { expect(signInWithSSO).toHaveBeenCalledWith(provider, "/memos/example"); expect(screen.getByRole("button", { name: "auth.continue-with: Company SSO" })).toHaveAttribute("aria-busy", "true"); }); - it("shows loading only on the selected provider while preventing duplicate attempts", () => { + it("keeps provider names visible while loading only the selected provider and preventing duplicate attempts", async () => { const otherProvider = create(IdentityProviderSchema, { ...provider, name: "identityProviders/other", title: "Other SSO" }); renderPage("/auth", ); const button = screen.getByRole("button", { name: "auth.continue-with: Company SSO" }); const otherButton = screen.getByRole("button", { name: "auth.continue-with: Other SSO" }); + const slot = button.querySelector(".mu-button-loading-slot"); + expect(slot).not.toBeNull(); + act(() => button.focus()); + fireEvent.click(button); fireEvent.click(button); expect(button).toHaveAttribute("aria-busy", "true"); + expect(button).toHaveAccessibleName("auth.continue-with: Company SSO"); + expect(button).toHaveAccessibleDescription("auth.redirecting-to-provider: Company SSO"); expect(otherButton).not.toHaveAttribute("aria-busy"); expect(otherButton.querySelector(".mu-spinner")).not.toBeInTheDocument(); expect(otherButton).toBeDisabled(); fireEvent.click(otherButton); expect(signInWithSSO).toHaveBeenCalledOnce(); + await waitFor(() => expect(button.querySelector(".mu-spinner")).toBe(slot)); + expect(button).toHaveTextContent("auth.continue-with: Company SSO"); + expect(button).toHaveFocus(); }); it("returns to manual controls after initiation fails without automatically retrying", async () => { vi.mocked(signInWithSSO).mockRejectedValueOnce(new Error("Storage unavailable")); renderPage(); const button = await screen.findByRole("button", { name: "auth.continue-with: Company SSO" }); - await waitFor(() => expect(button).toBeEnabled()); - expect(button).not.toHaveAttribute("aria-busy"); + await waitFor(() => expect(button).not.toHaveAttribute("aria-busy")); + expect(button).toBeEnabled(); + expect(button).not.toHaveAttribute("aria-description"); expect(button.querySelector(".mu-spinner")).not.toBeInTheDocument(); expect(signInWithSSO).toHaveBeenCalledOnce(); fireEvent.click(button); @@ -209,6 +220,7 @@ describe("automatic SSO auth pages", () => { }); expect(screen.getByRole("button", { name: "auth.continue-with: Company SSO" })).toBeEnabled(); expect(screen.getByRole("button", { name: "auth.continue-with: Company SSO" })).not.toHaveAttribute("aria-busy"); + expect(screen.getByRole("button", { name: "auth.continue-with: Company SSO" })).not.toHaveAttribute("aria-description"); expect(signInWithSSO).toHaveBeenCalledOnce(); }); }); diff --git a/web/tests/use-memo-save.test.tsx b/web/tests/use-memo-save.test.tsx index 7a1e93668..28a9fe8e2 100644 --- a/web/tests/use-memo-save.test.tsx +++ b/web/tests/use-memo-save.test.tsx @@ -12,6 +12,7 @@ const mocks = vi.hoisted(() => ({ createMemoComment: vi.fn(), newMemoName: null as string | null, timestamps: {} as { createTime?: Date; updateTime?: Date }, + saving: false, })); vi.mock("@/connect", () => ({ @@ -29,12 +30,11 @@ vi.mock("@/components/MemoEditor/edit/state", () => ({ actions: { reset: () => ({ type: "reset" }), setLoading: (key: string, value: boolean) => ({ type: "set-loading", key, value }), - setJustSaved: (value: boolean) => ({ type: "set-just-saved", value }), setMetadata: () => ({ type: "set-metadata" }), setTimestamps: () => ({ type: "set-timestamps" }), }, dispatch: mocks.dispatch, - getState: () => ({ ui: { justSaved: false }, timestamps: mocks.timestamps }), + getState: () => ({ ui: { isLoading: { saving: mocks.saving } }, timestamps: mocks.timestamps }), }), })); @@ -53,6 +53,11 @@ describe("useMemoSave", () => { mocks.memoSave.mockReset(); mocks.newMemoName = null; mocks.timestamps = {}; + mocks.saving = false; + mocks.dispatch.mockImplementation((action) => { + if (action.type === "set-loading" && action.key === "saving") mocks.saving = action.value; + if (action.type === "reset") mocks.saving = false; + }); mocks.markNewMemo.mockImplementation((value: string | null | ((current: string | null) => string | null)) => { mocks.newMemoName = typeof value === "function" ? value(mocks.newMemoName) : value; }); @@ -95,21 +100,61 @@ describe("useMemoSave", () => { expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ["memos", "detail", "memos/parent"] }); }); - it("holds a saved confirmation before a closing host resets", async () => { - mocks.memoSave.mockResolvedValue({ hasChanges: true, memoName: "memos/existing" }); + it.each([ + { memoName: "memos/existing" }, + { parentMemoName: "memos/parent" }, + ])("resets and confirms a successful closing save without advancing timers: %o", async (options) => { + vi.useFakeTimers(); + try { + mocks.memoSave.mockResolvedValue({ hasChanges: true, memoName: "memos/saved" }); + const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } }); + const wrapper = ({ children }: PropsWithChildren) => {children}; + const onConfirm = vi.fn(); + const discardDraft = vi.fn(); + const { result } = renderHook(() => useMemoSave({ ...options, discardDraft, onConfirm }), { wrapper }); + + await act(async () => result.current()); + + expect(discardDraft).toHaveBeenCalledOnce(); + expect(mocks.dispatch).toHaveBeenCalledWith({ type: "reset" }); + expect(onConfirm).toHaveBeenCalledWith("memos/saved"); + expect(mocks.saving).toBe(false); + } finally { + vi.useRealTimers(); + } + }); + + it("blocks another save while pending and preserves the draft for a failed save's retry", async () => { + let failSave!: (error: Error) => void; + mocks.memoSave.mockReturnValueOnce(new Promise((_resolve, reject) => (failSave = reject))); + vi.spyOn(console, "error").mockImplementation(() => {}); const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } }); const wrapper = ({ children }: PropsWithChildren) => {children}; const onConfirm = vi.fn(); - const { result } = renderHook(() => useMemoSave({ memoName: "memos/existing", discardDraft: vi.fn(), onConfirm }), { wrapper }); - + const discardDraft = vi.fn(); + const { result } = renderHook(() => useMemoSave({ discardDraft, onConfirm }), { wrapper }); + let pending!: Promise; + act(() => { + pending = result.current(); + }); await act(async () => result.current()); + expect(mocks.memoSave).toHaveBeenCalledOnce(); + expect(mocks.saving).toBe(true); - const types = mocks.dispatch.mock.calls.map(([action]) => action); - const savedOn = types.findIndex((a) => a.type === "set-just-saved" && a.value === true); - const reset = types.findIndex((a) => a.type === "reset"); - expect(savedOn).toBeGreaterThan(-1); - expect(reset).toBeGreaterThan(savedOn); - expect(onConfirm).toHaveBeenCalledWith("memos/existing"); + await act(async () => { + failSave(new Error("offline")); + await pending; + }); + expect(mocks.saving).toBe(false); + expect(discardDraft).not.toHaveBeenCalled(); + expect(onConfirm).not.toHaveBeenCalled(); + expect(mocks.dispatch).not.toHaveBeenCalledWith({ type: "reset" }); + + mocks.memoSave.mockResolvedValueOnce({ hasChanges: true, memoName: "memos/retried" }); + await act(async () => result.current()); + expect(mocks.memoSave).toHaveBeenCalledTimes(2); + expect(onConfirm).toHaveBeenCalledWith("memos/retried"); + expect(discardDraft).toHaveBeenCalledOnce(); }); it("clears the new memo hoist after editing that memo", async () => { @@ -212,11 +257,12 @@ describe("useMemoSave", () => { mocks.memoSave.mockResolvedValue({ hasChanges: true, memoName: "memos/new" }); const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } }); const wrapper = ({ children }: PropsWithChildren) => {children}; - const { result } = renderHook(() => useMemoSave({ discardDraft: vi.fn() }), { wrapper }); + const onConfirm = vi.fn(); + const { result } = renderHook(() => useMemoSave({ discardDraft: vi.fn(), onConfirm }), { wrapper }); await act(async () => result.current()); - const savedOn = mocks.dispatch.mock.calls.some(([action]) => action.type === "set-just-saved" && action.value === true); - expect(savedOn).toBe(false); + expect(mocks.dispatch).toHaveBeenCalledWith({ type: "reset" }); + expect(onConfirm).toHaveBeenCalledWith("memos/new"); }); });