diff --git a/ts/.prettierignore b/ts/.prettierignore
index 559e142e9..339fa65b6 100644
--- a/ts/.prettierignore
+++ b/ts/.prettierignore
@@ -1,5 +1,5 @@
 licenses.json
 vendor
-lib/i18n/translate.ts
+lib/translate.ts
 lib/i18n/modules.ts
 backend_proto.d.ts
diff --git a/ts/change-notetype/ChangeNotetypePage.svelte b/ts/change-notetype/ChangeNotetypePage.svelte
index a96143fcb..2fd308d70 100644
--- a/ts/change-notetype/ChangeNotetypePage.svelte
+++ b/ts/change-notetype/ChangeNotetypePage.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import NotetypeSelector from "./NotetypeSelector.svelte";
     import Mapper from "./Mapper.svelte";
     import { ChangeNotetypeState, MapContext } from "./lib";
diff --git a/ts/change-notetype/Mapper.svelte b/ts/change-notetype/Mapper.svelte
index 012a85b12..ca56670af 100644
--- a/ts/change-notetype/Mapper.svelte
+++ b/ts/change-notetype/Mapper.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import MapperRow from "./MapperRow.svelte";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { ChangeNotetypeState, MapContext } from "./lib";
     import { slide } from "svelte/transition";
 
diff --git a/ts/change-notetype/SaveButton.svelte b/ts/change-notetype/SaveButton.svelte
index 8930c132b..0ac95b38e 100644
--- a/ts/change-notetype/SaveButton.svelte
+++ b/ts/change-notetype/SaveButton.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import type { ChangeNotetypeState } from "./lib";
     import { withButton } from "../components/helpers";
 
diff --git a/ts/congrats/CongratsPage.svelte b/ts/congrats/CongratsPage.svelte
index a242a0d74..fc490ebb3 100644
--- a/ts/congrats/CongratsPage.svelte
+++ b/ts/congrats/CongratsPage.svelte
@@ -6,7 +6,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { Scheduler } from "../lib/proto";
     import { buildNextLearnMsg } from "./lib";
     import { bridgeLink } from "../lib/bridgecommand";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
 
     export let info: Scheduler.CongratsInfoResponse;
 
diff --git a/ts/congrats/lib.ts b/ts/congrats/lib.ts
index 38d921481..506dd4ee0 100644
--- a/ts/congrats/lib.ts
+++ b/ts/congrats/lib.ts
@@ -4,7 +4,7 @@
 import { Scheduler } from "../lib/proto";
 import { postRequest } from "../lib/postrequest";
 import { naturalUnit, unitAmount, unitName } from "../lib/time";
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 
 export async function getCongratsInfo(): Promise<Scheduler.CongratsInfoResponse> {
     return Scheduler.CongratsInfoResponse.decode(
diff --git a/ts/deck-options/AdvancedOptions.svelte b/ts/deck-options/AdvancedOptions.svelte
index 33549e44e..d07f7129a 100644
--- a/ts/deck-options/AdvancedOptions.svelte
+++ b/ts/deck-options/AdvancedOptions.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import TitledContainer from "./TitledContainer.svelte";
     import Item from "../components/Item.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
diff --git a/ts/deck-options/AudioOptions.svelte b/ts/deck-options/AudioOptions.svelte
index b5f8b69fa..a5fe10518 100644
--- a/ts/deck-options/AudioOptions.svelte
+++ b/ts/deck-options/AudioOptions.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import TitledContainer from "./TitledContainer.svelte";
     import Item from "../components/Item.svelte";
     import SwitchRow from "./SwitchRow.svelte";
diff --git a/ts/deck-options/BuryOptions.svelte b/ts/deck-options/BuryOptions.svelte
index 9bb634f20..8fdf43a31 100644
--- a/ts/deck-options/BuryOptions.svelte
+++ b/ts/deck-options/BuryOptions.svelte
@@ -6,7 +6,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import TitledContainer from "./TitledContainer.svelte";
     import Item from "../components/Item.svelte";
     import SwitchRow from "./SwitchRow.svelte";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
diff --git a/ts/deck-options/CardStateCustomizer.svelte b/ts/deck-options/CardStateCustomizer.svelte
index 69171452d..a19a9c1d0 100644
--- a/ts/deck-options/CardStateCustomizer.svelte
+++ b/ts/deck-options/CardStateCustomizer.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import TooltipLabel from "./TooltipLabel.svelte";
     import RevertButton from "./RevertButton.svelte";
     import Row from "./Row.svelte";
diff --git a/ts/deck-options/ConfigSelector.svelte b/ts/deck-options/ConfigSelector.svelte
index 52ec31752..45a02144a 100644
--- a/ts/deck-options/ConfigSelector.svelte
+++ b/ts/deck-options/ConfigSelector.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { getContext } from "svelte";
     import { modalsKey } from "../components/context-keys";
     import type { DeckOptionsState, ConfigListEntry } from "./lib";
diff --git a/ts/deck-options/DailyLimits.svelte b/ts/deck-options/DailyLimits.svelte
index a73eecbc8..f56bd7fcb 100644
--- a/ts/deck-options/DailyLimits.svelte
+++ b/ts/deck-options/DailyLimits.svelte
@@ -3,7 +3,7 @@
     License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import TitledContainer from "./TitledContainer.svelte";
     import Item from "../components/Item.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
diff --git a/ts/deck-options/DisplayOrder.svelte b/ts/deck-options/DisplayOrder.svelte
index 134ecf3ad..5882a6e56 100644
--- a/ts/deck-options/DisplayOrder.svelte
+++ b/ts/deck-options/DisplayOrder.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import TitledContainer from "./TitledContainer.svelte";
     import Item from "../components/Item.svelte";
     import EnumSelectorRow from "./EnumSelectorRow.svelte";
diff --git a/ts/deck-options/LapseOptions.svelte b/ts/deck-options/LapseOptions.svelte
index b8b1d884b..60196e139 100644
--- a/ts/deck-options/LapseOptions.svelte
+++ b/ts/deck-options/LapseOptions.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import TitledContainer from "./TitledContainer.svelte";
     import Item from "../components/Item.svelte";
     import StepsInputRow from "./StepsInputRow.svelte";
diff --git a/ts/deck-options/NewOptions.svelte b/ts/deck-options/NewOptions.svelte
index 03f60d804..d2b2410c0 100644
--- a/ts/deck-options/NewOptions.svelte
+++ b/ts/deck-options/NewOptions.svelte
@@ -11,7 +11,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import Warning from "./Warning.svelte";
 
     import type { DeckOptionsState } from "./lib";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
 
     export let state: DeckOptionsState;
     export let api = {};
diff --git a/ts/deck-options/RevertButton.svelte b/ts/deck-options/RevertButton.svelte
index 3cdea47d9..4092a9cbf 100644
--- a/ts/deck-options/RevertButton.svelte
+++ b/ts/deck-options/RevertButton.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import type Dropdown from "bootstrap/js/dist/dropdown";
     import WithDropdown from "../components/WithDropdown.svelte";
     import DropdownMenu from "../components/DropdownMenu.svelte";
diff --git a/ts/deck-options/SaveButton.svelte b/ts/deck-options/SaveButton.svelte
index aeaaa1517..7dba08dbb 100644
--- a/ts/deck-options/SaveButton.svelte
+++ b/ts/deck-options/SaveButton.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { createEventDispatcher } from "svelte";
     import type { DeckOptionsState } from "./lib";
     import type Dropdown from "bootstrap/js/dist/dropdown";
diff --git a/ts/deck-options/TimerOptions.svelte b/ts/deck-options/TimerOptions.svelte
index f301f974e..6e7c0cd63 100644
--- a/ts/deck-options/TimerOptions.svelte
+++ b/ts/deck-options/TimerOptions.svelte
@@ -7,7 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import Item from "../components/Item.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import SwitchRow from "./SwitchRow.svelte";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
diff --git a/ts/deck-options/strings.ts b/ts/deck-options/strings.ts
index 81d6da34d..387a5c99a 100644
--- a/ts/deck-options/strings.ts
+++ b/ts/deck-options/strings.ts
@@ -1,7 +1,7 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 
 export const reviewMixChoices = (): string[] => [
     tr.deckConfigReviewMixMixWithReviews(),
diff --git a/ts/editor/ClozeButton.svelte b/ts/editor/ClozeButton.svelte
index 5cae3a426..280b7db07 100644
--- a/ts/editor/ClozeButton.svelte
+++ b/ts/editor/ClozeButton.svelte
@@ -7,7 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import WithShortcut from "../components/WithShortcut.svelte";
     import OnlyEditable from "./OnlyEditable.svelte";
 
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { withButton } from "../components/helpers";
     import { ellipseIcon } from "./icons";
     import { forEditorField } from ".";
diff --git a/ts/editor/ColorButtons.svelte b/ts/editor/ColorButtons.svelte
index 70a1520f1..537ad243d 100644
--- a/ts/editor/ColorButtons.svelte
+++ b/ts/editor/ColorButtons.svelte
@@ -11,7 +11,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import WithColorHelper from "./WithColorHelper.svelte";
     import OnlyEditable from "./OnlyEditable.svelte";
 
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { bridgeCommand } from "../lib/bridgecommand";
     import { withButton } from "../components/helpers";
     import { textColorIcon, highlightColorIcon, arrowIcon } from "./icons";
diff --git a/ts/editor/FormatBlockButtons.svelte b/ts/editor/FormatBlockButtons.svelte
index 8b7f988dd..e4cd3397f 100644
--- a/ts/editor/FormatBlockButtons.svelte
+++ b/ts/editor/FormatBlockButtons.svelte
@@ -12,7 +12,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import OnlyEditable from "./OnlyEditable.svelte";
     import CommandIconButton from "./CommandIconButton.svelte";
 
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { getListItem } from "../lib/dom";
     import { getCurrentField, execCommand } from "./helpers";
     import {
diff --git a/ts/editor/FormatInlineButtons.svelte b/ts/editor/FormatInlineButtons.svelte
index 62882635a..e23d4d2d4 100644
--- a/ts/editor/FormatInlineButtons.svelte
+++ b/ts/editor/FormatInlineButtons.svelte
@@ -7,7 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
     import CommandIconButton from "./CommandIconButton.svelte";
 
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import {
         boldIcon,
         italicIcon,
diff --git a/ts/editor/ImageHandleFloatButtons.svelte b/ts/editor/ImageHandleFloatButtons.svelte
index 0568dcc7a..75afdaf57 100644
--- a/ts/editor/ImageHandleFloatButtons.svelte
+++ b/ts/editor/ImageHandleFloatButtons.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
 
     import ButtonGroup from "../components/ButtonGroup.svelte";
     import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
diff --git a/ts/editor/ImageHandleSizeSelect.svelte b/ts/editor/ImageHandleSizeSelect.svelte
index 170e1b065..dd229edff 100644
--- a/ts/editor/ImageHandleSizeSelect.svelte
+++ b/ts/editor/ImageHandleSizeSelect.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
 
     import ButtonGroup from "../components/ButtonGroup.svelte";
     import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
diff --git a/ts/editor/MathjaxHandleInlineBlock.svelte b/ts/editor/MathjaxHandleInlineBlock.svelte
index 19657d376..ca6d96f6b 100644
--- a/ts/editor/MathjaxHandleInlineBlock.svelte
+++ b/ts/editor/MathjaxHandleInlineBlock.svelte
@@ -7,7 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
     import IconButton from "../components/IconButton.svelte";
 
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { inlineIcon, blockIcon } from "./icons";
 
     export let activeImage: HTMLImageElement;
diff --git a/ts/editor/NoteTypeButtons.svelte b/ts/editor/NoteTypeButtons.svelte
index 19655a88e..f7387df29 100644
--- a/ts/editor/NoteTypeButtons.svelte
+++ b/ts/editor/NoteTypeButtons.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { bridgeCommand } from "../lib/bridgecommand";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { withButton } from "../components/helpers";
 
     import ButtonGroup from "../components/ButtonGroup.svelte";
diff --git a/ts/editor/PreviewButton.svelte b/ts/editor/PreviewButton.svelte
index 61b25ad43..d0953b72f 100644
--- a/ts/editor/PreviewButton.svelte
+++ b/ts/editor/PreviewButton.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { bridgeCommand } from "../lib/bridgecommand";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { withButton } from "../components/helpers";
 
     import WithShortcut from "../components/WithShortcut.svelte";
diff --git a/ts/editor/TemplateButtons.svelte b/ts/editor/TemplateButtons.svelte
index fe721b0b6..01b5942fc 100644
--- a/ts/editor/TemplateButtons.svelte
+++ b/ts/editor/TemplateButtons.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { bridgeCommand } from "../lib/bridgecommand";
     import { fieldFocusedKey, inCodableKey } from "./context-keys";
 
diff --git a/ts/editor/label-container.ts b/ts/editor/label-container.ts
index 6b558b743..96756b5af 100644
--- a/ts/editor/label-container.ts
+++ b/ts/editor/label-container.ts
@@ -2,7 +2,7 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import type { EditorField } from "./editor-field";
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 import { registerShortcut } from "../lib/shortcuts";
 import { bridgeCommand } from "./lib";
 import { appendInParentheses } from "./helpers";
diff --git a/ts/graphs/AddedGraph.svelte b/ts/graphs/AddedGraph.svelte
index c4791ca7c..6c04d40c6 100644
--- a/ts/graphs/AddedGraph.svelte
+++ b/ts/graphs/AddedGraph.svelte
@@ -13,7 +13,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import GraphRangeRadios from "./GraphRangeRadios.svelte";
     import TableData from "./TableData.svelte";
 
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { RevlogRange, GraphRange } from "./graph-helpers";
     import type { TableDatum, SearchEventMap } from "./graph-helpers";
     import type { HistogramData } from "./histogram-graph";
diff --git a/ts/graphs/ButtonsGraph.svelte b/ts/graphs/ButtonsGraph.svelte
index 39cf1375e..4020e426e 100644
--- a/ts/graphs/ButtonsGraph.svelte
+++ b/ts/graphs/ButtonsGraph.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import type { Stats } from "../lib/proto";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
 
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
diff --git a/ts/graphs/CalendarGraph.svelte b/ts/graphs/CalendarGraph.svelte
index 84b33945a..e602c065b 100644
--- a/ts/graphs/CalendarGraph.svelte
+++ b/ts/graphs/CalendarGraph.svelte
@@ -6,7 +6,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { createEventDispatcher } from "svelte";
     import type { Stats } from "../lib/proto";
     import type { PreferenceStore } from "../sveltelib/preferences";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
 
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
diff --git a/ts/graphs/CardCounts.svelte b/ts/graphs/CardCounts.svelte
index 3d43c8d0d..f3703ea72 100644
--- a/ts/graphs/CardCounts.svelte
+++ b/ts/graphs/CardCounts.svelte
@@ -9,7 +9,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { createEventDispatcher } from "svelte";
     import type { Stats } from "../lib/proto";
     import type { PreferenceStore } from "../sveltelib/preferences";
-    import { tr as trI18n } from "../lib/i18n";
+    import * as translate from "../lib/translate";
     import { defaultGraphBounds } from "./graph-helpers";
     import type { SearchEventMap } from "./graph-helpers";
     import { gatherData, renderCards } from "./card-counts";
@@ -35,8 +35,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         tableData = renderCards(svg as any, bounds, graphData);
     }
 
-    const label = trI18n.statisticsCountsSeparateSuspendedBuriedCards();
-    const total = trI18n.statisticsCountsTotalCards();
+    const label = translate.statisticsCountsSeparateSuspendedBuriedCards();
+    const total = translate.statisticsCountsTotalCards();
 </script>
 
 <Graph title={graphData.title}>
diff --git a/ts/graphs/EaseGraph.svelte b/ts/graphs/EaseGraph.svelte
index 5a55c9ff7..e154e816f 100644
--- a/ts/graphs/EaseGraph.svelte
+++ b/ts/graphs/EaseGraph.svelte
@@ -7,7 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { PreferenceStore } from "../sveltelib/preferences";
 
     import { createEventDispatcher } from "svelte";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
 
     import HistogramGraph from "./HistogramGraph.svelte";
     import Graph from "./Graph.svelte";
diff --git a/ts/graphs/FutureDue.svelte b/ts/graphs/FutureDue.svelte
index b8af6ca30..85a50a716 100644
--- a/ts/graphs/FutureDue.svelte
+++ b/ts/graphs/FutureDue.svelte
@@ -14,7 +14,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import TableData from "./TableData.svelte";
     import type { PreferenceStore } from "../sveltelib/preferences";
 
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import type { HistogramData } from "./histogram-graph";
     import { GraphRange, RevlogRange } from "./graph-helpers";
     import type { TableDatum, SearchEventMap } from "./graph-helpers";
diff --git a/ts/graphs/GraphRangeRadios.svelte b/ts/graphs/GraphRangeRadios.svelte
index d93b76587..1913af2ed 100644
--- a/ts/graphs/GraphRangeRadios.svelte
+++ b/ts/graphs/GraphRangeRadios.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { RevlogRange, GraphRange } from "./graph-helpers";
     import { timeSpan, MONTH, YEAR } from "../lib/time";
 
diff --git a/ts/graphs/HourGraph.svelte b/ts/graphs/HourGraph.svelte
index c75712535..9a74170b5 100644
--- a/ts/graphs/HourGraph.svelte
+++ b/ts/graphs/HourGraph.svelte
@@ -12,7 +12,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import HoverColumns from "./HoverColumns.svelte";
 
     import type { Stats } from "../lib/proto";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { defaultGraphBounds, RevlogRange, GraphRange } from "./graph-helpers";
     import { renderHours } from "./hours";
 
diff --git a/ts/graphs/IntervalsGraph.svelte b/ts/graphs/IntervalsGraph.svelte
index ff107ca9d..5c1f1a59b 100644
--- a/ts/graphs/IntervalsGraph.svelte
+++ b/ts/graphs/IntervalsGraph.svelte
@@ -9,7 +9,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import TableData from "./TableData.svelte";
 
     import { timeSpan, MONTH } from "../lib/time";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import type { Stats } from "../lib/proto";
     import type { PreferenceStore } from "../sveltelib/preferences";
     import { createEventDispatcher } from "svelte";
diff --git a/ts/graphs/NoDataOverlay.svelte b/ts/graphs/NoDataOverlay.svelte
index 3d68f3ce3..743c1bed2 100644
--- a/ts/graphs/NoDataOverlay.svelte
+++ b/ts/graphs/NoDataOverlay.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import type { GraphBounds } from "./graph-helpers";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
 
     export let bounds: GraphBounds;
 
diff --git a/ts/graphs/RangeBox.svelte b/ts/graphs/RangeBox.svelte
index f71a237f2..59c9f020f 100644
--- a/ts/graphs/RangeBox.svelte
+++ b/ts/graphs/RangeBox.svelte
@@ -6,7 +6,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import InputBox from "./InputBox.svelte";
 
     import type { Writable } from "svelte/store";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { RevlogRange, daysToRevlogRange } from "./graph-helpers";
 
     enum SearchRange {
diff --git a/ts/graphs/ReviewsGraph.svelte b/ts/graphs/ReviewsGraph.svelte
index 7df118d8f..60c708a54 100644
--- a/ts/graphs/ReviewsGraph.svelte
+++ b/ts/graphs/ReviewsGraph.svelte
@@ -13,7 +13,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import HoverColumns from "./HoverColumns.svelte";
 
     import type { Stats } from "../lib/proto";
-    import { tr } from "../lib/i18n";
+    import * as tr from "../lib/translate";
     import { defaultGraphBounds, RevlogRange, GraphRange } from "./graph-helpers";
     import type { TableDatum } from "./graph-helpers";
     import { gatherData, renderReviews } from "./reviews";
diff --git a/ts/graphs/added.ts b/ts/graphs/added.ts
index fdcc8f641..57faa1d47 100644
--- a/ts/graphs/added.ts
+++ b/ts/graphs/added.ts
@@ -19,7 +19,7 @@ import {
 import type { Bin } from "d3";
 import type { HistogramData } from "./histogram-graph";
 
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 import { dayLabel } from "../lib/time";
 import { GraphRange } from "./graph-helpers";
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
diff --git a/ts/graphs/buttons.ts b/ts/graphs/buttons.ts
index f243e4bd0..cdd6796ca 100644
--- a/ts/graphs/buttons.ts
+++ b/ts/graphs/buttons.ts
@@ -18,7 +18,7 @@ import {
     sum,
 } from "d3";
 import { Stats } from "../lib/proto";
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 import { showTooltip, hideTooltip } from "./tooltip";
 import {
     GraphBounds,
diff --git a/ts/graphs/calendar.ts b/ts/graphs/calendar.ts
index 9d489c00b..f162c7691 100644
--- a/ts/graphs/calendar.ts
+++ b/ts/graphs/calendar.ts
@@ -29,7 +29,8 @@ import {
     SearchDispatch,
 } from "./graph-helpers";
 import { clickableClass } from "./graph-styles";
-import { tr, weekdayLabel, toLocaleString } from "../lib/i18n";
+import { weekdayLabel, toLocaleString } from "../lib/i18n";
+import * as tr from "../lib/translate";
 
 export interface GraphData {
     // indexed by day, where day is relative to today
diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index 54a1da371..13048e8a4 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 import { CardQueue, CardType } from "../lib/cards";
 import type { Stats, Cards } from "../lib/proto";
 import {
diff --git a/ts/graphs/ease.ts b/ts/graphs/ease.ts
index 791904c35..3d98a8246 100644
--- a/ts/graphs/ease.ts
+++ b/ts/graphs/ease.ts
@@ -16,7 +16,7 @@ import {
     interpolateRdYlGn,
 } from "d3";
 import type { Bin, ScaleLinear } from "d3";
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 import { CardType } from "../lib/cards";
 import type { HistogramData } from "./histogram-graph";
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
diff --git a/ts/graphs/future-due.ts b/ts/graphs/future-due.ts
index 0fd5c97c5..8a3e66ad0 100644
--- a/ts/graphs/future-due.ts
+++ b/ts/graphs/future-due.ts
@@ -17,7 +17,7 @@ import {
     interpolateGreens,
 } from "d3";
 import type { Bin } from "d3";
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 import { CardQueue } from "../lib/cards";
 import type { HistogramData } from "./histogram-graph";
 import { dayLabel } from "../lib/time";
diff --git a/ts/graphs/hours.ts b/ts/graphs/hours.ts
index 3f0cdbba2..ed3e2f526 100644
--- a/ts/graphs/hours.ts
+++ b/ts/graphs/hours.ts
@@ -21,7 +21,7 @@ import {
     curveBasis,
 } from "d3";
 
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 import { showTooltip, hideTooltip } from "./tooltip";
 import {
     GraphBounds,
diff --git a/ts/graphs/intervals.ts b/ts/graphs/intervals.ts
index 64c2cf7f0..24186f43b 100644
--- a/ts/graphs/intervals.ts
+++ b/ts/graphs/intervals.ts
@@ -18,7 +18,7 @@ import {
     interpolateBlues,
 } from "d3";
 import type { Bin } from "d3";
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 import { timeSpan } from "../lib/time";
 import { CardType } from "../lib/cards";
 import type { HistogramData } from "./histogram-graph";
diff --git a/ts/graphs/reviews.ts b/ts/graphs/reviews.ts
index 2952c4074..6afc22363 100644
--- a/ts/graphs/reviews.ts
+++ b/ts/graphs/reviews.ts
@@ -32,7 +32,7 @@ import {
 } from "d3";
 import type { Bin } from "d3";
 
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 import type { TableDatum } from "./graph-helpers";
 import { GraphBounds, setDataAvailable, GraphRange } from "./graph-helpers";
 import { showTooltip, hideTooltip } from "./tooltip";
diff --git a/ts/graphs/today.ts b/ts/graphs/today.ts
index 3b7835cb5..a425a04f6 100644
--- a/ts/graphs/today.ts
+++ b/ts/graphs/today.ts
@@ -3,7 +3,7 @@
 
 import { Stats } from "../lib/proto";
 import { studiedToday } from "../lib/time";
-import { tr } from "../lib/i18n";
+import * as tr from "../lib/translate";
 
 export interface TodayData {
     title: string;
diff --git a/ts/lib/BUILD.bazel b/ts/lib/BUILD.bazel
index 8e7de8ccb..1c5353f34 100644
--- a/ts/lib/BUILD.bazel
+++ b/ts/lib/BUILD.bazel
@@ -17,7 +17,7 @@ py_binary(
     ],
 )
 _i18n_generated = [
-    "i18n/translate.ts",
+    "translate.ts",
     "i18n/modules.ts",
 ]
 
@@ -46,7 +46,7 @@ typescript(
     exclude = _generated,
     generated = [
         ":backend_proto.d.ts",
-        ":i18n/translate.ts",
+        ":translate.ts",
         ":i18n/modules.ts",
     ],
     deps = [
diff --git a/ts/lib/genfluent.py b/ts/lib/genfluent.py
index 568a440ba..075707ed2 100644
--- a/ts/lib/genfluent.py
+++ b/ts/lib/genfluent.py
@@ -17,7 +17,12 @@ class Variable(TypedDict):
 
 
 def methods() -> str:
-    out = [ 'import { translate } from "./bundles";' ]
+    out = [ """import type { FluentVariable } from "@fluent/bundle";
+import { getMessage } from "./i18n";
+
+function translate(key: string, args: Record<string, FluentVariable> = {}): string {
+    return getMessage(key, args) ?? `missing key: ${key}`;
+}""" ]
     for module in modules:
         for translation in module["translations"]:
             key = stringcase.camelcase(translation["key"].replace("-", "_"))
diff --git a/ts/lib/i18n/bundles.ts b/ts/lib/i18n/bundles.ts
index cdf62d1a3..dd85f0004 100644
--- a/ts/lib/i18n/bundles.ts
+++ b/ts/lib/i18n/bundles.ts
@@ -2,8 +2,7 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import { FluentNumber } from "@fluent/bundle";
-import type { FluentBundle } from "@fluent/bundle";
-type RecordVal = number | string | FluentNumber;
+import type { FluentBundle, FluentVariable } from "@fluent/bundle";
 
 let bundles: FluentBundle[] = [];
 
@@ -15,26 +14,33 @@ export function firstLanguage(): string {
     return bundles[0].locales[0];
 }
 
-function formatNumbers(args: Record<string, RecordVal>): void {
-    for (const key of Object.keys(args)) {
-        if (typeof args[key] === "number") {
-            args[key] = new FluentNumber(args[key] as number, {
-                maximumFractionDigits: 2,
-            });
-        }
-    }
+function toFluentNumber(num: number): FluentNumber {
+    return new FluentNumber(num, {
+        maximumFractionDigits: 2,
+    });
 }
 
-export function translate(key: string, args?: Record<string, RecordVal>): string {
-    if (args) {
-        formatNumbers(args);
-    }
+function formatArgs(
+    args: Record<string, FluentVariable>
+): Record<string, FluentVariable> {
+    return Object.fromEntries(
+        Object.entries(args).map(([key, value]) => [
+            key,
+            typeof value === "number" ? toFluentNumber(value) : value,
+        ])
+    );
+}
 
+export function getMessage(
+    key: string,
+    args: Record<string, FluentVariable> = {}
+): string | null {
     for (const bundle of bundles) {
         const msg = bundle.getMessage(key);
         if (msg && msg.value) {
-            return bundle.formatPattern(msg.value, args);
+            return bundle.formatPattern(msg.value, formatArgs(args));
         }
     }
-    return `missing key: ${key}`;
+
+    return null;
 }
diff --git a/ts/lib/i18n/index.ts b/ts/lib/i18n/index.ts
index 37eb7abd9..f37ff280f 100644
--- a/ts/lib/i18n/index.ts
+++ b/ts/lib/i18n/index.ts
@@ -1,3 +1,3 @@
+export * from "./bundles";
+export * from "./modules";
 export * from "./utils";
-export * as tr from "./translate";
-export { ModuleName } from "./modules";
diff --git a/ts/lib/keys.ts b/ts/lib/keys.ts
index 66611e367..2ede4edbd 100644
--- a/ts/lib/keys.ts
+++ b/ts/lib/keys.ts
@@ -1,7 +1,7 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { tr } from "./i18n";
+import * as tr from "./translate";
 import { isApplePlatform } from "./platform";
 
 // those are the modifiers that Anki works with
diff --git a/ts/lib/time.ts b/ts/lib/time.ts
index ef6a05604..943279d88 100644
--- a/ts/lib/time.ts
+++ b/ts/lib/time.ts
@@ -1,7 +1,7 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { tr } from "./i18n";
+import * as tr from "./translate";
 
 export const SECOND = 1.0;
 export const MINUTE = 60.0 * SECOND;
diff --git a/ts/tsconfig.json b/ts/tsconfig.json
index 46ba3b402..6a73aca51 100644
--- a/ts/tsconfig.json
+++ b/ts/tsconfig.json
@@ -21,8 +21,9 @@
         "lib": [
             "es2017",
             "es2018.intl",
-            "es2019.array",
             "es2018.promise",
+            "es2019.array",
+            "es2019.object",
             "es2020.promise",
             "es2019.string",
             "dom",