diff --git a/src/index.ts b/src/index.ts index 6258c2e..0839045 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,7 +3,7 @@ import "./utils/global"; import { BxEvent } from "./utils/bx-event"; import { BX_FLAGS } from "./utils/bx-flags"; import { BxExposed } from "./utils/bx-exposed"; -import { t } from "./modules/translation"; +import { t } from "./utils/translation"; import { CE } from "./utils/html"; import { showGamepadToast } from "./utils/gamepad"; import { MkbHandler } from "./modules/mkb/mkb-handler"; diff --git a/src/modules/dialog.ts b/src/modules/dialog.ts index 65624e3..e31a83e 100644 --- a/src/modules/dialog.ts +++ b/src/modules/dialog.ts @@ -1,4 +1,4 @@ -import { t } from "./translation"; +import { t } from "../utils/translation"; import { CE, createButton, ButtonStyle, Icon } from "../utils/html"; type DialogOptions = { diff --git a/src/modules/loading-screen.ts b/src/modules/loading-screen.ts index 5658b7e..a22623b 100644 --- a/src/modules/loading-screen.ts +++ b/src/modules/loading-screen.ts @@ -2,7 +2,7 @@ import { CE } from "../utils/html"; import { getPreferredServerRegion } from "../utils/region"; import { TitlesInfo } from "../utils/titles-info"; import { PrefKey, getPref } from "./preferences"; -import { t } from "./translation"; +import { t } from "../utils/translation"; export class LoadingScreen { static #$bgStyle: HTMLElement; diff --git a/src/modules/mkb/mkb-handler.ts b/src/modules/mkb/mkb-handler.ts index 9ba6200..828c42a 100644 --- a/src/modules/mkb/mkb-handler.ts +++ b/src/modules/mkb/mkb-handler.ts @@ -4,7 +4,7 @@ import { createButton, Icon, ButtonStyle, CE } from "../../utils/html"; import { BxEvent } from "../../utils/bx-event"; import { PrefKey, getPref } from "../preferences"; import { Toast } from "../../utils/toast"; -import { t } from "../translation"; +import { t } from "../../utils/translation"; import { LocalDb } from "../../utils/local-db"; import { KeyHelper } from "./key-helper"; import type { MkbStoredPreset } from "../../types/mkb"; diff --git a/src/modules/mkb/mkb-preset.ts b/src/modules/mkb/mkb-preset.ts index 2ec5a43..a084823 100644 --- a/src/modules/mkb/mkb-preset.ts +++ b/src/modules/mkb/mkb-preset.ts @@ -1,4 +1,4 @@ -import { t } from "../translation"; +import { t } from "../../utils/translation"; import { SettingElementType } from "../settings"; import { GamepadKey, MouseButtonCode, MouseMapTo, MkbPresetKey } from "./definitions"; import { MkbHandler } from "./mkb-handler"; diff --git a/src/modules/mkb/mkb-remapper.ts b/src/modules/mkb/mkb-remapper.ts index 4f0a2e2..f1c64cf 100644 --- a/src/modules/mkb/mkb-remapper.ts +++ b/src/modules/mkb/mkb-remapper.ts @@ -1,6 +1,6 @@ import { GamepadKey } from "./definitions"; import { CE, createButton, ButtonStyle } from "../../utils/html"; -import { t } from "../translation"; +import { t } from "../../utils/translation"; import { Dialog } from "../dialog"; import { getPref, setPref, PrefKey } from "../preferences"; import { MkbPresetKey, GamepadKeyName } from "./definitions"; diff --git a/src/modules/preferences.ts b/src/modules/preferences.ts index 0183af2..c70d1f7 100644 --- a/src/modules/preferences.ts +++ b/src/modules/preferences.ts @@ -1,5 +1,5 @@ import { CE } from "../utils/html"; -import { SUPPORTED_LANGUAGES, t } from "./translation"; +import { SUPPORTED_LANGUAGES, t } from "../utils/translation"; import { SettingElement, SettingElementType } from "./settings"; import { UserAgentProfile } from "../utils/user-agent"; import { StreamStat } from "./stream/stream-stats"; diff --git a/src/modules/remote-play.ts b/src/modules/remote-play.ts index 6276f21..007bbca 100644 --- a/src/modules/remote-play.ts +++ b/src/modules/remote-play.ts @@ -3,7 +3,7 @@ import { CE, createButton, ButtonStyle, Icon } from "../utils/html"; import { Toast } from "../utils/toast"; import { BxEvent } from "../utils/bx-event"; import { getPref, PrefKey, setPref } from "./preferences"; -import { t } from "./translation"; +import { t } from "../utils/translation"; import { localRedirect } from "./ui/ui"; enum RemotePlayConsoleState { diff --git a/src/modules/stream/stream-badges.ts b/src/modules/stream/stream-badges.ts index 51a56af..5b4e83d 100644 --- a/src/modules/stream/stream-badges.ts +++ b/src/modules/stream/stream-badges.ts @@ -1,4 +1,4 @@ -import { t } from "../translation"; +import { t } from "../../utils/translation"; import { BxEvent } from "../../utils/bx-event"; import { CE } from "../../utils/html"; import { STATES } from "../../utils/global"; diff --git a/src/modules/stream/stream-stats.ts b/src/modules/stream/stream-stats.ts index 35e2b94..177f205 100644 --- a/src/modules/stream/stream-stats.ts +++ b/src/modules/stream/stream-stats.ts @@ -3,7 +3,7 @@ import { BxEvent } from "../../utils/bx-event" import { getPref } from "../preferences" import { StreamBadges } from "./stream-badges" import { CE } from "../../utils/html" -import { t } from "../translation" +import { t } from "../../utils/translation" import { STATES } from "../../utils/global" export enum StreamStat { diff --git a/src/modules/stream/stream-ui.ts b/src/modules/stream/stream-ui.ts index d3b72bd..1ece398 100644 --- a/src/modules/stream/stream-ui.ts +++ b/src/modules/stream/stream-ui.ts @@ -2,7 +2,7 @@ import { STATES } from "../../utils/global"; import { Icon } from "../../utils/html"; import { BxEvent } from "../../utils/bx-event"; import { PrefKey, getPref } from "../preferences"; -import { t } from "../translation"; +import { t } from "../../utils/translation"; import { StreamBadges } from "./stream-badges"; import { StreamStats } from "./stream-stats"; diff --git a/src/modules/touch-controller.ts b/src/modules/touch-controller.ts index 7eb014e..02c3309 100644 --- a/src/modules/touch-controller.ts +++ b/src/modules/touch-controller.ts @@ -4,7 +4,7 @@ import { Toast } from "../utils/toast"; import { BxEvent } from "../utils/bx-event"; import { BX_FLAGS } from "../utils/bx-flags"; import { getPref, PrefKey } from "./preferences"; -import { t } from "./translation"; +import { t } from "../utils/translation"; export class TouchController { static readonly #EVENT_SHOW_DEFAULT_CONTROLLER = new MessageEvent('message', { diff --git a/src/modules/ui/global-settings.ts b/src/modules/ui/global-settings.ts index 94c702e..1ea8887 100644 --- a/src/modules/ui/global-settings.ts +++ b/src/modules/ui/global-settings.ts @@ -3,7 +3,7 @@ import { CE, createButton, Icon, ButtonStyle } from "../../utils/html"; import { getPreferredServerRegion } from "../../utils/region"; import { UserAgent, UserAgentProfile } from "../../utils/user-agent"; import { getPref, Preferences, PrefKey, setPref, toPrefElement } from "../preferences"; -import { t, refreshCurrentLocale } from "../translation"; +import { t, refreshCurrentLocale } from "../../utils/translation"; const SETTINGS_UI = { 'Better xCloud': { diff --git a/src/modules/ui/header.ts b/src/modules/ui/header.ts index e3ba6cc..e3b674f 100644 --- a/src/modules/ui/header.ts +++ b/src/modules/ui/header.ts @@ -3,7 +3,7 @@ import { createButton, Icon, ButtonStyle } from "../../utils/html"; import { getPreferredServerRegion } from "../../utils/region"; import { PrefKey, getPref } from "../preferences"; import { RemotePlay } from "../remote-play"; -import { t } from "../translation"; +import { t } from "../../utils/translation"; import { setupSettingsUi } from "./global-settings"; diff --git a/src/modules/ui/ui.ts b/src/modules/ui/ui.ts index e7d6f77..0c9ad20 100644 --- a/src/modules/ui/ui.ts +++ b/src/modules/ui/ui.ts @@ -7,7 +7,7 @@ import { getPref, PrefKey, toPrefElement } from "../preferences"; import { setupScreenshotButton } from "../screenshot"; import { StreamStats } from "../stream/stream-stats"; import { TouchController } from "../touch-controller"; -import { t } from "../translation"; +import { t } from "../../utils/translation"; import { VibrationManager } from "../vibration-manager"; diff --git a/src/utils/gamepad.ts b/src/utils/gamepad.ts index aedf311..c160a00 100644 --- a/src/utils/gamepad.ts +++ b/src/utils/gamepad.ts @@ -1,6 +1,6 @@ import { MkbHandler } from "../modules/mkb/mkb-handler"; import { PrefKey, getPref } from "../modules/preferences"; -import { t } from "../modules/translation"; +import { t } from "./translation"; import { Toast } from "./toast"; // Show a toast when connecting/disconecting controller diff --git a/src/utils/local-db.ts b/src/utils/local-db.ts index fc8c850..93a0cbf 100644 --- a/src/utils/local-db.ts +++ b/src/utils/local-db.ts @@ -1,6 +1,6 @@ import { MkbPreset } from "../modules/mkb/mkb-preset"; import { PrefKey, setPref } from "../modules/preferences"; -import { t } from "../modules/translation"; +import { t } from "./translation"; import type { MkbStoredPreset, MkbStoredPresets } from "../types/mkb"; export class LocalDb { diff --git a/src/modules/translation.ts b/src/utils/translation.ts similarity index 100% rename from src/modules/translation.ts rename to src/utils/translation.ts