From 28e9c5a6308e8aff5affcaedf4ff35a9d2d53ce7 Mon Sep 17 00:00:00 2001 From: Lukas Sommer Date: Thu, 22 May 2025 11:24:48 +0000 Subject: [PATCH 1/9] Fix URL schemes translation (#4004) --- ftl/core/preferences.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ftl/core/preferences.ftl b/ftl/core/preferences.ftl index 7c75904eb..ce24df434 100644 --- a/ftl/core/preferences.ftl +++ b/ftl/core/preferences.ftl @@ -85,10 +85,10 @@ preferences-third-party-description = Third-party services are unaffiliated with ## URL scheme related preferences-url-schemes = URL Schemes -preferences-url-scheme-prompt = Allowed { preferences-url-schemes } (space-separated): +preferences-url-scheme-prompt = Allowed URL Schemes (space-separated): preferences-url-scheme-warning = Blocked attempt to open `{ $link }`, which may be a security issue. - If you trust the deck author and wish to proceed, you can add `{ $scheme }` to your allowed { preferences-url-schemes }. + If you trust the deck author and wish to proceed, you can add `{ $scheme }` to your allowed URL Schemes. preferences-url-scheme-allow-once = Allow Once preferences-url-scheme-always-allow = Always Allow From 3b7f21e50e5439c7702256dea29080e00939710e Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 22 May 2025 21:25:33 +1000 Subject: [PATCH 2/9] Update translations --- ftl/core-repo | 2 +- ftl/qt-repo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ftl/core-repo b/ftl/core-repo index d2e9201d6..ca04132a8 160000 --- a/ftl/core-repo +++ b/ftl/core-repo @@ -1 +1 @@ -Subproject commit d2e9201d62b906b029570931e9567fe8cf1889b6 +Subproject commit ca04132a8f82296f3e0ea22b74bb4221e1d11d3f diff --git a/ftl/qt-repo b/ftl/qt-repo index 5b855702d..f35acabb4 160000 --- a/ftl/qt-repo +++ b/ftl/qt-repo @@ -1 +1 @@ -Subproject commit 5b855702dfe191e06cc3fbef4b684acc094500ec +Subproject commit f35acabb46dc9197a62c47eb7f2ca062628b1d94 From e989564be24fa635bc0e4b71e80af07eb20d662f Mon Sep 17 00:00:00 2001 From: GithubAnon0000 <160563432+GithubAnon0000@users.noreply.github.com> Date: Thu, 22 May 2025 11:40:13 +0000 Subject: [PATCH 3/9] FIX borken support link (#4019) https://github.com/ankitects/anki/issues/4017 --- qt/aqt/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt/aqt/__init__.py b/qt/aqt/__init__.py index fb9222521..cdbd05ebe 100644 --- a/qt/aqt/__init__.py +++ b/qt/aqt/__init__.py @@ -87,7 +87,7 @@ except AttributeError: appVersion = _version appWebsite = "https://apps.ankiweb.net/" appWebsiteDownloadSection = "https://apps.ankiweb.net/#download" -appDonate = "https://apps.ankiweb.net/support/" +appDonate = "https://docs.ankiweb.net/contrib.html" appShared = "https://ankiweb.net/shared/" appUpdate = "https://ankiweb.net/update/desktop" appHelpSite = HELP_SITE From d39284e101a35477ae39be978eacd6b0f3f74ac5 Mon Sep 17 00:00:00 2001 From: llama Date: Thu, 22 May 2025 19:43:38 +0800 Subject: [PATCH 4/9] Fix IO masks not saving when scaled (#4021) * trigger save after modifying object * remove redundant save already called by undoStack.onObjectModified or setShapePosition --- ts/routes/image-occlusion/mask-editor.ts | 1 - ts/routes/image-occlusion/tools/lib.ts | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/routes/image-occlusion/mask-editor.ts b/ts/routes/image-occlusion/mask-editor.ts index fb29977cd..c5492d413 100644 --- a/ts/routes/image-occlusion/mask-editor.ts +++ b/ts/routes/image-occlusion/mask-editor.ts @@ -116,7 +116,6 @@ function initCanvas(): fabric.Canvas { modifiedPolygon(canvas, evt.target); undoStack.onObjectModified(); } - saveNeededStore.set(true); }); canvas.on("text:editing:entered", function() { textEditingState.set(true); diff --git a/ts/routes/image-occlusion/tools/lib.ts b/ts/routes/image-occlusion/tools/lib.ts index 13313b07e..740f135af 100644 --- a/ts/routes/image-occlusion/tools/lib.ts +++ b/ts/routes/image-occlusion/tools/lib.ts @@ -4,7 +4,7 @@ import { fabric } from "fabric"; import { get } from "svelte/store"; -import { opacityStateStore } from "../store"; +import { opacityStateStore, saveNeededStore } from "../store"; import type { Size } from "../types"; export const SHAPE_MASK_COLOR = "#ffeba2"; @@ -244,6 +244,7 @@ const setShapePosition = ( } object.setCoords(); + saveNeededStore.set(true); }; export function enableUniformScaling(canvas: fabric.Canvas, obj: fabric.Object): void { From ec513dfde7fdad577164d10757e2567937d79a2d Mon Sep 17 00:00:00 2001 From: GithubAnon0000 <160563432+GithubAnon0000@users.noreply.github.com> Date: Thu, 22 May 2025 12:54:35 +0000 Subject: [PATCH 5/9] Fix DR not being in percent in the forgetting curve (#4024) * FIX DR not displayed as % in forgetting curve * Run ./check and fix errors found by it * Round DR to full number --- ts/routes/card-info/forgetting-curve.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ts/routes/card-info/forgetting-curve.ts b/ts/routes/card-info/forgetting-curve.ts index 714032958..c2a9f2580 100644 --- a/ts/routes/card-info/forgetting-curve.ts +++ b/ts/routes/card-info/forgetting-curve.ts @@ -339,8 +339,11 @@ export function renderForgettingCurve( 1, ); let text = tooltipText(d); + const desiredRetentionPercent = desiredRetention * 100; if (y2 >= lineY - 10 && y2 <= lineY + 10) { - text += `
${tr.cardStatsFsrsForgettingCurveDesiredRetention()}: ${desiredRetention.toFixed(2)}`; + text += `
${tr.cardStatsFsrsForgettingCurveDesiredRetention()}: ${ + desiredRetentionPercent.toFixed(0) + }%`; } showTooltip(text, x1, y1); }) From 8694b3b4104760aaa87d85610b5eef44e2c12201 Mon Sep 17 00:00:00 2001 From: Luc Mcgrady Date: Thu, 22 May 2025 13:55:15 +0100 Subject: [PATCH 6/9] Use non breaking spaces for names on about page (#4025) * use non breaking spaces for names on about page * Update qt/aqt/about.py Co-authored-by: llama --------- Co-authored-by: llama --- qt/aqt/about.py | 1 + 1 file changed, 1 insertion(+) diff --git a/qt/aqt/about.py b/qt/aqt/about.py index bf34e4395..a71d36ca0 100644 --- a/qt/aqt/about.py +++ b/qt/aqt/about.py @@ -225,6 +225,7 @@ def show(mw: aqt.AnkiQt) -> QDialog: ) ) + allusers = [user.replace(" ", " ") for user in allusers] abouttext += "

" + tr.about_written_by_damien_elmes_with_patches( cont=", ".join(allusers) + f", {tr.about_and_others()}" ) From 6a1d55ae75ffca52b16577dfa53780938808c15d Mon Sep 17 00:00:00 2001 From: GithubAnon0000 <160563432+GithubAnon0000@users.noreply.github.com> Date: Thu, 22 May 2025 12:55:37 +0000 Subject: [PATCH 7/9] ADD myself to about.py (#4026) --- qt/aqt/about.py | 1 + 1 file changed, 1 insertion(+) diff --git a/qt/aqt/about.py b/qt/aqt/about.py index a71d36ca0..fb90a9355 100644 --- a/qt/aqt/about.py +++ b/qt/aqt/about.py @@ -222,6 +222,7 @@ def show(mw: aqt.AnkiQt) -> QDialog: "🦙 (siid)", "Mukunda Madhav Dey", "Adnane Taghi", + "Anon_0000", ) ) From 420cd237df51eac139b4c69e49e2d33aee20ea59 Mon Sep 17 00:00:00 2001 From: llama Date: Thu, 22 May 2025 21:11:04 +0800 Subject: [PATCH 8/9] fix io undo logic error (#4027) --- ts/routes/image-occlusion/tools/tool-undo-redo.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/routes/image-occlusion/tools/tool-undo-redo.ts b/ts/routes/image-occlusion/tools/tool-undo-redo.ts index 187a8b33d..0785d3908 100644 --- a/ts/routes/image-occlusion/tools/tool-undo-redo.ts +++ b/ts/routes/image-occlusion/tools/tool-undo-redo.ts @@ -117,7 +117,7 @@ class UndoStack { private push(): void { const entry = JSON.stringify(this.canvas?.toJSON(["id"])); - if (entry === this.stack[this.stack.length - 1]) { + if (entry === this.stack[this.index]) { return; } this.stack.length = this.index + 1; From 16c5eaf00ac65bb3168cd8337cfec2d8ce8c8209 Mon Sep 17 00:00:00 2001 From: llama Date: Thu, 22 May 2025 21:21:08 +0800 Subject: [PATCH 9/9] don't show "double click to expand" when it's not possible (#4030) --- ts/editor/image-overlay/ImageOverlay.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/editor/image-overlay/ImageOverlay.svelte b/ts/editor/image-overlay/ImageOverlay.svelte index 8376f3330..8aee3bfc9 100644 --- a/ts/editor/image-overlay/ImageOverlay.svelte +++ b/ts/editor/image-overlay/ImageOverlay.svelte @@ -303,7 +303,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html /> - {#if isSizeConstrained} + {#if isSizeConstrained && !shrinkingDisabled} {`(${tr.editingDoubleClickToExpand()})`} {:else} {actualWidth}×{actualHeight}