From ec21ffc571a2317190d8cffa70b0ca7c56d98778 Mon Sep 17 00:00:00 2001 From: Athou Date: Mon, 28 Apr 2025 22:39:15 +0200 Subject: [PATCH] color names are now translatable (#1766) --- .../components/settings/DisplaySettings.tsx | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/commafeed-client/src/components/settings/DisplaySettings.tsx b/commafeed-client/src/components/settings/DisplaySettings.tsx index 1c496b44..53d2b78b 100644 --- a/commafeed-client/src/components/settings/DisplaySettings.tsx +++ b/commafeed-client/src/components/settings/DisplaySettings.tsx @@ -1,7 +1,7 @@ import { msg } from "@lingui/core/macro" import { useLingui } from "@lingui/react" import { Trans } from "@lingui/react/macro" -import { Box, DEFAULT_THEME, Divider, Group, NumberInput, Radio, Select, type SelectProps, SimpleGrid, Stack, Switch } from "@mantine/core" +import { Box, Divider, Group, NumberInput, Radio, Select, type SelectProps, SimpleGrid, Stack, Switch } from "@mantine/core" import type { ComboboxData } from "@mantine/core/lib/components/Combobox/Combobox.types" import { Constants } from "app/constants" import { useAppDispatch, useAppSelector } from "app/store" @@ -70,11 +70,26 @@ export function DisplaySettings() { }, ] - const colorData: ComboboxData = Object.keys(DEFAULT_THEME.colors).sort((a, b) => a.localeCompare(b)) + const colorData: ComboboxData = [ + { value: "dark", label: _(msg`Dark`) }, + { value: "gray", label: _(msg`Gray`) }, + { value: "red", label: _(msg`Red`) }, + { value: "pink", label: _(msg`Pink`) }, + { value: "grape", label: _(msg`Grape`) }, + { value: "violet", label: _(msg`Violet`) }, + { value: "indigo", label: _(msg`Indigo`) }, + { value: "blue", label: _(msg`Blue`) }, + { value: "cyan", label: _(msg`Cyan`) }, + { value: "green", label: _(msg`Green`) }, + { value: "lime", label: _(msg`Lime`) }, + { value: "yellow", label: _(msg`Yellow`) }, + { value: "orange", label: _(msg`Orange`) }, + { value: "teal", label: _(msg`Teal`) }, + ].sort((a, b) => a.label.localeCompare(b.label)) const colorRenderer: SelectProps["renderOption"] = ({ option }) => ( - {option.value} + {option.label} )