From 51af6b25449ba7977c56e54ba2d3d483c2bae6a1 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Sat, 2 Oct 2021 23:34:03 +0200
Subject: [PATCH] Rename i18n and i18n_helpers to i18n-generated and i18n

- This way, we can restrict the awkwardness of importing files outside
  the ts directory within lib
---
 ts/change-notetype/ChangeNotetypePage.svelte |  2 +-
 ts/change-notetype/Mapper.svelte             |  2 +-
 ts/change-notetype/SaveButton.svelte         |  2 +-
 ts/change-notetype/index.ts                  |  4 +--
 ts/congrats/CongratsPage.svelte              |  2 +-
 ts/congrats/index.ts                         |  4 +--
 ts/congrats/lib.ts                           |  3 +--
 ts/deck-options/AdvancedOptions.svelte       |  2 +-
 ts/deck-options/AudioOptions.svelte          |  2 +-
 ts/deck-options/BuryOptions.svelte           |  2 +-
 ts/deck-options/CardStateCustomizer.svelte   |  2 +-
 ts/deck-options/ConfigSelector.svelte        |  2 +-
 ts/deck-options/DailyLimits.svelte           |  2 +-
 ts/deck-options/DisplayOrder.svelte          |  2 +-
 ts/deck-options/LapseOptions.svelte          |  2 +-
 ts/deck-options/NewOptions.svelte            |  3 ++-
 ts/deck-options/RevertButton.svelte          |  2 +-
 ts/deck-options/SaveButton.svelte            |  2 +-
 ts/deck-options/TimerOptions.svelte          |  2 +-
 ts/deck-options/index.ts                     |  8 +++---
 ts/deck-options/lib.ts                       |  4 +--
 ts/deck-options/strings.ts                   |  2 +-
 ts/editor/ClozeButton.svelte                 |  3 +--
 ts/editor/ColorButtons.svelte                |  3 +--
 ts/editor/FormatBlockButtons.svelte          |  3 +--
 ts/editor/FormatInlineButtons.svelte         |  3 +--
 ts/editor/ImageHandleFloatButtons.svelte     |  2 +-
 ts/editor/ImageHandleSizeSelect.svelte       |  2 +-
 ts/editor/MathjaxHandleInlineBlock.svelte    |  3 +--
 ts/editor/NoteTypeButtons.svelte             |  2 +-
 ts/editor/PreviewButton.svelte               |  2 +-
 ts/editor/TemplateButtons.svelte             |  2 +-
 ts/editor/index.ts                           | 10 +++----
 ts/editor/label-container.ts                 |  3 +--
 ts/graphs/AddedGraph.svelte                  |  2 +-
 ts/graphs/ButtonsGraph.svelte                |  2 +-
 ts/graphs/CalendarGraph.svelte               |  5 ++--
 ts/graphs/CardCounts.svelte                  | 13 +++++----
 ts/graphs/EaseGraph.svelte                   |  2 +-
 ts/graphs/FutureDue.svelte                   |  2 +-
 ts/graphs/GraphRangeRadios.svelte            |  2 +-
 ts/graphs/HourGraph.svelte                   |  6 ++---
 ts/graphs/IntervalsGraph.svelte              | 12 ++++-----
 ts/graphs/NoDataOverlay.svelte               |  4 ++-
 ts/graphs/RangeBox.svelte                    |  5 ++--
 ts/graphs/ReviewsGraph.svelte                |  5 ++--
 ts/graphs/added.ts                           |  2 +-
 ts/graphs/buttons.ts                         |  5 ++--
 ts/graphs/calendar.ts                        |  3 +--
 ts/graphs/card-counts.ts                     |  3 +--
 ts/graphs/ease.ts                            |  3 +--
 ts/graphs/future-due.ts                      |  2 +-
 ts/graphs/hours.ts                           |  2 +-
 ts/graphs/index.ts                           | 28 +++++++++++---------
 ts/graphs/intervals.ts                       |  4 +--
 ts/graphs/reviews.ts                         |  2 +-
 ts/graphs/today.ts                           |  3 +--
 ts/lib/BUILD.bazel                           |  4 +--
 ts/lib/genfluent.py                          |  3 +--
 ts/lib/{i18n_helpers.ts => i18n.ts}          |  4 ++-
 ts/lib/keys.ts                               |  2 +-
 ts/lib/time.ts                               |  2 +-
 ts/lib/tsconfig.json                         |  3 ++-
 63 files changed, 110 insertions(+), 121 deletions(-)
 rename ts/lib/{i18n_helpers.ts => i18n.ts} (97%)

diff --git a/ts/change-notetype/ChangeNotetypePage.svelte b/ts/change-notetype/ChangeNotetypePage.svelte
index 878114145..a96143fcb 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 10763e8f0..012a85b12 100644
--- a/ts/change-notetype/Mapper.svelte
+++ b/ts/change-notetype/Mapper.svelte
@@ -3,8 +3,8 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "../lib/i18n";
     import MapperRow from "./MapperRow.svelte";
+    import { tr } from "../lib/i18n";
     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 51e10b394..8930c132b 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     import type { ChangeNotetypeState } from "./lib";
     import { withButton } from "../components/helpers";
 
diff --git a/ts/change-notetype/index.ts b/ts/change-notetype/index.ts
index 3133fb06a..654ce852c 100644
--- a/ts/change-notetype/index.ts
+++ b/ts/change-notetype/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { ChangeNotetypeState, getChangeNotetypeInfo, getNotetypeNames } from "./lib";
-import { setupI18n, ModuleName } from "../lib/i18n";
+import { setupI18n, tr } from "../lib/i18n";
 import { checkNightMode } from "../lib/nightmode";
 import ChangeNotetypePage from "./ChangeNotetypePage.svelte";
 import { nightModeKey } from "../components/context-keys";
@@ -20,7 +20,7 @@ export async function changeNotetypePage(
         getChangeNotetypeInfo(oldNotetypeId, newNotetypeId),
         getNotetypeNames(),
         setupI18n({
-            modules: [ModuleName.ACTIONS, ModuleName.CHANGE_NOTETYPE],
+            modules: [tr.ModuleName.ACTIONS, tr.ModuleName.CHANGE_NOTETYPE],
         }),
     ]);
 
diff --git a/ts/congrats/CongratsPage.svelte b/ts/congrats/CongratsPage.svelte
index 2e2f339c1..a242a0d74 100644
--- a/ts/congrats/CongratsPage.svelte
+++ b/ts/congrats/CongratsPage.svelte
@@ -6,9 +6,9 @@ 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";
 
     export let info: Scheduler.CongratsInfoResponse;
-    import * as tr from "../lib/i18n";
 
     const congrats = tr.schedulingCongratulationsFinished();
     let nextLearnMsg: string;
diff --git a/ts/congrats/index.ts b/ts/congrats/index.ts
index 4c4c4c79d..13d8dfe1f 100644
--- a/ts/congrats/index.ts
+++ b/ts/congrats/index.ts
@@ -2,14 +2,14 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import { getCongratsInfo } from "./lib";
-import { setupI18n, ModuleName } from "../lib/i18n";
+import { setupI18n, tr } from "../lib/i18n";
 import { checkNightMode } from "../lib/nightmode";
 
 import CongratsPage from "./CongratsPage.svelte";
 
 export async function congrats(target: HTMLDivElement): Promise<void> {
     checkNightMode();
-    await setupI18n({ modules: [ModuleName.SCHEDULING] });
+    await setupI18n({ modules: [tr.ModuleName.SCHEDULING] });
     const info = await getCongratsInfo();
     const page = new CongratsPage({
         target,
diff --git a/ts/congrats/lib.ts b/ts/congrats/lib.ts
index 9297291c1..38d921481 100644
--- a/ts/congrats/lib.ts
+++ b/ts/congrats/lib.ts
@@ -4,8 +4,7 @@
 import { Scheduler } from "../lib/proto";
 import { postRequest } from "../lib/postrequest";
 import { naturalUnit, unitAmount, unitName } from "../lib/time";
-
-import * as tr from "../lib/i18n";
+import { tr } from "../lib/i18n";
 
 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 3d6070236..33549e44e 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 a115de4e7..b5f8b69fa 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 f566ad4bc..9bb634f20 100644
--- a/ts/deck-options/BuryOptions.svelte
+++ b/ts/deck-options/BuryOptions.svelte
@@ -3,10 +3,10 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
     import Item from "../components/Item.svelte";
     import SwitchRow from "./SwitchRow.svelte";
+    import { tr } from "../lib/i18n";
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
diff --git a/ts/deck-options/CardStateCustomizer.svelte b/ts/deck-options/CardStateCustomizer.svelte
index bfaaedb1b..69171452d 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 ea684b841..52ec31752 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 56af47543..a73eecbc8 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 07992d389..134ecf3ad 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 bf997d4e5..b8b1d884b 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 4911899b3..03f60d804 100644
--- a/ts/deck-options/NewOptions.svelte
+++ b/ts/deck-options/NewOptions.svelte
@@ -3,14 +3,15 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
     import Item from "../components/Item.svelte";
     import StepsInputRow from "./StepsInputRow.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import EnumSelectorRow from "./EnumSelectorRow.svelte";
     import Warning from "./Warning.svelte";
+
     import type { DeckOptionsState } from "./lib";
+    import { tr } from "../lib/i18n";
 
     export let state: DeckOptionsState;
     export let api = {};
diff --git a/ts/deck-options/RevertButton.svelte b/ts/deck-options/RevertButton.svelte
index 9402d4c50..3cdea47d9 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 6781bdd2e..5583eeef9 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     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 ba7d3d631..f301f974e 100644
--- a/ts/deck-options/TimerOptions.svelte
+++ b/ts/deck-options/TimerOptions.svelte
@@ -3,11 +3,11 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
     import Item from "../components/Item.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import SwitchRow from "./SwitchRow.svelte";
+    import { tr } from "../lib/i18n";
     import type { DeckOptionsState } from "./lib";
 
     export let state: DeckOptionsState;
diff --git a/ts/deck-options/index.ts b/ts/deck-options/index.ts
index 8f68c20fd..5998ca0c1 100644
--- a/ts/deck-options/index.ts
+++ b/ts/deck-options/index.ts
@@ -8,7 +8,7 @@
 import "../sveltelib/export-runtime";
 
 import { getDeckOptionsInfo, DeckOptionsState } from "./lib";
-import { setupI18n, ModuleName } from "../lib/i18n";
+import { setupI18n, tr } from "../lib/i18n";
 import { checkNightMode } from "../lib/nightmode";
 import DeckOptionsPage from "./DeckOptionsPage.svelte";
 import { nightModeKey, touchDeviceKey, modalsKey } from "../components/context-keys";
@@ -21,9 +21,9 @@ export async function deckOptions(
         getDeckOptionsInfo(deckId),
         setupI18n({
             modules: [
-                ModuleName.SCHEDULING,
-                ModuleName.ACTIONS,
-                ModuleName.DECK_CONFIG,
+                tr.ModuleName.SCHEDULING,
+                tr.ModuleName.ACTIONS,
+                tr.ModuleName.DECK_CONFIG,
             ],
         }),
     ]);
diff --git a/ts/deck-options/lib.ts b/ts/deck-options/lib.ts
index dfed7bcb8..7a8538f4d 100644
--- a/ts/deck-options/lib.ts
+++ b/ts/deck-options/lib.ts
@@ -9,7 +9,7 @@ import { DeckConfig } from "../lib/proto";
 import { postRequest } from "../lib/postrequest";
 import { Writable, writable, get, Readable, readable } from "svelte/store";
 import { isEqual, cloneDeep } from "lodash-es";
-import * as tr from "../lib/i18n";
+import { i18n } from "../lib/i18n";
 import type { DynamicSvelteComponent } from "../sveltelib/dynamicComponent";
 
 export async function getDeckOptionsInfo(
@@ -279,7 +279,7 @@ export class DeckOptionsState {
             };
         });
         list.sort((a, b) =>
-            a.name.localeCompare(b.name, tr.i18n.langs, { sensitivity: "base" })
+            a.name.localeCompare(b.name, i18n.langs, { sensitivity: "base" })
         );
         return list;
     }
diff --git a/ts/deck-options/strings.ts b/ts/deck-options/strings.ts
index d4d686a23..81d6da34d 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 * as tr from "../lib/i18n";
+import { tr } from "../lib/i18n";
 
 export const reviewMixChoices = (): string[] => [
     tr.deckConfigReviewMixMixWithReviews(),
diff --git a/ts/editor/ClozeButton.svelte b/ts/editor/ClozeButton.svelte
index 4c375eb26..5cae3a426 100644
--- a/ts/editor/ClozeButton.svelte
+++ b/ts/editor/ClozeButton.svelte
@@ -3,12 +3,11 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "../lib/i18n";
-
     import IconButton from "../components/IconButton.svelte";
     import WithShortcut from "../components/WithShortcut.svelte";
     import OnlyEditable from "./OnlyEditable.svelte";
 
+    import { tr } from "../lib/i18n";
     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 10a90c954..70a1520f1 100644
--- a/ts/editor/ColorButtons.svelte
+++ b/ts/editor/ColorButtons.svelte
@@ -3,8 +3,6 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "../lib/i18n";
-
     import ButtonGroup from "../components/ButtonGroup.svelte";
     import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
     import IconButton from "../components/IconButton.svelte";
@@ -13,6 +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 { 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 5edfa3f43..8b7f988dd 100644
--- a/ts/editor/FormatBlockButtons.svelte
+++ b/ts/editor/FormatBlockButtons.svelte
@@ -3,8 +3,6 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "../lib/i18n";
-
     import ButtonGroup from "../components/ButtonGroup.svelte";
     import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
     import IconButton from "../components/IconButton.svelte";
@@ -14,6 +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 { getListItem } from "../lib/dom";
     import { getCurrentField, execCommand } from "./helpers";
     import {
diff --git a/ts/editor/FormatInlineButtons.svelte b/ts/editor/FormatInlineButtons.svelte
index fd78805b9..62882635a 100644
--- a/ts/editor/FormatInlineButtons.svelte
+++ b/ts/editor/FormatInlineButtons.svelte
@@ -3,12 +3,11 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "../lib/i18n";
-
     import ButtonGroup from "../components/ButtonGroup.svelte";
     import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
     import CommandIconButton from "./CommandIconButton.svelte";
 
+    import { tr } from "../lib/i18n";
     import {
         boldIcon,
         italicIcon,
diff --git a/ts/editor/ImageHandleFloatButtons.svelte b/ts/editor/ImageHandleFloatButtons.svelte
index 3778d364a..0568dcc7a 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
 
     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 1c32223db..170e1b065 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
 
     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 0dac7cf79..19657d376 100644
--- a/ts/editor/MathjaxHandleInlineBlock.svelte
+++ b/ts/editor/MathjaxHandleInlineBlock.svelte
@@ -3,12 +3,11 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "../lib/i18n";
-
     import ButtonGroup from "../components/ButtonGroup.svelte";
     import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
     import IconButton from "../components/IconButton.svelte";
 
+    import { tr } from "../lib/i18n";
     import { inlineIcon, blockIcon } from "./icons";
 
     export let activeImage: HTMLImageElement;
diff --git a/ts/editor/NoteTypeButtons.svelte b/ts/editor/NoteTypeButtons.svelte
index 1bb7c976a..19655a88e 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     import { withButton } from "../components/helpers";
 
     import ButtonGroup from "../components/ButtonGroup.svelte";
diff --git a/ts/editor/PreviewButton.svelte b/ts/editor/PreviewButton.svelte
index 443802722..61b25ad43 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     import { withButton } from "../components/helpers";
 
     import WithShortcut from "../components/WithShortcut.svelte";
diff --git a/ts/editor/TemplateButtons.svelte b/ts/editor/TemplateButtons.svelte
index f116e0684..fe721b0b6 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 * as tr from "../lib/i18n";
+    import { tr } from "../lib/i18n";
     import { bridgeCommand } from "../lib/bridgecommand";
     import { fieldFocusedKey, inCodableKey } from "./context-keys";
 
diff --git a/ts/editor/index.ts b/ts/editor/index.ts
index 6101098ef..41a6081bf 100644
--- a/ts/editor/index.ts
+++ b/ts/editor/index.ts
@@ -13,7 +13,7 @@ import type EditorToolbar from "./EditorToolbar.svelte";
 import type TagEditor from "./TagEditor.svelte";
 
 import { filterHTML } from "../html-filter";
-import { setupI18n, ModuleName } from "../lib/i18n";
+import { setupI18n, tr } from "../lib/i18n";
 import { isApplePlatform } from "../lib/platform";
 import { registerShortcut } from "../lib/shortcuts";
 import { bridgeCommand } from "../lib/bridgecommand";
@@ -200,10 +200,10 @@ export function setTags(tags: string[]): void {
 
 export const i18n = setupI18n({
     modules: [
-        ModuleName.EDITING,
-        ModuleName.KEYBOARD,
-        ModuleName.ACTIONS,
-        ModuleName.BROWSING,
+        tr.ModuleName.EDITING,
+        tr.ModuleName.KEYBOARD,
+        tr.ModuleName.ACTIONS,
+        tr.ModuleName.BROWSING,
     ],
 });
 
diff --git a/ts/editor/label-container.ts b/ts/editor/label-container.ts
index 98afe9986..6b558b743 100644
--- a/ts/editor/label-container.ts
+++ b/ts/editor/label-container.ts
@@ -2,8 +2,7 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import type { EditorField } from "./editor-field";
-import * as tr from "../lib/i18n";
-
+import { tr } from "../lib/i18n";
 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 56bd08eeb..c4791ca7c 100644
--- a/ts/graphs/AddedGraph.svelte
+++ b/ts/graphs/AddedGraph.svelte
@@ -13,6 +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 { RevlogRange, GraphRange } from "./graph-helpers";
     import type { TableDatum, SearchEventMap } from "./graph-helpers";
     import type { HistogramData } from "./histogram-graph";
@@ -20,7 +21,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { GraphData } from "./added";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "../lib/i18n";
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
 
     let histogramData = null as HistogramData | null;
diff --git a/ts/graphs/ButtonsGraph.svelte b/ts/graphs/ButtonsGraph.svelte
index 21b41f326..39cf1375e 100644
--- a/ts/graphs/ButtonsGraph.svelte
+++ b/ts/graphs/ButtonsGraph.svelte
@@ -4,6 +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 Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
@@ -15,7 +16,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { defaultGraphBounds, GraphRange, RevlogRange } from "./graph-helpers";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "../lib/i18n";
     export let revlogRange: RevlogRange;
 
     let graphRange: GraphRange = GraphRange.Year;
diff --git a/ts/graphs/CalendarGraph.svelte b/ts/graphs/CalendarGraph.svelte
index be5fdb4e7..84b33945a 100644
--- a/ts/graphs/CalendarGraph.svelte
+++ b/ts/graphs/CalendarGraph.svelte
@@ -3,10 +3,10 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
+    import { createEventDispatcher } from "svelte";
     import type { Stats } from "../lib/proto";
     import type { PreferenceStore } from "../sveltelib/preferences";
-
-    import { createEventDispatcher } from "svelte";
+    import { tr } from "../lib/i18n";
 
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
@@ -21,7 +21,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let sourceData: Stats.GraphsResponse;
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
     export let revlogRange: RevlogRange;
-    import * as tr from "../lib/i18n";
     export let nightMode: boolean;
 
     let { calendarFirstDayOfWeek } = preferences;
diff --git a/ts/graphs/CardCounts.svelte b/ts/graphs/CardCounts.svelte
index b72781968..3d43c8d0d 100644
--- a/ts/graphs/CardCounts.svelte
+++ b/ts/graphs/CardCounts.svelte
@@ -3,20 +3,19 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { createEventDispatcher } from "svelte";
-    import type { Stats } from "../lib/proto";
-    import type { PreferenceStore } from "../sveltelib/preferences";
-
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
 
+    import { createEventDispatcher } from "svelte";
+    import type { Stats } from "../lib/proto";
+    import type { PreferenceStore } from "../sveltelib/preferences";
+    import { tr as trI18n } from "../lib/i18n";
     import { defaultGraphBounds } from "./graph-helpers";
     import type { SearchEventMap } from "./graph-helpers";
     import { gatherData, renderCards } from "./card-counts";
     import type { GraphData, TableDatum } from "./card-counts";
 
     export let sourceData: Stats.GraphsResponse;
-    import * as tr2 from "../lib/i18n";
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
 
     let { cardCountsSeparateInactive, browserLinksSupported } = preferences;
@@ -36,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 = tr2.statisticsCountsSeparateSuspendedBuriedCards();
-    const total = tr2.statisticsCountsTotalCards();
+    const label = trI18n.statisticsCountsSeparateSuspendedBuriedCards();
+    const total = trI18n.statisticsCountsTotalCards();
 </script>
 
 <Graph title={graphData.title}>
diff --git a/ts/graphs/EaseGraph.svelte b/ts/graphs/EaseGraph.svelte
index 2a2f0ceae..5a55c9ff7 100644
--- a/ts/graphs/EaseGraph.svelte
+++ b/ts/graphs/EaseGraph.svelte
@@ -4,10 +4,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import type { Stats } from "../lib/proto";
-    import * as tr from "../lib/i18n";
     import type { PreferenceStore } from "../sveltelib/preferences";
 
     import { createEventDispatcher } from "svelte";
+    import { tr } from "../lib/i18n";
 
     import HistogramGraph from "./HistogramGraph.svelte";
     import Graph from "./Graph.svelte";
diff --git a/ts/graphs/FutureDue.svelte b/ts/graphs/FutureDue.svelte
index 36982e686..b8af6ca30 100644
--- a/ts/graphs/FutureDue.svelte
+++ b/ts/graphs/FutureDue.svelte
@@ -14,6 +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 type { HistogramData } from "./histogram-graph";
     import { GraphRange, RevlogRange } from "./graph-helpers";
     import type { TableDatum, SearchEventMap } from "./graph-helpers";
@@ -21,7 +22,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { GraphData } from "./future-due";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "../lib/i18n";
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
 
     const dispatch = createEventDispatcher<SearchEventMap>();
diff --git a/ts/graphs/GraphRangeRadios.svelte b/ts/graphs/GraphRangeRadios.svelte
index b7c6d9201..d93b76587 100644
--- a/ts/graphs/GraphRangeRadios.svelte
+++ b/ts/graphs/GraphRangeRadios.svelte
@@ -3,10 +3,10 @@ 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 { RevlogRange, GraphRange } from "./graph-helpers";
     import { timeSpan, MONTH, YEAR } from "../lib/time";
 
-    import * as tr from "../lib/i18n";
     export let revlogRange: RevlogRange;
     export let graphRange: GraphRange;
     export let followRevlog: boolean = false;
diff --git a/ts/graphs/HourGraph.svelte b/ts/graphs/HourGraph.svelte
index 75000da15..c75712535 100644
--- a/ts/graphs/HourGraph.svelte
+++ b/ts/graphs/HourGraph.svelte
@@ -3,8 +3,6 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Stats } from "../lib/proto";
-
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
     import AxisTicks from "./AxisTicks.svelte";
@@ -12,11 +10,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import GraphRangeRadios from "./GraphRangeRadios.svelte";
     import CumulativeOverlay from "./CumulativeOverlay.svelte";
     import HoverColumns from "./HoverColumns.svelte";
+
+    import type { Stats } from "../lib/proto";
+    import { tr } from "../lib/i18n";
     import { defaultGraphBounds, RevlogRange, GraphRange } from "./graph-helpers";
     import { renderHours } from "./hours";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "../lib/i18n";
     export let revlogRange: RevlogRange;
     let graphRange: GraphRange = GraphRange.Year;
 
diff --git a/ts/graphs/IntervalsGraph.svelte b/ts/graphs/IntervalsGraph.svelte
index 85d1e81f4..ff107ca9d 100644
--- a/ts/graphs/IntervalsGraph.svelte
+++ b/ts/graphs/IntervalsGraph.svelte
@@ -3,17 +3,16 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { timeSpan, MONTH } from "../lib/time";
-
-    import type { Stats } from "../lib/proto";
-    import type { PreferenceStore } from "../sveltelib/preferences";
-    import { createEventDispatcher } from "svelte";
-
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
     import HistogramGraph from "./HistogramGraph.svelte";
     import TableData from "./TableData.svelte";
 
+    import { timeSpan, MONTH } from "../lib/time";
+    import { tr } from "../lib/i18n";
+    import type { Stats } from "../lib/proto";
+    import type { PreferenceStore } from "../sveltelib/preferences";
+    import { createEventDispatcher } from "svelte";
     import type { HistogramData } from "./histogram-graph";
     import {
         gatherIntervalData,
@@ -24,7 +23,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { TableDatum, SearchEventMap } from "./graph-helpers";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "../lib/i18n";
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
 
     const dispatch = createEventDispatcher<SearchEventMap>();
diff --git a/ts/graphs/NoDataOverlay.svelte b/ts/graphs/NoDataOverlay.svelte
index 64aa1c99d..3d68f3ce3 100644
--- a/ts/graphs/NoDataOverlay.svelte
+++ b/ts/graphs/NoDataOverlay.svelte
@@ -4,8 +4,10 @@ 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";
+
     export let bounds: GraphBounds;
-    import * as tr from "../lib/i18n";
+
     const noData = tr.statisticsNoData();
 </script>
 
diff --git a/ts/graphs/RangeBox.svelte b/ts/graphs/RangeBox.svelte
index b4285beb5..f71a237f2 100644
--- a/ts/graphs/RangeBox.svelte
+++ b/ts/graphs/RangeBox.svelte
@@ -3,11 +3,10 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Writable } from "svelte/store";
-
     import InputBox from "./InputBox.svelte";
 
-    import * as tr from "../lib/i18n";
+    import type { Writable } from "svelte/store";
+    import { tr } from "../lib/i18n";
     import { RevlogRange, daysToRevlogRange } from "./graph-helpers";
 
     enum SearchRange {
diff --git a/ts/graphs/ReviewsGraph.svelte b/ts/graphs/ReviewsGraph.svelte
index 7c024e23f..7df118d8f 100644
--- a/ts/graphs/ReviewsGraph.svelte
+++ b/ts/graphs/ReviewsGraph.svelte
@@ -3,8 +3,6 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Stats } from "../lib/proto";
-
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
     import NoDataOverlay from "./NoDataOverlay.svelte";
@@ -14,6 +12,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import AxisTicks from "./AxisTicks.svelte";
     import HoverColumns from "./HoverColumns.svelte";
 
+    import type { Stats } from "../lib/proto";
+    import { tr } from "../lib/i18n";
     import { defaultGraphBounds, RevlogRange, GraphRange } from "./graph-helpers";
     import type { TableDatum } from "./graph-helpers";
     import { gatherData, renderReviews } from "./reviews";
@@ -21,7 +21,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     export let sourceData: Stats.GraphsResponse | null = null;
     export let revlogRange: RevlogRange;
-    import * as tr from "../lib/i18n";
 
     let graphData: GraphData | null = null;
 
diff --git a/ts/graphs/added.ts b/ts/graphs/added.ts
index db4877c85..fdcc8f641 100644
--- a/ts/graphs/added.ts
+++ b/ts/graphs/added.ts
@@ -19,10 +19,10 @@ import {
 import type { Bin } from "d3";
 import type { HistogramData } from "./histogram-graph";
 
+import { tr } from "../lib/i18n";
 import { dayLabel } from "../lib/time";
 import { GraphRange } from "./graph-helpers";
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
-import * as tr from "../lib/i18n";
 
 export interface GraphData {
     daysAdded: number[];
diff --git a/ts/graphs/buttons.ts b/ts/graphs/buttons.ts
index 3c77166e6..f243e4bd0 100644
--- a/ts/graphs/buttons.ts
+++ b/ts/graphs/buttons.ts
@@ -6,8 +6,6 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { Stats } from "../lib/proto";
-
 import {
     interpolateRdYlGn,
     select,
@@ -19,6 +17,8 @@ import {
     axisLeft,
     sum,
 } from "d3";
+import { Stats } from "../lib/proto";
+import { tr } from "../lib/i18n";
 import { showTooltip, hideTooltip } from "./tooltip";
 import {
     GraphBounds,
@@ -26,7 +26,6 @@ import {
     GraphRange,
     millisecondCutoffForRange,
 } from "./graph-helpers";
-import * as tr from "../lib/i18n";
 
 type ButtonCounts = [number, number, number, number];
 
diff --git a/ts/graphs/calendar.ts b/ts/graphs/calendar.ts
index 3bea00fbb..26b83d4b9 100644
--- a/ts/graphs/calendar.ts
+++ b/ts/graphs/calendar.ts
@@ -29,8 +29,7 @@ import {
     SearchDispatch,
 } from "./graph-helpers";
 import { clickableClass } from "./graph-styles";
-import { i18n } from "../lib/i18n";
-import * as tr from "../lib/i18n";
+import { tr, i18n } from "../lib/i18n";
 
 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 0d2f0faf7..54a1da371 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -6,6 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
+import { tr } from "../lib/i18n";
 import { CardQueue, CardType } from "../lib/cards";
 import type { Stats, Cards } from "../lib/proto";
 import {
@@ -22,8 +23,6 @@ import {
 } from "d3";
 import type { GraphBounds } from "./graph-helpers";
 
-import * as tr from "../lib/i18n";
-
 type Count = [string, number, boolean, string];
 export interface GraphData {
     title: string;
diff --git a/ts/graphs/ease.ts b/ts/graphs/ease.ts
index 5b28ee58d..791904c35 100644
--- a/ts/graphs/ease.ts
+++ b/ts/graphs/ease.ts
@@ -16,11 +16,10 @@ import {
     interpolateRdYlGn,
 } from "d3";
 import type { Bin, ScaleLinear } from "d3";
+import { tr } from "../lib/i18n";
 import { CardType } from "../lib/cards";
 import type { HistogramData } from "./histogram-graph";
-
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
-import * as tr from "../lib/i18n";
 
 export interface GraphData {
     eases: number[];
diff --git a/ts/graphs/future-due.ts b/ts/graphs/future-due.ts
index 67d5ba0ed..0fd5c97c5 100644
--- a/ts/graphs/future-due.ts
+++ b/ts/graphs/future-due.ts
@@ -17,13 +17,13 @@ import {
     interpolateGreens,
 } from "d3";
 import type { Bin } from "d3";
+import { tr } from "../lib/i18n";
 import { CardQueue } from "../lib/cards";
 import type { HistogramData } from "./histogram-graph";
 import { dayLabel } from "../lib/time";
 
 import { GraphRange } from "./graph-helpers";
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
-import * as tr from "../lib/i18n";
 
 export interface GraphData {
     dueCounts: Map<number, number>;
diff --git a/ts/graphs/hours.ts b/ts/graphs/hours.ts
index 1508c6928..3f0cdbba2 100644
--- a/ts/graphs/hours.ts
+++ b/ts/graphs/hours.ts
@@ -21,6 +21,7 @@ import {
     curveBasis,
 } from "d3";
 
+import { tr } from "../lib/i18n";
 import { showTooltip, hideTooltip } from "./tooltip";
 import {
     GraphBounds,
@@ -29,7 +30,6 @@ import {
     millisecondCutoffForRange,
 } from "./graph-helpers";
 import { oddTickClass } from "./graph-styles";
-import * as tr from "../lib/i18n";
 
 interface Hour {
     hour: number;
diff --git a/ts/graphs/index.ts b/ts/graphs/index.ts
index bee33dd83..436f101e8 100644
--- a/ts/graphs/index.ts
+++ b/ts/graphs/index.ts
@@ -3,7 +3,7 @@
 
 import type { SvelteComponent } from "svelte/internal";
 
-import { setupI18n, ModuleName } from "../lib/i18n";
+import { setupI18n, tr } from "../lib/i18n";
 import { checkNightMode } from "../lib/nightmode";
 
 import GraphsPage from "./GraphsPage.svelte";
@@ -33,16 +33,18 @@ export function graphs(
 ): void {
     const nightMode = checkNightMode();
 
-    setupI18n({ modules: [ModuleName.STATISTICS, ModuleName.SCHEDULING] }).then(() => {
-        new GraphsPage({
-            target,
-            props: {
-                graphs,
-                nightMode,
-                initialSearch: search,
-                initialDays: days,
-                controller,
-            },
-        });
-    });
+    setupI18n({ modules: [tr.ModuleName.STATISTICS, tr.ModuleName.SCHEDULING] }).then(
+        () => {
+            new GraphsPage({
+                target,
+                props: {
+                    graphs,
+                    nightMode,
+                    initialSearch: search,
+                    initialDays: days,
+                    controller,
+                },
+            });
+        }
+    );
 }
diff --git a/ts/graphs/intervals.ts b/ts/graphs/intervals.ts
index 22372a03c..64c2cf7f0 100644
--- a/ts/graphs/intervals.ts
+++ b/ts/graphs/intervals.ts
@@ -18,12 +18,12 @@ import {
     interpolateBlues,
 } from "d3";
 import type { Bin } from "d3";
+import { tr } from "../lib/i18n";
+import { timeSpan } from "../lib/time";
 import { CardType } from "../lib/cards";
 import type { HistogramData } from "./histogram-graph";
 
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
-import { timeSpan } from "../lib/time";
-import * as tr from "../lib/i18n";
 
 export interface IntervalGraphData {
     intervals: number[];
diff --git a/ts/graphs/reviews.ts b/ts/graphs/reviews.ts
index f31f7e161..2952c4074 100644
--- a/ts/graphs/reviews.ts
+++ b/ts/graphs/reviews.ts
@@ -32,10 +32,10 @@ import {
 } from "d3";
 import type { Bin } from "d3";
 
+import { tr } from "../lib/i18n";
 import type { TableDatum } from "./graph-helpers";
 import { GraphBounds, setDataAvailable, GraphRange } from "./graph-helpers";
 import { showTooltip, hideTooltip } from "./tooltip";
-import * as tr from "../lib/i18n";
 
 interface Reviews {
     learn: number;
diff --git a/ts/graphs/today.ts b/ts/graphs/today.ts
index 07e5a12e7..3b7835cb5 100644
--- a/ts/graphs/today.ts
+++ b/ts/graphs/today.ts
@@ -3,8 +3,7 @@
 
 import { Stats } from "../lib/proto";
 import { studiedToday } from "../lib/time";
-
-import * as tr from "../lib/i18n";
+import { tr } from "../lib/i18n";
 
 export interface TodayData {
     title: string;
diff --git a/ts/lib/BUILD.bazel b/ts/lib/BUILD.bazel
index 10811be31..d587aea7b 100644
--- a/ts/lib/BUILD.bazel
+++ b/ts/lib/BUILD.bazel
@@ -25,7 +25,7 @@ py_binary(
 
 genrule(
     name = "fluent_gen",
-    outs = ["i18n.ts"],
+    outs = ["i18n-generated.ts"],
     cmd = "$(location genfluent) $(location //rslib/i18n:strings.json) $@",
     tools = [
         "genfluent",
@@ -36,7 +36,7 @@ genrule(
 typescript(
     name = "lib",
     generated = [
-        ":i18n.ts",
+        ":i18n-generated.ts",
     ],
     deps = [
         ":backend_proto",
diff --git a/ts/lib/genfluent.py b/ts/lib/genfluent.py
index 3944aad5f..d2ca94b9e 100644
--- a/ts/lib/genfluent.py
+++ b/ts/lib/genfluent.py
@@ -18,8 +18,7 @@ class Variable(TypedDict):
 
 def methods() -> str:
     out = [
-        'import { i18n } from "./i18n_helpers";',
-        'export { i18n, setupI18n } from "./i18n_helpers";',
+        'import { i18n } from "./i18n";',
     ]
     for module in modules:
         for translation in module["translations"]:
diff --git a/ts/lib/i18n_helpers.ts b/ts/lib/i18n.ts
similarity index 97%
rename from ts/lib/i18n_helpers.ts
rename to ts/lib/i18n.ts
index 5852d6444..a49dba1b9 100644
--- a/ts/lib/i18n_helpers.ts
+++ b/ts/lib/i18n.ts
@@ -79,7 +79,7 @@ export class I18n {
 // global singleton
 export const i18n = new I18n();
 
-import type { ModuleName } from "./i18n";
+import type { ModuleName } from "./i18n-generated";
 
 export async function setupI18n(args: { modules: ModuleName[] }): Promise<void> {
     const resp = await fetch("/_anki/i18nResources", {
@@ -102,3 +102,5 @@ export async function setupI18n(args: { modules: ModuleName[] }): Promise<void>
     }
     i18n.langs = json.langs;
 }
+
+export * as tr from "./i18n-generated";
diff --git a/ts/lib/keys.ts b/ts/lib/keys.ts
index ef7bcad15..66611e367 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 * as tr from "./i18n";
+import { tr } from "./i18n";
 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 c59e4fd8a..ef6a05604 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 * as tr from "./i18n";
+import { tr } from "./i18n";
 
 export const SECOND = 1.0;
 export const MINUTE = 60.0 * SECOND;
diff --git a/ts/lib/tsconfig.json b/ts/lib/tsconfig.json
index b6329a3e3..78e6380d6 100644
--- a/ts/lib/tsconfig.json
+++ b/ts/lib/tsconfig.json
@@ -1,6 +1,7 @@
 {
     "extends": "../tsconfig.json",
-    "include": ["*", "../../bazel-bin/ts/lib"],
+    "include": ["*"],
+    "rootDirs": ["../../bazel-bin/ts/lib"],
     "references": [],
     "compilerOptions": {
         "types": ["jest"]