diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json
index b63495ab6..3ac713e18 100644
--- a/packages/i18n/strings/en.json
+++ b/packages/i18n/strings/en.json
@@ -4,6 +4,13 @@
"settings": "Settings"
},
+ "settings": {
+ "language": "Language",
+ "device_language": "Device language",
+ "auto_load_models": "Auto-load models",
+ "developer_mode": "Developer mode"
+ },
+
"mixer": {
"screenshot": "Screenshot",
"randomize": "Randomize"
@@ -477,60 +484,23 @@
},
"tools": {
- "home": {
- "name": "Home"
- },
- "tanks": {
- "name": "Tankopedia"
- },
- "avatars": {
- "name": "Avatars"
- },
- "backgrounds": {
- "name": "Backgrounds"
- },
- "api": {
- "name": "API"
- },
- "players": {
- "name": "Players"
- },
- "compare": {
- "name": "Compare"
- },
- "performance": {
- "name": "Performance"
- },
- "playlist": {
- "name": "Playlist"
- },
- "mixer": {
- "name": "Mixer"
- },
- "session": {
- "name": "Session"
- },
- "guesser": {
- "name": "Guesser"
- },
- "changelogs": {
- "name": "Changelogs"
- },
- "settings": {
- "name": "Settings"
- },
- "tier_list": {
- "name": "Tier list"
- },
- "embed": {
- "name": "Embed"
- },
- "more": {
- "name": "More"
- },
- "credits": {
- "name": "Credits"
- }
+ "home": "Home",
+ "tanks": "Tankopedia",
+ "avatars": "Avatars",
+ "backgrounds": "Backgrounds",
+ "api": "API",
+ "players": "Players",
+ "compare": "Compare",
+ "performance": "Performance",
+ "playlist": "Playlist",
+ "mixer": "Mixer",
+ "session": "Session",
+ "guesser": "Guesser",
+ "changelogs": "Changelogs",
+ "tier_list": "Tier list",
+ "embed": "Embed",
+ "more": "More",
+ "credits": "Credits"
},
"home": {
@@ -789,14 +759,6 @@
"body": "Where would you like to go?"
},
- "settings": {
- "title": "Settings",
- "description": "Change BlitzKit settings",
- "dev_mode": "Development mode",
- "auto_load_models": "Auto-load models",
- "language": "Language"
- },
-
"common": {
"copy_button": {
"copied": "Copied!"
diff --git a/packages/website/src/components/AlertDialog/index.module.css b/packages/website/src/components/AlertDialog/index.module.css
index 00309474a..f02ab0506 100644
--- a/packages/website/src/components/AlertDialog/index.module.css
+++ b/packages/website/src/components/AlertDialog/index.module.css
@@ -11,7 +11,7 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- z-index: 2;
+ z-index: 1;
display: flex;
flex-direction: column;
diff --git a/packages/website/src/components/ContextMenu/index.tsx b/packages/website/src/components/ContextMenu/index.tsx
index 241607390..246e18075 100644
--- a/packages/website/src/components/ContextMenu/index.tsx
+++ b/packages/website/src/components/ContextMenu/index.tsx
@@ -1,5 +1,9 @@
import { ContextMenu as _ } from "radix-ui";
import { composeRadixComponents } from "../../ui/compose";
+import { Discriminator } from "../DropdownMenu";
import styles from "./index.module.css";
-export const ContextMenu = composeRadixComponents(_, styles);
+export const ContextMenu = {
+ ...composeRadixComponents(_, styles),
+ Discriminator,
+};
diff --git a/packages/website/src/components/Dialog/index.module.css b/packages/website/src/components/Dialog/index.module.css
index 3d00ae05a..ae48503a7 100644
--- a/packages/website/src/components/Dialog/index.module.css
+++ b/packages/website/src/components/Dialog/index.module.css
@@ -11,7 +11,7 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- z-index: 2;
+ z-index: 1;
display: flex;
flex-direction: column;
@@ -49,7 +49,7 @@
}
.body {
- --scroller-curtain-color: var(--gray-2);
-
- flex: 1;
+ display: flex;
+ flex-direction: column;
+ gap: var(--space-4);
}
diff --git a/packages/website/src/components/Dialog/index.tsx b/packages/website/src/components/Dialog/index.tsx
index a0d238e88..f0a4082bb 100644
--- a/packages/website/src/components/Dialog/index.tsx
+++ b/packages/website/src/components/Dialog/index.tsx
@@ -2,7 +2,6 @@ import { Dialog as _ } from "radix-ui";
import type { ComponentProps } from "react";
import { classNames } from "../../ui/classNames";
import { composeRadixComponents } from "../../ui/compose";
-import { Scroller, ScrollerOrientation } from "../Scroller";
import styles from "./index.module.css";
// Groups a title and description
@@ -10,15 +9,9 @@ function Header({ className, ...props }: ComponentProps<"div">) {
return
;
}
-// Scrolls the content that follows the header
-function Body({ className, ...props }: ComponentProps) {
- return (
-
- );
+// Stacks the content that follows the header
+function Body({ className, ...props }: ComponentProps<"div">) {
+ return ;
}
export const Dialog = { ...composeRadixComponents(_, styles), Header, Body };
diff --git a/packages/website/src/components/DropdownMenu/index.module.css b/packages/website/src/components/DropdownMenu/index.module.css
index bf473b49e..1d09516d5 100644
--- a/packages/website/src/components/DropdownMenu/index.module.css
+++ b/packages/website/src/components/DropdownMenu/index.module.css
@@ -98,6 +98,11 @@
}
}
+ .discriminator {
+ display: inline;
+ margin-left: auto;
+ }
+
.ItemIndicator {
position: absolute;
left: 0;
diff --git a/packages/website/src/components/DropdownMenu/index.tsx b/packages/website/src/components/DropdownMenu/index.tsx
index 8afe69f1b..7cf70c2f0 100644
--- a/packages/website/src/components/DropdownMenu/index.tsx
+++ b/packages/website/src/components/DropdownMenu/index.tsx
@@ -1,5 +1,17 @@
import { DropdownMenu as _ } from "radix-ui";
+import type { ComponentProps } from "react";
+import { classNames } from "../../ui/classNames";
import { composeRadixComponents } from "../../ui/compose";
import styles from "./index.module.css";
-export const DropdownMenu = composeRadixComponents(_, styles);
+// Trailing text pushed to the right of an item, like flags or shortcuts
+export function Discriminator({ className, ...props }: ComponentProps<"span">) {
+ return (
+
+ );
+}
+
+export const DropdownMenu = {
+ ...composeRadixComponents(_, styles),
+ Discriminator,
+};
diff --git a/packages/website/src/components/Embeds/GenerateURL/index.module.css b/packages/website/src/components/Embeds/GenerateURL/index.module.css
index cd4c838e0..4e441a39b 100644
--- a/packages/website/src/components/Embeds/GenerateURL/index.module.css
+++ b/packages/website/src/components/Embeds/GenerateURL/index.module.css
@@ -2,12 +2,6 @@
width: fit-content;
}
-.search {
- display: flex;
- flex-direction: column;
- gap: var(--space-4);
-}
-
.results {
display: flex;
justify-content: center;
diff --git a/packages/website/src/components/Embeds/GenerateURL/index.tsx b/packages/website/src/components/Embeds/GenerateURL/index.tsx
index f900fe748..13dfe6a53 100644
--- a/packages/website/src/components/Embeds/GenerateURL/index.tsx
+++ b/packages/website/src/components/Embeds/GenerateURL/index.tsx
@@ -89,46 +89,44 @@ export function GenerateURL({ embed }: GenerateURLProps) {
-
-
-
-
+
+
+
-
- {searching && (
-
-
- {strings.common.search.searching}
-
- )}
+
+ {searching && (
+
+
+ {strings.common.search.searching}
+
+ )}
- {!searching && results.length === 0 && (
- {strings.common.search.no_results}
- )}
+ {!searching && results.length === 0 && (
+ {strings.common.search.no_results}
+ )}
- {!searching && results.length > 0 && (
-
- {results.map((result) => (
- {
- setCopyUser(result);
- setCopyDialogOpen(true);
- setSearchDialogOpen(false);
- }}
- />
- ))}
-
- )}
-
+ {!searching && results.length > 0 && (
+
+ {results.map((result) => (
+ {
+ setCopyUser(result);
+ setCopyDialogOpen(true);
+ setSearchDialogOpen(false);
+ }}
+ />
+ ))}
+
+ )}
diff --git a/packages/website/src/components/LocaleRedirector.astro b/packages/website/src/components/LocaleRedirector.astro
index 3805c19cc..f756f6361 100644
--- a/packages/website/src/components/LocaleRedirector.astro
+++ b/packages/website/src/components/LocaleRedirector.astro
@@ -1,27 +1,17 @@
diff --git a/packages/website/src/components/LocaleSelect/index.tsx b/packages/website/src/components/LocaleSelect/index.tsx
new file mode 100644
index 000000000..6230bca4e
--- /dev/null
+++ b/packages/website/src/components/LocaleSelect/index.tsx
@@ -0,0 +1,76 @@
+import { CaretDownIcon, DotFilledIcon, GlobeIcon } from "@radix-ui/react-icons";
+import { useState } from "react";
+import { getBestLocale } from "../../core/i18n/getBestLocale";
+import type { LocaleOption } from "../../core/i18n/getLocaleOptions";
+import { navigateToLocale } from "../../core/i18n/navigateToLocale";
+import { useLocale } from "../../hooks/useLocale";
+import { useStrings } from "../../hooks/useStrings";
+import { Select } from "../Select";
+
+export interface LocaleSelectProps {
+ options: LocaleOption[];
+}
+
+export function LocaleSelect({ options }: LocaleSelectProps) {
+ const locale = useLocale();
+ const strings = useStrings();
+ const [value] = useState(
+ () =>
+ `${localStorage.getItem("preferred-locale") === null ? null : locale}`,
+ );
+
+ return (
+
{
+ if (value === "null") {
+ localStorage.removeItem("preferred-locale");
+ navigateToLocale(getBestLocale());
+ } else {
+ localStorage.setItem("preferred-locale", value);
+ navigateToLocale(value);
+ }
+ }}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {strings.settings.device_language}
+
+
+
+
+
+
+ {options.map(({ locale, flag, name }) => (
+
+
+
+
+
+
+ {name}
+ {flag}
+
+
+ ))}
+
+
+
+
+ );
+}
diff --git a/packages/website/src/components/NavbarCourse.astro b/packages/website/src/components/NavbarCourse.astro
index bccfe56a6..fc052ad42 100644
--- a/packages/website/src/components/NavbarCourse.astro
+++ b/packages/website/src/components/NavbarCourse.astro
@@ -2,11 +2,13 @@
import { alias } from "@blitzkit/core";
import { CaretUpIcon, GearIcon } from "@radix-ui/react-icons";
import { api } from "../api/dynamic";
+import { getLocaleOptions } from "../core/i18n/getLocaleOptions";
import { Logo } from "../icons/Logo";
import { LinkI18nWrapper } from "./LinkI18nWrapper";
import { filtered, type Props as NavbarFineProps } from "./NavbarFine.astro";
import NavbarMobileAutoHide from "./NavbarMobileAutoHide.astro";
import { Scroller, ScrollerOrientation } from "./Scroller";
+import { SettingsDialog } from "./SettingsDialog";
import { Text } from "./Text";
export type Props = NavbarFineProps & {
@@ -16,6 +18,7 @@ export type Props = NavbarFineProps & {
const { locale, tool, solid = false } = Astro.props;
const strings = await api.strings(locale);
+const localeOptions = await getLocaleOptions();
---