-
+
-
+
-
+
-
+
-
+
@@ -45,4 +46,11 @@ const Settings = () => {
);
};
-render(() =>
, document.getElementById("root") as HTMLElement);
+render(
+ () => (
+
+
+
+ ),
+ document.getElementById("root") as HTMLElement
+);
diff --git a/src/store/app-store.ts b/src/store/app-store.ts
index 79ee8eb8..00584c94 100644
--- a/src/store/app-store.ts
+++ b/src/store/app-store.ts
@@ -2,15 +2,23 @@ import { BsStarFill } from "solid-icons/bs";
import { CgMore } from "solid-icons/cg";
import { TbSearch } from "solid-icons/tb";
import { VsHistory } from "solid-icons/vs";
-import { createRoot, createSignal } from "solid-js";
+import { createResource, createRoot, createSignal } from "solid-js";
+import { invokeCommand } from "../lib/tauri";
import { Tabs } from "../types";
import { HotkeyEvent } from "../types/enums";
-import { TAB_NAMES, Tab } from "../utils/constants";
+import { InvokeCommand } from "../types/tauri-invoke";
+import { LANGUAGES, LANGUAGE_KEY, TAB_NAMES, Tab } from "../utils/constants";
import { ClipboardStore } from "./clipboard-store";
import { HotkeyStore } from "./hotkey-store";
import { SettingsStore } from "./settings-store";
function createAppStore() {
+ const detectedLocale = localStorage.getItem(LANGUAGE_KEY) || Object.values(LANGUAGES)[0];
+
+ const [locale, setLocale] = createResource(
+ async () => (await invokeCommand(InvokeCommand.GetSettings))?.language || detectedLocale
+ );
+
const [tabs, setTabs] = createSignal
([
{
name: TAB_NAMES[0],
@@ -39,13 +47,14 @@ function createAppStore() {
]);
const changeTab = (id: Tab) => setTabs((prev) => prev.map((s) => ({ ...s, current: s.id === id })));
- const getCurrentTab = () => tabs().find((s) => s.current);
+ const getCurrentTab = () => tabs().find((s) => s.current)!;
const init = async () => {
HotkeyStore.initHotkeys();
ClipboardStore.initClipboards();
await SettingsStore.initSettings();
darkMode();
+ setLocale.refetch();
};
const darkMode = () =>
@@ -54,6 +63,8 @@ function createAppStore() {
: document.querySelector("html")?.classList?.remove?.("dark");
return {
+ locale,
+ setLocale,
tabs,
setTabs,
changeTab,
diff --git a/src/store/clipboard-store.ts b/src/store/clipboard-store.ts
index 02544ed1..60a9013d 100644
--- a/src/store/clipboard-store.ts
+++ b/src/store/clipboard-store.ts
@@ -1,7 +1,7 @@
import { createRoot, createSignal } from "solid-js";
+import { invokeCommand } from "../lib/tauri";
import { ClipboardWhere, ClipboardWithRelations } from "../types";
import { InvokeCommand } from "../types/tauri-invoke";
-import { invokeCommand } from "../utils/tauri";
export const initialWhere: ClipboardWhere = {
cursor: undefined,
diff --git a/src/store/hotkey-store.ts b/src/store/hotkey-store.ts
index a7b8b651..4cef3d17 100644
--- a/src/store/hotkey-store.ts
+++ b/src/store/hotkey-store.ts
@@ -1,8 +1,8 @@
import { createRoot, createSignal } from "solid-js";
+import { invokeCommand } from "../lib/tauri";
import { Hotkey } from "../types";
import { HotkeyEvent } from "../types/enums";
import { InvokeCommand } from "../types/tauri-invoke";
-import { invokeCommand } from "../utils/tauri";
function createHotkeyStore() {
const [globalHotkeyEvent, enableGlobalHotkeyEvent] = createSignal(false);
diff --git a/src/store/settings-store.ts b/src/store/settings-store.ts
index f7e4d123..465c64f2 100644
--- a/src/store/settings-store.ts
+++ b/src/store/settings-store.ts
@@ -1,14 +1,14 @@
import { BsDatabaseFillGear } from "solid-icons/bs";
import { HiSolidCog8Tooth } from "solid-icons/hi";
import { RiDeviceKeyboardFill } from "solid-icons/ri";
+import { TbResize } from "solid-icons/tb";
import { VsHistory } from "solid-icons/vs";
import { createRoot, createSignal } from "solid-js";
+import { invokeCommand } from "../lib/tauri";
import { Settings, SettingsTab } from "../types";
import { WebWindow } from "../types/enums";
import { InvokeCommand } from "../types/tauri-invoke";
import { SETTINGS_TAB, SettingsTabName } from "../utils/constants";
-import { invokeCommand } from "../utils/tauri";
-import { TbResize } from "solid-icons/tb";
function createSettingsStore() {
const [tabs, setTabs] = createSignal([
diff --git a/src/types/enums.ts b/src/types/enums.ts
index a0f832b6..a788fa30 100644
--- a/src/types/enums.ts
+++ b/src/types/enums.ts
@@ -9,57 +9,6 @@ export enum FolderLocation {
Config = "config",
}
-export enum ClippyPosition {
- Cursor = "cursor",
- TopLeft = "top_left",
- TopRight = "top_right",
- BottomLeft = "bottom_left",
- BottomRight = "bottom_right",
- TopCenter = "top_center",
- BottomCenter = "bottom_center",
- LeftCenter = "left_center",
- RightCenter = "right_center",
- Center = "center",
- TrayLeft = "tray_left",
- TrayBottomLeft = "tray_bottom_left",
- TrayRight = "tray_right",
- TrayBottomRight = "tray_bottom_right",
- TrayCenter = "tray_center",
- TrayBottomCenter = "tray_bottom_center",
-}
-
-export enum Language {
- // ~1.1 billion speakers
- English = "en",
-
- // ~1.1 billion speakers
- Mandarin = "zh",
-
- // ~600 million speakers
- Hindi = "hi",
-
- // ~550 million speakers
- Spanish = "es",
-
- // ~320 million speakers
- French = "fr",
-
- // ~310 million speakers
- Arabic = "ar",
-
- // ~260 million speakers
- Bengali = "bn",
-
- // ~240 million speakers
- Portuguese = "pt",
-
- // ~230 million speakers
- Russian = "ru",
-
- // ~200 million speakers
- Urdu = "ur",
-}
-
export enum HotkeyEvent {
WindowDisplayToggle = "window_display_toggle",
TypeClipboard = "type_clipboard",
diff --git a/src/types/index.ts b/src/types/index.ts
index df5d716f..46fd47ab 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,6 +1,7 @@
import { IconTypes } from "solid-icons";
-import { SettingsTabName, Tab, TabName } from "../utils/constants";
-import { ClipboardTextType, ClipboardType, ClippyPosition, HotkeyEvent, Language } from "./enums";
+import { DictionaryKey } from "../lib/i18n";
+import { ClippyPosition, Language, SettingsTabName, Tab, TabName } from "../utils/constants";
+import { ClipboardTextType, ClipboardType, HotkeyEvent } from "./enums";
export type DatabaseInfo = {
records: number;
@@ -98,7 +99,7 @@ export type Hotkey = {
shift: boolean;
key: string;
status: boolean;
- name: string;
+ name: DictionaryKey;
icon: string;
shortcut: string; // not in db added for convenience
@@ -114,7 +115,7 @@ export type Settings = {
dark_mode: boolean;
display_scale: number;
position: ClippyPosition;
-
+
max_file_size: number;
max_image_size: number;
max_text_size: number;
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index fcc268bd..a4a90dcf 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -1,8 +1,31 @@
+import { DictionaryKey } from "../lib/i18n";
import { HotkeyEvent } from "../types/enums";
-export const SETTINGS_TAB = ["General", "Backup", "History", "Hotkeys", "Limits"] as const;
-export const VIEW_MORE_NAMES = ["Sync Clipboard History", "Settings", "About", "Exit"] as const;
-export const TAB_NAMES = ["Recent Clipboards", "Starred Clipboards", "History", "View more"] as const;
+export const LANGUAGE_KEY = "lang";
+export const MAX_SIZE = 104_857_600;
+export const DEFAULT_SIZE = 10_485_760;
+
+export const SETTINGS_TAB = [
+ "SETTINGS.TAB.GENERAL",
+ "SETTINGS.TAB.BACKUP",
+ "SETTINGS.TAB.HISTORY",
+ "SETTINGS.TAB.HOTKEYS",
+ "SETTINGS.TAB.LIMITS",
+] as const satisfies readonly DictionaryKey[];
+
+export const VIEW_MORE_NAMES = [
+ "MAIN.HOTKEY.SYNC_CLIPBOARD_HISTORY",
+ "MAIN.HOTKEY.SETTINGS",
+ "MAIN.HOTKEY.ABOUT",
+ "MAIN.HOTKEY.EXIT",
+] as const satisfies readonly DictionaryKey[];
+export const TAB_NAMES = [
+ "MAIN.HOTKEY.RECENT_CLIPBOARDS",
+ "MAIN.HOTKEY.STARRED_CLIPBOARDS",
+ "MAIN.HOTKEY.HISTORY",
+ "MAIN.HOTKEY.VIEW_MORE",
+] as const satisfies readonly DictionaryKey[];
+
export const TABS = [
HotkeyEvent.RecentClipboards,
HotkeyEvent.StarredClipboards,
@@ -11,11 +34,55 @@ export const TABS = [
] as const;
export type SettingsTabName = (typeof SETTINGS_TAB)[number];
+
export type ViewMoreName = (typeof VIEW_MORE_NAMES)[number];
export type TabName = (typeof TAB_NAMES)[number];
export type Tab = (typeof TABS)[number];
-
+export type Language = (typeof LANGUAGES)[number];
+export type ClippyPosition = (typeof CLIPPY_POSITIONS)[number];
export type GlobalShortcutKeys = (typeof GLOBAL_SHORTCUT_KEYS)[number];
+
+export const LANGUAGES = [
+ "en", // English - ~1.1 billion speakers
+ "zh", // Mandarin - ~1.1 billion speakers
+ "hi", // Hindi - ~600 million speakers
+ "es", // Spanish - ~550 million speakers
+ "fr", // French - ~320 million speakers
+ "ar", // Arabic - ~310 million speakers
+ "bn", // Bengali - ~260 million speakers
+ "pt", // Portuguese - ~240 million speakers
+ "ru", // Russian - ~230 million speakers
+ "ur", // Urdu - ~200 million speakers
+ "ja", // Japanese - ~170 million speakers
+ "de", // German - ~160 million speakers
+ "ko", // Korean - ~130 million speakers
+ "vi", // Vietnamese - ~100 million speakers
+ "tr", // Turkish - ~95 million speakers
+ "it", // Italian - ~85 million speakers
+ "th", // Thai - ~80 million speakers
+ "pl", // Polish - ~45 million speakers
+ "nl", // Dutch - ~30 million speakers
+] as const;
+
+export const CLIPPY_POSITIONS = [
+ "cursor",
+ "top_left",
+ "top_right",
+ "bottom_left",
+ "bottom_right",
+ "top_center",
+ "bottom_center",
+ "left_center",
+ "right_center",
+ "center",
+ "tray_left",
+ "tray_bottom_left",
+ "tray_right",
+ "tray_bottom_right",
+ "tray_center",
+ "tray_bottom_center",
+] as const;
+
export const GLOBAL_SHORTCUT_KEYS = [
"none",
"A",
diff --git a/src/utils/helpers.ts b/src/utils/index.ts
similarity index 100%
rename from src/utils/helpers.ts
rename to src/utils/index.ts
diff --git a/tsconfig.json b/tsconfig.json
index 25e6e867..3001abab 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,7 @@
"target": "ES2020",
"useDefineForClassFields": true,
"module": "ESNext",
- "lib": ["ES2020", "DOM", "DOM.Iterable"],
+ "lib": ["ES2024", "DOM", "DOM.Iterable"],
"skipLibCheck": true,
/* Bundler mode */