Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 04:36:43 +02:00
Code Issues Packages Projects Releases Activity

chore(options/i18n): simplify first week of the year

Browse Source
This commit is contained in:
Elian Doran
2026-04-13 15:15:21 +03:00
parent c5667d9141
commit 43d9d726f8
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/client/src/translations/en/translation.json
View File

@@ -1412,11 +1412,10 @@
"sunday": "Sunday",
"first-week-of-the-year": "First week of the year",
"first-week-contains-first-day": "First week contains first day of the year",
"first-week-contains-first-thursday": "First week contains first Thursday of the year",
"first-week-contains-first-thursday": "First week contains first Thursday (ISO 8601)",
"first-week-has-minimum-days": "First week has minimum days",
"min-days-in-first-week": "Minimum days in first week",
"first-week-info": "First week contains first Thursday of the year is based on <a href=\"https://en.wikipedia.org/wiki/ISO_week_date#First_week\">ISO 8601</a> standard.",
"first-week-warning": "Changing first week options may cause duplicate with existing Week Notes and the existing Week Notes will not be updated accordingly.",
"first-week-warning": "Changing this may cause duplicates with existing Week Notes.",
"formatting-locale": "Date & number format",
"formatting-locale-auto": "Based on the application's language"
},

20
apps/client/src/widgets/type_widgets/options/i18n.tsx
View File

@@ -6,10 +6,7 @@ import OptionsSection from "./components/OptionsSection";
import { useTriliumOption, useTriliumOptionJson } from "../../react/hooks";
import type { Locale } from "@triliumnext/commons";
import { isElectron, restartDesktopApp } from "../../../services/utils";
import FormRadioGroup from "../../react/FormRadioGroup";
import FormText from "../../react/FormText";
import RawHtml from "../../react/RawHtml";
import Admonition from "../../react/Admonition";
import Button from "../../react/Button";
import CheckboxList from "./components/CheckboxList";
import RelatedSettings from "./components/RelatedSettings";
@@ -96,10 +93,13 @@ function DateSettings() {
/>
</OptionsRow>
<OptionsRow name="first-week-of-year" label={t("i18n.first-week-of-the-year")}>
<FormRadioGroup
<OptionsRow name="first-week-of-year" label={t("i18n.first-week-of-the-year")} description={t("i18n.first-week-warning")}>
<FormSelect
name="first-week-of-year"
currentValue={firstWeekOfYear} onChange={setFirstWeekOfYear}
currentValue={firstWeekOfYear}
onChange={setFirstWeekOfYear}
keyProperty="value"
titleProperty="label"
values={[
{ value: "0", label: t("i18n.first-week-contains-first-day") },
{ value: "1", label: t("i18n.first-week-contains-first-thursday") },
@@ -117,14 +117,6 @@ function DateSettings() {
(_, i) => ({ days: String(i + 1) }))} />
</OptionsRow>}
<FormText>
<RawHtml html={t("i18n.first-week-info")} />
</FormText>
<Admonition type="warning">
{t("i18n.first-week-warning")}
</Admonition>
<OptionsRow name="restart" centered>
<Button
name="restart-app-button"