Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

Merge remote-tracking branch 'origin/main' into feat/recurring-tasks

olozano-e306c97da4f7
diff --cc apps/docs/core/functional/plan-and-execute-tasks.mdx
index 29fea2fe1,ce17354d1..f4294aae3
--- a/apps/docs/core/functional/plan-and-execute-tasks.mdx
+++ b/apps/docs/core/functional/plan-and-execute-tasks.mdx
@@@ -63,18 -64,6 +65,18 @@@ Open a task to edit its description an
Use the attachment button, paste, or drag a file into the editor to add supporting material. Images appear inline; other files appear as attachments. On self-hosted instances, an operator must [configure file storage](/core/installation/object-storage-and-image-uploads) first.
+## Repeat a task
+
- For work that comes back on a schedule, such as a weekly report, open the task's due date and choose **Repeat**. You can do this while creating the task or later. Pick **Daily**, **Weekly**, **Monthly**, or **Yearly**, or **Periodically** to repeat every few days, weeks, months, or years. Weekly patterns can repeat on several days, such as Monday and Thursday. The calendar highlights the upcoming dates.
++For work that comes back on a schedule, such as a weekly report, open the task's due date and choose **Repeat**. You can do this while creating the task or later. Pick **Daily**, **Weekly**, **Monthly**, or **Yearly**, or **Periodically** to repeat every few days, weeks, months, or years. Weekly patterns can repeat on several days, such as Monday and Thursday. Choose **Pick a date** to see the upcoming dates highlighted on the calendar.
+
+When a repeating task moves into a done column, Kaneo creates the next task in the project's first open column. The next task keeps the title, description, assignee, priority, labels, and custom fields. If the assignee has left the workspace, the next task is unassigned. It is due on the next date of the pattern after the completed task's due date, and its start date moves by the same number of days. A task without a due date repeats from the moment it is completed, with no start date.
+
+The completed task stays in the done column as a record, and the repeat setting moves to the new task. Reopening the completed task does not create another one. To stop the series, open the due date of the open task and turn off **Repeat**. Subtasks are not copied.
+
+In a project connected to GitHub, Gitea, or GitLab, each new occurrence is treated like any other new task: it gets its own issue when it matches the integration's sync rules.
+
+From the terminal, set or stop a rule with [`kaneo task repeat`](/cli/reference#kaneo-task-repeat).
+
## Break work into subtasks
In the task’s **Sub-tasks** section, enter a title and choose **Add**. Each subtask is a task with its own status and assignee. Open it to add more detail. The **Subtask of** link takes you back to its parent.
diff --cc apps/web/src/components/common/date-picker/date-picker-menu.tsx
index 000000000,0e84ddd17..1d75d3b9e
mode 000000,100644..100644
--- a/apps/web/src/components/common/date-picker/date-picker-menu.tsx
+++ b/apps/web/src/components/common/date-picker/date-picker-menu.tsx
@@@ -1,0 -1,150 +1,153 @@@
+ import { isAfter, isBefore, isSameDay, startOfDay } from "date-fns";
+ import { Calendar, CalendarDays, X } from "lucide-react";
+ import { useState } from "react";
+ import type { Matcher } from "react-day-picker";
+ import { useTranslation } from "react-i18next";
+ import { OptionMenu } from "@/components/common/option-menu/option-menu";
+ import type { OptionMenuItem } from "@/components/common/option-menu/option-menu-item";
+ import { useUserPreferencesStore } from "@/store/user-preferences";
+ import { DateLimitHint } from "./date-limit-hint";
+ import { DatePickerMonthView } from "./date-picker-month-view";
+ import { parseDateQuery } from "./parse-date-query";
+ import { formatPickerDay, QUICK_DATE_LABEL_KEYS } from "./quick-date-labels";
+ import { getQuickDates } from "./quick-dates";
+
+ type DateBounds = { before?: Date; after?: Date };
+
+ type DatePickerMenuProps = {
+ label: string;
+ placeholder: string;
+ clearLabel: string;
+ value: Date | null;
+ onChange: (date: Date | null) => void;
+ bounds?: DateBounds;
+ formatLimit?: (date: string) => string;
+ canClear?: boolean;
++ highlighted?: Date[];
+ };
+
+ const PICK = "pick";
+ const CLEAR = "clear";
+ const TYPED = "typed";
+
+ function isAllowed(date: Date, bounds?: DateBounds) {
+ const day = startOfDay(date);
+ if (bounds?.before && isBefore(day, startOfDay(bounds.before))) return false;
+ if (bounds?.after && isAfter(day, startOfDay(bounds.after))) return false;
+ return true;
+ }
+
+ export function DatePickerMenu({
+ label,
+ placeholder,
+ clearLabel,
+ value,
+ onChange,
+ bounds,
+ formatLimit,
+ canClear = value !== null,
++ highlighted,
+ }: DatePickerMenuProps) {
+ const { t } = useTranslation();
+ const weekStartsOn = useUserPreferencesStore((state) => state.weekStartsOn);
+ const [view, setView] = useState<"menu" | "month">("menu");
+ const [query, setQuery] = useState("");
+ const now = new Date();
+
+ const quickDates = getQuickDates(now, weekStartsOn).filter((item) =>
+ isAllowed(item.date, bounds),
+ );
+ const typed = parseDateQuery(query, now, weekStartsOn, bounds?.before);
+ const typedDate = typed && isAllowed(typed, bounds) ? typed : null;
+ const typedOutOfRange =
+ typed && !typedDate
+ ? t(
+ bounds?.before && typed < bounds.before
+ ? "tasks:datePicker.beforeStart"
+ : "tasks:datePicker.afterDue",
+ { date: formatPickerDay(typed) },
+ )
+ : undefined;
+
+ const options: OptionMenuItem[] = [
+ ...(typedDate
+ ? [
+ {
+ value: TYPED,
+ label: formatPickerDay(typedDate),
+ icon: <Calendar />,
+ pinned: true,
+ },
+ ]
+ : []),
+ ...quickDates.map((item) => ({
+ value: item.id,
+ label: t(QUICK_DATE_LABEL_KEYS[item.id]),
+ hint: formatPickerDay(item.date),
+ icon: <Calendar />,
+ selected: value ? isSameDay(value, item.date) : false,
+ })),
+ {
+ value: PICK,
+ label: t("tasks:datePicker.pickDate"),
+ icon: <CalendarDays />,
+ },
+ ...(canClear ? [{ value: CLEAR, label: clearLabel, icon: <X /> }] : []),
+ ];
+
+ const limit = bounds?.before ?? bounds?.after;
+ const limitHint =
+ limit && formatLimit ? formatLimit(formatPickerDay(limit)) : null;
+
+ const disabledDays: Matcher[] = [];
+ if (bounds?.before) disabledDays.push({ before: bounds.before });
+ if (bounds?.after) disabledDays.push({ after: bounds.after });
+
+ const select = (selected: string) => {
+ if (selected === PICK) {
+ setView("month");
+ return;
+ }
+ if (selected === CLEAR) {
+ onChange(null);
+ return;
+ }
+ if (selected === TYPED) {
+ if (typedDate) onChange(typedDate);
+ return;
+ }
+ const quick = quickDates.find((item) => item.id === selected);
+ if (quick) onChange(quick.date);
+ };
+
+ if (view === "month") {
+ return (
+ <DatePickerMonthView
+ placeholder={placeholder}
+ value={value}
+ valueLabel={value ? formatPickerDay(value) : null}
+ disabled={disabledDays}
+ limit={limit}
+ limitHint={limitHint}
++ highlighted={highlighted}
+ onBack={() => setView("menu")}
+ onSelect={onChange}
+ />
+ );
+ }
+
+ return (
+ <>
+ <OptionMenu
+ label={label}
+ placeholder={placeholder}
+ options={options}
+ onSelect={select}
+ onQueryChange={setQuery}
+ inputHint={value ? formatPickerDay(value) : undefined}
+ status={typedOutOfRange}
+ />
+ {limitHint && <DateLimitHint>{limitHint}</DateLimitHint>}
+ </>
+ );
+ }
diff --cc apps/web/src/components/common/date-picker/date-picker-month-view.tsx
index 000000000,a64e1e821..c08851f2f
mode 000000,100644..100644
--- a/apps/web/src/components/common/date-picker/date-picker-month-view.tsx
+++ b/apps/web/src/components/common/date-picker/date-picker-month-view.tsx
@@@ -1,0 -1,55 +1,58 @@@
+ import { ChevronLeft } from "lucide-react";
+ import type { Matcher } from "react-day-picker";
+ import { DateLimitHint } from "./date-limit-hint";
+ import { MonthGrid } from "./month-grid";
+
+ type DatePickerMonthViewProps = {
+ placeholder: string;
+ value: Date | null;
+ valueLabel: string | null;
+ disabled: Matcher[];
+ limit: Date | undefined;
+ limitHint: string | null;
++ highlighted?: Date[];
+ onBack: () => void;
+ onSelect: (date: Date) => void;
+ };
+
+ export function DatePickerMonthView({
+ placeholder,
+ value,
+ valueLabel,
+ disabled,
+ limit,
+ limitHint,
++ highlighted,
+ onBack,
+ onSelect,
+ }: DatePickerMonthViewProps) {
+ return (
+ // eslint-disable-next-line jsx-a11y/no-static-element-interactions -- Escape steps back to the list instead of closing the popover
+ <div
+ onKeyDown={(event) => {
+ if (event.key !== "Escape") return;
+ event.preventDefault();
+ event.stopPropagation();
+ onBack();
+ }}
+ >
+ <button
+ type="button"
+ onClick={onBack}
+ className="flex h-10 w-full cursor-pointer items-center gap-2 border-border/80 border-b px-3 text-left text-[13px] text-muted-foreground outline-none transition-colors hover:text-foreground focus-visible:text-foreground"
+ >
+ <ChevronLeft aria-hidden="true" className="size-3.5 shrink-0" />
+ <span className="min-w-0 flex-1 truncate">{placeholder}</span>
+ {valueLabel && <span className="shrink-0 text-xs">{valueLabel}</span>}
+ </button>
+ <MonthGrid
+ value={value}
+ onSelect={onSelect}
+ disabled={disabled}
+ marked={limit}
++ highlighted={highlighted}
+ />
+ {limitHint && <DateLimitHint>{limitHint}</DateLimitHint>}
+ </div>
+ );
+ }
diff --cc apps/web/src/components/common/date-picker/month-grid.tsx
index 000000000,c096fba99..1229f6554
mode 000000,100644..100644
--- a/apps/web/src/components/common/date-picker/month-grid.tsx
+++ b/apps/web/src/components/common/date-picker/month-grid.tsx
@@@ -1,0 -1,87 +1,95 @@@
+ import { startOfDay } from "date-fns";
+ import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
+ import { DayPicker, type Matcher } from "react-day-picker";
+ import { cn } from "@/lib/cn";
+ import { useUserPreferencesStore } from "@/store/user-preferences";
+
+ const navButtonClass =
+ "flex size-6 cursor-pointer items-center justify-center rounded-md text-muted-foreground outline-none transition-colors hover:bg-accent hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring/40 disabled:pointer-events-none disabled:opacity-40 [&_svg]:size-3.5";
+
+ const classNames = {
+ root: "px-2.5 pb-2.5",
+ months: "relative",
+ month: "flex flex-col",
+ month_caption: "flex h-10 items-center px-0.5",
+ caption_label: "font-medium text-[13px] text-foreground",
+ nav: "absolute end-0 top-0 z-1 flex h-10 items-center gap-0.5",
+ button_previous: navButtonClass,
+ button_next: navButtonClass,
+ month_grid: "w-full border-separate border-spacing-y-1",
+ weekday: "h-6 p-0 font-normal text-[11px] text-muted-foreground/70",
+ day: "p-0 text-center",
+ day_button:
+ "relative mx-auto flex size-7.5 cursor-pointer items-center justify-center rounded-lg text-[13px] text-foreground/85 outline-none transition-colors hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring/40",
+ today:
+ "*:ring-1 *:ring-foreground/20 *:ring-inset not-data-selected:not-data-disabled:*:text-foreground",
+ selected:
+ "*:bg-foreground *:font-medium *:text-background *:hover:bg-foreground",
+ outside: "not-data-selected:*:text-muted-foreground/40",
+ disabled: "*:pointer-events-none *:text-muted-foreground/40",
+ hidden: "invisible",
+ };
+
+ const modifiersClassNames = {
+ past: "not-data-selected:*:text-muted-foreground/70",
+ limit:
+ "*:after:absolute *:after:bottom-0.5 *:after:start-1/2 *:after:size-1 *:after:-translate-x-1/2 *:after:rounded-full *:after:bg-muted-foreground data-selected:*:after:bg-background",
++ highlighted:
++ "not-data-selected:*:bg-primary/12 not-data-selected:*:font-medium not-data-selected:*:text-primary",
+ };
+
+ function Chevron({
+ orientation,
+ className,
+ }: {
+ orientation?: "left" | "right" | "up" | "down";
+ className?: string;
+ }) {
+ const Icon = orientation === "left" ? ChevronLeftIcon : ChevronRightIcon;
+ return (
+ <Icon aria-hidden="true" className={cn(className, "rtl:rotate-180")} />
+ );
+ }
+
+ type MonthGridProps = {
+ value: Date | null;
+ onSelect: (date: Date) => void;
+ disabled?: Matcher[];
+ marked?: Date;
++ highlighted?: Date[];
+ autoFocus?: boolean;
+ };
+
+ export function MonthGrid({
+ value,
+ onSelect,
+ disabled,
+ marked,
++ highlighted,
+ autoFocus = true,
+ }: MonthGridProps) {
+ const weekStartsOn = useUserPreferencesStore((state) => state.weekStartsOn);
+ const today = startOfDay(new Date());
+
+ return (
+ <DayPicker
+ mode="single"
+ required
+ autoFocus={autoFocus}
+ showOutsideDays
+ selected={value ?? undefined}
+ defaultMonth={value ?? today}
+ onSelect={onSelect}
+ disabled={disabled}
+ weekStartsOn={weekStartsOn}
- modifiers={{ past: { before: today }, limit: marked ?? false }}
++ modifiers={{
++ past: { before: today },
++ limit: marked ?? false,
++ highlighted: highlighted ?? false,
++ }}
+ modifiersClassNames={modifiersClassNames}
+ classNames={classNames}
+ components={{ Chevron }}
+ />
+ );
+ }
diff --cc apps/web/src/components/kanban-board/task-card/task-card-content.tsx
index cbb4511ca,8457dae28..2a8f7d1ee
--- a/apps/web/src/components/kanban-board/task-card/task-card-content.tsx
+++ b/apps/web/src/components/kanban-board/task-card/task-card-content.tsx
@@@ -1,10 -1,7 +1,8 @@@
- import { format } from "date-fns";
- import { Calendar, CalendarClock, CalendarX, Trash2Icon } from "lucide-react";
+ import { Trash2Icon } from "lucide-react";
import { memo, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
- import { TaskProgressBadges } from "@/components/task/task-progress-badges";
import { TaskPullRequests } from "@/components/task/task-pull-requests";
+import { TaskRecurrenceBadge } from "@/components/task/task-recurrence-badge";
import {
AlertDialog,
AlertDialogClose,
@@@ -187,67 -170,38 +171,39 @@@ function TaskCardContent(
</div>
)}
- {!taskIsCompleted && (
- <CardFieldList fields={cardFields} max={2} className="mb-2.5" />
- )}
-
<div
className={cn(
- "flex flex-wrap items-center gap-x-2.5 gap-y-1.5 empty:hidden",
- taskIsCompleted && "hidden",
+ "line-clamp-3 break-words text-[13px] leading-[18px]",
+ showIdRow && "mt-1",
+ taskIsCompleted
+ ? "text-board-title-done"
+ : "font-medium text-board-title",
)}
>
- {showPriority && hasPriority && (
- <span
- className="inline-flex h-5.5 items-center"
- title={getPriorityLabel(task.priority ?? "")}
- >
- {getPriorityIcon(task.priority ?? "")}
- </span>
- )}
-
- <TaskProgressBadges task={task} />
- <TaskRecurrenceBadge task={task} />
-
- {showDueDates && task.dueDate && (
- <div
- className={cn(
- "flex h-5.5 items-center gap-1 text-[10px]",
- isOverdue && "font-medium",
- dueDateTextColors[dueDateStatus],
- )}
- >
- {dueDateStatus === "overdue" && (
- <CalendarX className="w-3 h-3" />
- )}
- {dueDateStatus === "due-soon" && (
- <CalendarClock className="w-3 h-3" />
- )}
- {(dueDateStatus === "far-future" ||
- dueDateStatus === "no-due-date") && (
- <Calendar className="w-3 h-3" />
- )}
- <span>{format(new Date(task.dueDate), "MMM d")}</span>
- </div>
- )}
-
- <TaskPullRequests externalLinks={task.externalLinks} />
+ {task.title}
</div>
+
+ {!taskIsCompleted && (
+ <div className="mt-2.5 flex flex-wrap items-center gap-1 empty:hidden">
+ {showPriority && hasPriority && <PriorityChip task={task} />}
+ {showDueDates && <DueDateChip task={task} />}
++ <TaskRecurrenceBadge task={task} />
+ <SubtasksChip task={task} workspaceId={workspaceId} />
+ {showTaskItemCounts && <ChecklistChip task={task} />}
+ <TaskPullRequests
+ externalLinks={task.externalLinks}
+ className={cn(taskChipClass, "bg-transparent font-normal")}
+ />
+ {showLabels && (
+ <LabelChips task={task} workspaceId={workspaceId} />
+ )}
+ <CardFieldList
+ fields={cardFields}
+ max={2}
+ className="contents"
+ />
+ </div>
+ )}
</div>
</ContextMenuTrigger>
diff --cc apps/web/src/components/list-view/task-row-body.tsx
index 000000000,9be7fc547..be511c050
mode 000000,100644..100644
--- a/apps/web/src/components/list-view/task-row-body.tsx
+++ b/apps/web/src/components/list-view/task-row-body.tsx
@@@ -1,0 -1,123 +1,125 @@@
+ import { useTranslation } from "react-i18next";
+ import { CardFieldList } from "@/components/custom-fields/card-field-list";
+ import { useTaskCardFields } from "@/components/custom-fields/use-task-card-fields";
+ import TaskPriorityPopover from "@/components/task/task-priority-popover";
+ import { TaskPullRequests } from "@/components/task/task-pull-requests";
++import { TaskRecurrenceBadge } from "@/components/task/task-recurrence-badge";
+ import { AssigneeButton } from "@/components/task-chips/assignee-button";
+ import { ChecklistChip } from "@/components/task-chips/checklist-chip";
+ import { DueDateChip } from "@/components/task-chips/due-date-chip";
+ import { LabelChips } from "@/components/task-chips/label-chips";
+ import { stopCardEvents } from "@/components/task-chips/stop-card-events";
+ import { SubtasksChip } from "@/components/task-chips/subtasks-chip";
+ import { cn } from "@/lib/cn";
+ import { getPriorityLabel } from "@/lib/i18n/domain";
+ import { getPriorityIcon } from "@/lib/priority";
+ import { useUserPreferencesStore } from "@/store/user-preferences";
+ import type Task from "@/types/task";
+
+ const inlineMetaClass =
+ "h-5 gap-1 border-transparent bg-transparent px-1 font-normal text-muted-foreground hover:border-transparent hover:text-foreground data-popup-open:border-transparent";
+
+ const rowButtonClass =
+ "flex shrink-0 cursor-pointer items-center rounded-md outline-none transition-colors hover:bg-accent focus-visible:ring-[3px] focus-visible:ring-ring/25 data-popup-open:bg-accent";
+
+ type TaskRowBodyProps = {
+ task: Task;
+ projectSlug: string | undefined;
+ workspaceId: string;
+ isCompleted: boolean;
+ assigneeName: string | null | undefined;
+ assigneeImage: string | null | undefined;
+ showPullRequests?: boolean;
+ };
+
+ export function TaskRowBody({
+ task,
+ projectSlug,
+ workspaceId,
+ isCompleted,
+ assigneeName,
+ assigneeImage,
+ showPullRequests = true,
+ }: TaskRowBodyProps) {
+ const { t } = useTranslation();
+ const {
+ showAssignees,
+ showPriority,
+ showDueDates,
+ showLabels,
+ showTaskNumbers,
+ showTaskItemCounts,
+ } = useUserPreferencesStore();
+ const cardFields = useTaskCardFields(task.projectId, task.id);
+ const priorityLabel = `${t("tasks:priority.label")}: ${getPriorityLabel(task.priority ?? "")}`;
+
+ return (
+ <>
+ {showPriority && (
+ <TaskPriorityPopover task={task}>
+ <button
+ type="button"
+ aria-label={priorityLabel}
+ title={priorityLabel}
+ className={cn(
+ rowButtonClass,
+ "size-5.5 justify-center [&_svg]:size-3.5",
+ )}
+ {...stopCardEvents}
+ >
+ {getPriorityIcon(task.priority ?? "")}
+ </button>
+ </TaskPriorityPopover>
+ )}
+ {showTaskNumbers && (
+ <span className="w-13 shrink-0 truncate font-mono text-muted-foreground text-xs">
+ {projectSlug}-{task.number}
+ </span>
+ )}
+
+ <div className="flex min-w-0 flex-1 items-center gap-2">
+ <span className="truncate text-foreground text-sm">{task.title}</span>
+ <div className="flex shrink-0 items-center gap-0.5">
+ <SubtasksChip
+ task={task}
+ workspaceId={workspaceId}
+ className={inlineMetaClass}
+ />
+ {showTaskItemCounts && (
+ <ChecklistChip task={task} className={inlineMetaClass} />
+ )}
++ <TaskRecurrenceBadge task={task} />
+ {showPullRequests && (
+ <TaskPullRequests
+ externalLinks={task.externalLinks}
+ className={cn(inlineMetaClass, "rounded-md")}
+ />
+ )}
+ </div>
+ </div>
+
+ <div className="flex shrink-0 items-center justify-end gap-1">
+ <CardFieldList fields={cardFields} max={3} />
+ {showLabels && (
+ <LabelChips task={task} workspaceId={workspaceId} max={2} />
+ )}
+ </div>
+
+ {showDueDates && (
+ <div className="flex w-24 shrink-0 justify-end">
+ <DueDateChip task={task} isCompleted={isCompleted} />
+ </div>
+ )}
+
+ {showAssignees && (
+ <AssigneeButton
+ task={task}
+ workspaceId={workspaceId}
+ name={assigneeName}
+ image={assigneeImage}
+ avatarClassName="size-5.5 text-[9px]"
+ />
+ )}
+ </>
+ );
+ }
diff --cc apps/web/src/components/shared/modals/create-task-modal.tsx
index bfef67452,6dd3cadb9..30f841cad
--- a/apps/web/src/components/shared/modals/create-task-modal.tsx
+++ b/apps/web/src/components/shared/modals/create-task-modal.tsx
@@@ -219,7 -216,8 +219,9 @@@ function CreateTaskModalContent(
const [assigneeId, setAssigneeId] = useState("");
const [startDate, setStartDate] = useState<Date | undefined>(undefined);
const [dueDate, setDueDate] = useState<Date | undefined>(undefined);
+ const [recurrence, setRecurrence] = useState<TaskRecurrence | null>(null);
+ const [startDateOpen, setStartDateOpen] = useState(false);
+ const [dueDateOpen, setDueDateOpen] = useState(false);
const [createMore, setCreateMore] = useState(false);
const [labels, setLabels] = useState<Label[]>([]);
const [discardConfirmationOpen, setDiscardConfirmationOpen] = useState(false);
@@@ -1069,17 -1057,22 +1064,22 @@@
? formatDateMedium(dueDate)
: t("common:modals.createTask.dueDate")}
</span>
+ <TaskRecurrenceBadge task={{ recurrence }} asText />
</button>
</PopoverTrigger>
- <PopoverContent className="w-72 p-0" align="start">
+ <PopoverContent className="w-65 p-0" align="start">
- <DatePickerMenu
+ <TaskDueDatePicker
- dueDate={dueDate}
+ label={t("common:modals.createTask.dueDate")}
- placeholder={t("tasks:datePicker.dueDatePlaceholder")}
+ clearLabel={t("common:modals.createTask.clearDueDate")}
- value={dueDate ?? null}
- onChange={(date) => {
++ dueDate={dueDate ?? null}
+ startDate={startDate}
+ recurrence={recurrence}
- onDateChange={setDueDate}
++ onDateChange={(date) => {
+ setDueDate(date ?? undefined);
- setDueDateOpen(false);
++ // Keep a repeating task's picker open to show its upcoming dates.
++ if (!recurrence || !date) setDueDateOpen(false);
+ }}
- bounds={startDate ? { before: startDate } : undefined}
- formatLimit={(date) =>
- t("tasks:datePicker.startsOn", { date })
- }
+ onRecurrenceChange={setRecurrence}
- onClear={() => setDueDate(undefined)}
/>
</PopoverContent>
</Popover>
diff --cc apps/web/src/components/task/properties/properties-rail.tsx
index 000000000,1427e34fa..47fec9ab4
mode 000000,100644..100644
--- a/apps/web/src/components/task/properties/properties-rail.tsx
+++ b/apps/web/src/components/task/properties/properties-rail.tsx
@@@ -1,0 -1,166 +1,168 @@@
+ import { ArrowRight, Calendar, CalendarDays } from "lucide-react";
+ import { useTranslation } from "react-i18next";
+ import icons from "@/constants/project-icons";
+ import { getColumnIcon } from "@/lib/column";
+ import { cn } from "@/lib/cn";
+ import { formatDateShort } from "@/lib/format";
+ import { getPriorityLabel } from "@/lib/i18n/domain";
+ import { getPriorityIcon } from "@/lib/priority";
+ import { TaskCustomFieldRows } from "../custom-fields/task-custom-field-rows";
+ import TaskAssigneePopover from "../task-assignee-popover";
+ import TaskDueDatePopover from "../task-due-date-popover";
+ import TaskLabelsPopover from "../task-labels-popover";
+ import TaskMovePopover from "../task-move-popover";
+ import TaskPriorityPopover from "../task-priority-popover";
++import { TaskRecurrenceBadge } from "../task-recurrence-badge";
+ import TaskStartDatePopover from "../task-start-date-popover";
+ import TaskStatusPopover from "../task-status-popover";
+ import { AssigneeAvatar } from "./assignee-avatar";
+ import { dueDateTextClass } from "./due-date-text-class";
+ import { LabelsValue } from "./labels-value";
+ import { PropertyRow } from "./property-row";
+ import { PropertyValue } from "./property-value";
+ import { useTaskProperties } from "./use-task-properties";
+
+ type PropertiesRailProps = {
+ taskId: string;
+ projectId: string;
+ workspaceId: string;
+ className?: string;
+ };
+
+ export function PropertiesRail({
+ taskId,
+ projectId,
+ workspaceId,
+ className,
+ }: PropertiesRailProps) {
+ const { t } = useTranslation();
+ const { task, project, labels, status, assignee, dueStatus, canMoveTask } =
+ useTaskProperties(taskId, projectId, workspaceId);
+
+ if (!task) return null;
+
+ const ProjectIcon =
+ icons[project?.icon as keyof typeof icons] || icons.Layout;
+ const projectValue = (
+ <>
+ <ProjectIcon className="text-muted-foreground" />
+ <span className="truncate">{project?.name}</span>
+ </>
+ );
+
+ return (
+ <aside
+ aria-label={t("tasks:properties.title")}
+ className={cn("flex flex-col gap-4 px-3 pt-4 pb-6", className)}
+ >
+ <div className="flex flex-col gap-0.5">
+ <PropertyRow label={t("tasks:status.label")}>
+ <TaskStatusPopover task={task}>
+ <PropertyValue data-task-action="status" shortcutId="changeStatus">
+ {getColumnIcon(task.status ?? "", status.isFinal, status.icon)}
+ <span className="truncate">{status.label}</span>
+ </PropertyValue>
+ </TaskStatusPopover>
+ </PropertyRow>
+
+ <PropertyRow label={t("tasks:priority.label")}>
+ <TaskPriorityPopover task={task}>
+ <PropertyValue
+ data-task-action="priority"
+ shortcutId="changePriority"
+ >
+ {getPriorityIcon(task.priority ?? "")}
+ <span className="truncate">
+ {getPriorityLabel(task.priority ?? "")}
+ </span>
+ </PropertyValue>
+ </TaskPriorityPopover>
+ </PropertyRow>
+
+ <PropertyRow label={t("tasks:assignee.label")}>
+ <TaskAssigneePopover task={task} workspaceId={workspaceId}>
+ <PropertyValue data-task-action="assignee" shortcutId="assignTask">
+ <AssigneeAvatar
+ name={assignee?.user?.name || task.assigneeName}
+ image={assignee?.user?.image}
+ assigned={Boolean(task.userId)}
+ />
+ <span
+ className={cn(
+ "truncate",
+ !task.userId && "text-muted-foreground",
+ )}
+ >
+ {assignee?.user?.name ||
+ task.assigneeName ||
+ t("tasks:popover.assignee.unassigned")}
+ </span>
+ </PropertyValue>
+ </TaskAssigneePopover>
+ </PropertyRow>
+
+ <PropertyRow label={t("tasks:properties.labels")} align="start">
+ <TaskLabelsPopover task={task} workspaceId={workspaceId}>
+ <PropertyValue
+ data-task-action="labels"
+ shortcutId="changeLabels"
+ className="h-auto min-h-7.5 py-1.25"
+ >
+ <LabelsValue labels={labels} />
+ </PropertyValue>
+ </TaskLabelsPopover>
+ </PropertyRow>
+
+ <PropertyRow label={t("tasks:properties.dates")}>
+ <div className="flex min-w-0 items-center gap-0.5">
+ <TaskStartDatePopover task={task}>
+ <PropertyValue className="flex-none">
+ <CalendarDays className="text-muted-foreground" />
+ <span
+ className={cn(!task.startDate && "text-muted-foreground")}
+ >
+ {task.startDate
+ ? formatDateShort(task.startDate)
+ : t("tasks:properties.start")}
+ </span>
+ </PropertyValue>
+ </TaskStartDatePopover>
+ <ArrowRight className="size-3 shrink-0 text-muted-foreground/60" />
+ <TaskDueDatePopover task={task}>
+ <PropertyValue
+ data-task-action="dueDate"
+ className={cn("flex-none", dueDateTextClass[dueStatus])}
+ >
+ <Calendar
+ className={cn(!task.dueDate && "text-muted-foreground")}
+ />
+ <span className={cn(!task.dueDate && "text-muted-foreground")}>
+ {task.dueDate
+ ? formatDateShort(task.dueDate)
+ : t("tasks:dueDate.label")}
+ </span>
++ <TaskRecurrenceBadge task={task} asText />
+ </PropertyValue>
+ </TaskDueDatePopover>
+ </div>
+ </PropertyRow>
+
+ <PropertyRow label={t("tasks:properties.project")}>
+ {canMoveTask ? (
+ <TaskMovePopover task={task} workspaceId={workspaceId}>
+ <PropertyValue data-task-action="move" shortcutId="moveToProject">
+ {projectValue}
+ </PropertyValue>
+ </TaskMovePopover>
+ ) : (
+ <div className="flex h-7.5 min-w-0 items-center gap-2 px-2 font-medium text-[13px] text-foreground [&_svg]:size-3.5 [&_svg]:shrink-0">
+ {projectValue}
+ </div>
+ )}
+ </PropertyRow>
+ </div>
+
+ <TaskCustomFieldRows taskId={taskId} projectId={projectId} />
+ </aside>
+ );
+ }
diff --cc apps/web/src/components/task/properties/property-chips.tsx
index 000000000,877b6757b..7feeb8d96
mode 000000,100644..100644
--- a/apps/web/src/components/task/properties/property-chips.tsx
+++ b/apps/web/src/components/task/properties/property-chips.tsx
@@@ -1,0 -1,163 +1,165 @@@
+ import { ArrowRight, Calendar } from "lucide-react";
+ import { useTranslation } from "react-i18next";
+ import { propertyChipClass } from "@/components/custom-fields/property-chip-class";
+ import icons from "@/constants/project-icons";
+ import { cn } from "@/lib/cn";
+ import { getColumnIcon } from "@/lib/column";
+ import { formatDateShort } from "@/lib/format";
+ import { getPriorityLabel } from "@/lib/i18n/domain";
+ import { getPriorityIcon } from "@/lib/priority";
+ import { TaskCustomFieldChips } from "../custom-fields/task-custom-field-chips";
+ import TaskAssigneePopover from "../task-assignee-popover";
+ import TaskDueDatePopover from "../task-due-date-popover";
+ import TaskLabelsPopover from "../task-labels-popover";
+ import TaskMovePopover from "../task-move-popover";
+ import TaskPriorityPopover from "../task-priority-popover";
++import { TaskRecurrenceBadge } from "../task-recurrence-badge";
+ import TaskStartDatePopover from "../task-start-date-popover";
+ import TaskStatusPopover from "../task-status-popover";
+ import { AssigneeAvatar } from "./assignee-avatar";
+ import { dueDateTextClass } from "./due-date-text-class";
+ import { LabelsValue } from "./labels-value";
+ import { useTaskProperties } from "./use-task-properties";
+
+ type PropertyChipsProps = {
+ taskId: string;
+ projectId: string;
+ workspaceId: string;
+ className?: string;
+ };
+
+ const chip = cn(
+ propertyChipClass,
+ "h-8 bg-accent/30 text-foreground [&_svg]:size-3.5 [&_svg]:shrink-0",
+ );
+ const dateButton =
+ "flex h-full items-center gap-1.5 rounded-[5px] px-1.5 outline-none transition-colors hover:bg-accent/60 focus-visible:bg-accent/60 data-popup-open:bg-accent";
+
+ export function PropertyChips({
+ taskId,
+ projectId,
+ workspaceId,
+ className,
+ }: PropertyChipsProps) {
+ const { t } = useTranslation();
+ const { task, project, labels, status, assignee, dueStatus, canMoveTask } =
+ useTaskProperties(taskId, projectId, workspaceId);
+
+ if (!task) return null;
+
+ const ProjectIcon =
+ icons[project?.icon as keyof typeof icons] || icons.Layout;
+ const projectContent = (
+ <>
+ <ProjectIcon className="text-muted-foreground" />
+ <span className="max-w-40 truncate">{project?.name}</span>
+ </>
+ );
+
+ return (
+ <div className={cn("flex flex-col gap-1.5", className)}>
+ <div className="flex flex-wrap items-center gap-1.5">
+ <TaskStatusPopover task={task}>
+ <button type="button" data-task-action="status" className={chip}>
+ {getColumnIcon(task.status ?? "", status.isFinal, status.icon)}
+ <span className="truncate">{status.label}</span>
+ </button>
+ </TaskStatusPopover>
+ <TaskPriorityPopover task={task}>
+ <button type="button" data-task-action="priority" className={chip}>
+ {getPriorityIcon(task.priority ?? "")}
+ <span className="truncate">
+ {getPriorityLabel(task.priority ?? "")}
+ </span>
+ </button>
+ </TaskPriorityPopover>
+ <TaskAssigneePopover task={task} workspaceId={workspaceId}>
+ <button
+ type="button"
+ data-task-action="assignee"
+ className={cn(chip, "pl-1.5")}
+ >
+ <AssigneeAvatar
+ name={assignee?.user?.name || task.assigneeName}
+ image={assignee?.user?.image}
+ assigned={Boolean(task.userId)}
+ />
+ <span
+ className={cn(
+ "max-w-32 truncate",
+ !task.userId && "text-muted-foreground",
+ )}
+ >
+ {assignee?.user?.name ||
+ task.assigneeName ||
+ t("tasks:popover.assignee.unassigned")}
+ </span>
+ </button>
+ </TaskAssigneePopover>
+ <div className={cn(chip, "gap-0.5 px-1 hover:bg-accent/30")}>
+ <TaskStartDatePopover task={task}>
+ <button type="button" className={dateButton}>
+ <Calendar
+ className={cn(
+ task.dueDate
+ ? dueDateTextClass[dueStatus]
+ : "text-muted-foreground",
+ )}
+ />
+ <span className="text-muted-foreground">
+ {task.startDate
+ ? formatDateShort(task.startDate)
+ : t("tasks:properties.start")}
+ </span>
+ </button>
+ </TaskStartDatePopover>
+ <ArrowRight className="text-muted-foreground/60" />
+ <TaskDueDatePopover task={task}>
+ <button
+ type="button"
+ data-task-action="dueDate"
+ className={cn(
+ dateButton,
+ task.dueDate
+ ? dueDateTextClass[dueStatus]
+ : "text-muted-foreground",
+ )}
+ >
+ {task.dueDate
+ ? formatDateShort(task.dueDate)
+ : t("tasks:dueDate.label")}
++ <TaskRecurrenceBadge task={task} asText />
+ </button>
+ </TaskDueDatePopover>
+ </div>
+ <TaskLabelsPopover task={task} workspaceId={workspaceId}>
+ <button
+ type="button"
+ data-task-action="labels"
+ className={cn(chip, "h-auto min-h-8 py-1")}
+ >
+ <LabelsValue labels={labels} />
+ </button>
+ </TaskLabelsPopover>
+ </div>
+ <div className="flex flex-wrap items-center gap-1.5">
+ {canMoveTask ? (
+ <TaskMovePopover task={task} workspaceId={workspaceId}>
+ <button type="button" data-task-action="move" className={chip}>
+ {projectContent}
+ </button>
+ </TaskMovePopover>
+ ) : (
+ <span className={cn(chip, "hover:bg-accent/30")}>
+ {projectContent}
+ </span>
+ )}
+ <TaskCustomFieldChips
+ taskId={taskId}
+ projectId={projectId}
+ className="h-8"
+ />
+ </div>
+ </div>
+ );
+ }
diff --cc apps/web/src/components/task/task-due-date-picker.tsx
index 4dde1bc24,000000000..8e7777e83
mode 100644,000000..100644
--- a/apps/web/src/components/task/task-due-date-picker.tsx
+++ b/apps/web/src/components/task/task-due-date-picker.tsx
@@@ -1,91 -1,0 +1,78 @@@
- import { Repeat, X } from "lucide-react";
++import { Repeat } from "lucide-react";
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
++import { DatePickerMenu } from "@/components/common/date-picker/date-picker-menu";
+import { Button } from "@/components/ui/button";
- import { Calendar } from "@/components/ui/calendar";
+import { cn } from "@/lib/cn";
+import { defaultRecurrence } from "@/lib/default-recurrence";
+import { upcomingOccurrences } from "@/lib/next-occurrence-date";
+import type { TaskRecurrence } from "@/types/task/recurrence";
+import TaskRecurrenceSettings from "./task-recurrence-settings";
+
+type TaskDueDatePickerProps = {
- dueDate: Date | undefined;
++ label: string;
++ clearLabel: string;
++ dueDate: Date | null;
+ startDate?: Date;
+ recurrence: TaskRecurrence | null;
- onDateChange: (date: Date | undefined) => void;
++ onDateChange: (date: Date | null) => void;
+ onRecurrenceChange: (recurrence: TaskRecurrence | null) => void;
- onClear: () => void;
+};
+
+// Shared by an existing task's due date popover and the create task modal.
+export default function TaskDueDatePicker({
++ label,
++ clearLabel,
+ dueDate,
+ startDate,
+ recurrence,
+ onDateChange,
+ onRecurrenceChange,
- onClear,
+}: TaskDueDatePickerProps) {
+ const { t } = useTranslation();
+ const upcoming = useMemo(
+ () =>
+ dueDate && recurrence ? upcomingOccurrences(dueDate, recurrence, 8) : [],
+ [dueDate, recurrence],
+ );
+
+ return (
+ <>
- <Calendar
- mode="single"
- selected={dueDate}
- defaultMonth={dueDate}
- onSelect={onDateChange}
- disabled={startDate ? { before: startDate } : undefined}
- modifiers={{ repeats: upcoming }}
- modifiersClassNames={{
- repeats:
- "[&>button]:bg-primary/12 [&>button]:font-medium [&>button]:text-primary",
- }}
- className="w-full bg-popover"
++ <DatePickerMenu
++ label={label}
++ placeholder={t("tasks:datePicker.dueDatePlaceholder")}
++ clearLabel={clearLabel}
++ value={dueDate}
++ onChange={onDateChange}
++ bounds={startDate ? { before: startDate } : undefined}
++ formatLimit={(date) => t("tasks:datePicker.startsOn", { date })}
++ highlighted={upcoming}
+ />
+ {recurrence && (
+ <TaskRecurrenceSettings
+ recurrence={recurrence}
+ defaultWeekday={dueDate?.getDay()}
+ onChange={onRecurrenceChange}
+ />
+ )}
- <div className="flex items-center justify-between border-t border-border p-1.5">
++ <div className="border-t border-border p-1.5">
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ aria-pressed={Boolean(recurrence)}
+ className={cn(
+ "gap-2 text-muted-foreground hover:text-foreground",
+ recurrence && "bg-accent text-foreground",
+ )}
+ onClick={() =>
+ onRecurrenceChange(recurrence ? null : defaultRecurrence())
+ }
+ >
+ <Repeat className="h-4 w-4" />
+ {t("tasks:popover.recurrence.toggle")}
+ </Button>
- {dueDate && (
- <Button
- type="button"
- variant="ghost"
- size="sm"
- className="gap-2 text-muted-foreground hover:text-foreground"
- onClick={onClear}
- >
- <X className="h-4 w-4" />
- {t("tasks:popover.dueDate.clear")}
- </Button>
- )}
+ </div>
+ </>
+ );
+}
diff --cc apps/web/src/components/task/task-due-date-popover.tsx
index 616aa8e08,5cd94ea44..6757434e3
--- a/apps/web/src/components/task/task-due-date-popover.tsx
+++ b/apps/web/src/components/task/task-due-date-popover.tsx
@@@ -25,27 -23,16 +25,27 @@@ export default function TaskDueDatePopo
const { t } = useTranslation();
const [open, setOpen] = useState(false);
const { mutateAsync: updateTaskDueDate } = useUpdateTaskDueDate();
+ const { mutateAsync: updateTaskRecurrence } = useUpdateTaskRecurrence();
const { canUpdateTasks } = useWorkspacePermission();
const canEdit = canUpdateTasks();
+ const recurrence = task.recurrence ?? null;
+ const dueDate = useMemo(
- () => (task.dueDate ? new Date(task.dueDate) : undefined),
++ () => (task.dueDate ? new Date(task.dueDate) : null),
+ [task.dueDate],
+ );
+ const startDate = useMemo(
+ () => (task.startDate ? new Date(task.startDate) : undefined),
+ [task.startDate],
+ );
- const handleDateChange = async (date: Date | undefined) => {
+ const handleDateChange = async (date: Date | null) => {
try {
await updateTaskDueDate({
...task,
- dueDate: date?.toISOString() || null,
+ dueDate: date?.toISOString() ?? null,
});
- setOpen(false);
+ // Keep a repeating task's picker open to show its upcoming dates.
- if (!recurrence) setOpen(false);
++ if (!recurrence || !date) setOpen(false);
} catch (error) {
toast.error(
error instanceof Error
@@@ -72,17 -47,17 +72,15 @@@
return (
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>{children}</PopoverTrigger>
- <PopoverContent className="w-72 p-0" align="start">
+ <PopoverContent className="w-65 p-0" align="start">
- <DatePickerMenu
+ <TaskDueDatePicker
+ label={t("tasks:dueDate.label")}
- placeholder={t("tasks:datePicker.dueDatePlaceholder")}
+ clearLabel={t("tasks:popover.dueDate.clear")}
- value={task.dueDate ? new Date(task.dueDate) : null}
- onChange={handleDateChange}
- bounds={
- task.startDate ? { before: new Date(task.startDate) } : undefined
- }
- formatLimit={(date) => t("tasks:datePicker.startsOn", { date })}
+ dueDate={dueDate}
+ startDate={startDate}
+ recurrence={recurrence}
+ onDateChange={handleDateChange}
+ onRecurrenceChange={handleRecurrenceChange}
- onClear={() => {
- setOpen(false);
- void handleDateChange(undefined);
- }}
/>
</PopoverContent>
</Popover>
diff --cc i18n/az-AZ.json
index 493b0571e,d60fde309..55b6d1669
--- a/i18n/az-AZ.json
+++ b/i18n/az-AZ.json
@@@ -3164,22 -3230,13 +3256,24 @@@
"missingRequired_other": "{{count}} məcburi sahə boşdur",
"saveError": "{{field}} saxlanılmadı",
"moreFields_one": "Daha {{count}} sahə",
- "moreFields_other": "Daha {{count}} sahə"
+ "moreFields_other": "Daha {{count}} sahə",
+ "manage": "Sahələri idarə et"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Önbaxış üçün Boşluq, bu tapşırığı açmaq üçün Enter düyməsini basın. Köçürmək üçün Alt və ya Option ilə ox düymələrindən istifadə edin."
},
+ "recurrence": {
+ "daily_one": "Hər gün",
+ "daily_other": "Hər {{count}} gündən bir",
+ "monthly_one": "Hər ay",
+ "monthly_other": "Hər {{count}} aydan bir",
+ "weekly_one": "Hər həftə",
+ "weekly_other": "Hər {{count}} həftədən bir",
+ "yearly_one": "Hər il",
+ "yearly_other": "Hər {{count}} ildən bir",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "Tapşırıqları axtar",
"clearSearch": "Axtarışı təmizlə",
diff --cc i18n/de-DE.json
index 7d58ec510,7cda2c885..5f1f26783
--- a/i18n/de-DE.json
+++ b/i18n/de-DE.json
@@@ -3164,22 -3230,13 +3256,24 @@@
"missingRequired_other": "{{count}} Pflichtfelder sind leer",
"saveError": "{{field}} konnte nicht gespeichert werden",
"moreFields_one": "{{count}} weiteres Feld",
- "moreFields_other": "{{count}} weitere Felder"
+ "moreFields_other": "{{count}} weitere Felder",
+ "manage": "Felder verwalten"
},
"board": {
- "reorderFailed": "Die Reihenfolge konnte nicht gespeichert werden."
+ "reorderFailed": "Die Reihenfolge konnte nicht gespeichert werden.",
+ "keyboardInstructions": "Drücke die Leertaste für die Vorschau und Enter, um diese Aufgabe zu öffnen. Mit Alt oder Option und den Pfeiltasten verschiebst du sie."
},
+ "recurrence": {
+ "daily_one": "Jeden Tag",
+ "daily_other": "Alle {{count}} Tage",
+ "monthly_one": "Jeden Monat",
+ "monthly_other": "Alle {{count}} Monate",
+ "weekly_one": "Jede Woche",
+ "weekly_other": "Alle {{count}} Wochen",
+ "yearly_one": "Jedes Jahr",
+ "yearly_other": "Alle {{count}} Jahre",
+ "onDays": "{{rule}} am {{days}}"
+ },
"toolbar": {
"search": "Aufgaben suchen",
"clearSearch": "Suche leeren",
diff --cc i18n/el-GR.json
index 726e1aae3,4d21e668d..b8b806062
--- a/i18n/el-GR.json
+++ b/i18n/el-GR.json
@@@ -3164,22 -3230,13 +3256,24 @@@
"missingRequired_other": "{{count}} υποχρεωτικά πεδία είναι κενά",
"saveError": "Δεν ήταν δυνατή η αποθήκευση του πεδίου {{field}}",
"moreFields_one": "{{count}} ακόμη πεδίο",
- "moreFields_other": "{{count}} ακόμη πεδία"
+ "moreFields_other": "{{count}} ακόμη πεδία",
+ "manage": "Διαχείριση πεδίων"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Πατήστε Space για προεπισκόπηση και Enter για να ανοίξετε αυτή την εργασία. Χρησιμοποιήστε Alt ή Option με τα βέλη για να τη μετακινήσετε."
},
+ "recurrence": {
+ "daily_one": "Κάθε ημέρα",
+ "daily_other": "Κάθε {{count}} ημέρες",
+ "monthly_one": "Κάθε μήνα",
+ "monthly_other": "Κάθε {{count}} μήνες",
+ "weekly_one": "Κάθε εβδομάδα",
+ "weekly_other": "Κάθε {{count}} εβδομάδες",
+ "yearly_one": "Κάθε χρόνο",
+ "yearly_other": "Κάθε {{count}} χρόνια",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "Αναζήτηση εργασιών",
"clearSearch": "Εκκαθάριση αναζήτησης",
diff --cc i18n/fr-FR.json
index 56d42e447,9931dca78..19ee1e91d
--- a/i18n/fr-FR.json
+++ b/i18n/fr-FR.json
@@@ -3219,26 -3282,13 +3312,28 @@@
"saveError": "Impossible d'enregistrer {{field}}",
"moreFields_one": "{{count}} champ de plus",
"moreFields_many": "{{count}} champs de plus",
- "moreFields_other": "{{count}} champs de plus"
+ "moreFields_other": "{{count}} champs de plus",
+ "manage": "Gérer les champs"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Appuyez sur Espace pour l'aperçu et sur Entrée pour ouvrir cette tâche. Utilisez Alt ou Option avec les flèches pour la déplacer."
},
+ "recurrence": {
+ "daily_many": "Tous les {{count}} jours",
+ "daily_one": "Tous les jours",
+ "daily_other": "Tous les {{count}} jours",
+ "monthly_many": "Tous les {{count}} mois",
+ "monthly_one": "Tous les mois",
+ "monthly_other": "Tous les {{count}} mois",
+ "weekly_many": "Toutes les {{count}} semaines",
+ "weekly_one": "Toutes les semaines",
+ "weekly_other": "Toutes les {{count}} semaines",
+ "yearly_many": "Tous les {{count}} ans",
+ "yearly_one": "Tous les ans",
+ "yearly_other": "Tous les {{count}} ans",
+ "onDays": "{{rule}} : {{days}}"
+ },
"toolbar": {
"search": "Rechercher des tâches",
"clearSearch": "Effacer la recherche",
diff --cc i18n/hi-IN.json
index f652a8f58,b1a333a0a..d057c1e5a
--- a/i18n/hi-IN.json
+++ b/i18n/hi-IN.json
@@@ -3164,22 -3230,13 +3256,24 @@@
"missingRequired_other": "{{count}} आवश्यक फ़ील्ड खाली हैं",
"saveError": "{{field}} सहेजा नहीं जा सका",
"moreFields_one": "{{count}} और फ़ील्ड",
- "moreFields_other": "{{count}} और फ़ील्ड"
+ "moreFields_other": "{{count}} और फ़ील्ड",
+ "manage": "फ़ील्ड प्रबंधित करें"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "पूर्वावलोकन के लिए Space और यह कार्य खोलने के लिए Enter दबाएँ। इसे ले जाने के लिए Alt या Option के साथ तीर कुंजियों का उपयोग करें।"
},
+ "recurrence": {
+ "daily_one": "हर दिन",
+ "daily_other": "हर {{count}} दिन",
+ "monthly_one": "हर महीने",
+ "monthly_other": "हर {{count}} महीने",
+ "weekly_one": "हर सप्ताह",
+ "weekly_other": "हर {{count}} सप्ताह",
+ "yearly_one": "हर साल",
+ "yearly_other": "हर {{count}} साल",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "कार्य खोजें",
"clearSearch": "खोज साफ़ करें",
diff --cc i18n/id-ID.json
index 2cf0893be,d270462ce..13884cfbf
--- a/i18n/id-ID.json
+++ b/i18n/id-ID.json
@@@ -3109,18 -3178,13 +3200,20 @@@
"noMatches": "Tidak ada opsi yang cocok",
"missingRequired_other": "{{count}} kolom wajib masih kosong",
"saveError": "Gagal menyimpan {{field}}",
- "moreFields_other": "{{count}} kolom lainnya"
+ "moreFields_other": "{{count}} kolom lainnya",
+ "manage": "Kelola kolom"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Tekan Spasi untuk pratinjau dan Enter untuk membuka tugas ini. Gunakan Alt atau Option dengan tombol panah untuk memindahkannya."
},
+ "recurrence": {
+ "daily_other": "Setiap {{count}} hari",
+ "monthly_other": "Setiap {{count}} bulan",
+ "weekly_other": "Setiap {{count}} minggu",
+ "yearly_other": "Setiap {{count}} tahun",
+ "onDays": "{{rule}} pada {{days}}"
+ },
"toolbar": {
"search": "Cari tugas",
"clearSearch": "Hapus pencarian",
diff --cc i18n/it-IT.json
index 9a95962e9,22ea15e9e..7fa1798cd
--- a/i18n/it-IT.json
+++ b/i18n/it-IT.json
@@@ -3219,26 -3282,13 +3312,28 @@@
"saveError": "Impossibile salvare {{field}}",
"moreFields_one": "Altro {{count}} campo",
"moreFields_many": "Altri {{count}} campi",
- "moreFields_other": "Altri {{count}} campi"
+ "moreFields_other": "Altri {{count}} campi",
+ "manage": "Gestisci campi"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Premi Spazio per l'anteprima e Invio per aprire questa attività. Usa Alt o Opzione con le frecce per spostarla."
},
+ "recurrence": {
+ "daily_many": "Ogni {{count}} giorni",
+ "daily_one": "Ogni giorno",
+ "daily_other": "Ogni {{count}} giorni",
+ "monthly_many": "Ogni {{count}} mesi",
+ "monthly_one": "Ogni mese",
+ "monthly_other": "Ogni {{count}} mesi",
+ "weekly_many": "Ogni {{count}} settimane",
+ "weekly_one": "Ogni settimana",
+ "weekly_other": "Ogni {{count}} settimane",
+ "yearly_many": "Ogni {{count}} anni",
+ "yearly_one": "Ogni anno",
+ "yearly_other": "Ogni {{count}} anni",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "Cerca attività",
"clearSearch": "Cancella ricerca",
diff --cc i18n/ja-JP.json
index c32017bc4,b4c3a0b23..aaead566b
--- a/i18n/ja-JP.json
+++ b/i18n/ja-JP.json
@@@ -3109,18 -3178,13 +3200,20 @@@
"noMatches": "一致するオプションがありません",
"missingRequired_other": "必須フィールドが {{count}} 件未入力です",
"saveError": "{{field}}を保存できませんでした",
- "moreFields_other": "ほか {{count}} 件のフィールド"
+ "moreFields_other": "ほか {{count}} 件のフィールド",
+ "manage": "フィールドを管理"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Space でプレビュー、Enter でこのタスクを開きます。Alt または Option と矢印キーで移動できます。"
},
+ "recurrence": {
+ "daily_other": "{{count}}日ごと",
+ "monthly_other": "{{count}}か月ごと",
+ "weekly_other": "{{count}}週間ごと",
+ "yearly_other": "{{count}}年ごと",
+ "onDays": "{{rule}}({{days}})"
+ },
"toolbar": {
"search": "タスクを検索",
"clearSearch": "検索をクリア",
diff --cc i18n/ko-KR.json
index aaddd0451,a9d267ebf..cf4c30fef
--- a/i18n/ko-KR.json
+++ b/i18n/ko-KR.json
@@@ -3109,18 -3178,13 +3200,20 @@@
"noMatches": "일치하는 옵션이 없습니다",
"missingRequired_other": "필수 필드 {{count}}개가 비어 있습니다",
"saveError": "{{field}}을(를) 저장하지 못했습니다",
- "moreFields_other": "필드 {{count}}개 더 보기"
+ "moreFields_other": "필드 {{count}}개 더 보기",
+ "manage": "필드 관리"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Space를 눌러 미리 보고 Enter를 눌러 이 작업을 엽니다. Alt 또는 Option과 화살표 키로 이동할 수 있습니다."
},
+ "recurrence": {
+ "daily_other": "{{count}}일마다",
+ "monthly_other": "{{count}}개월마다",
+ "weekly_other": "{{count}}주마다",
+ "yearly_other": "{{count}}년마다",
+ "onDays": "{{rule}} {{days}}"
+ },
"toolbar": {
"search": "작업 검색",
"clearSearch": "검색 지우기",
diff --cc i18n/mk-MK.json
index da33a08fb,0b43416ff..db391aab8
--- a/i18n/mk-MK.json
+++ b/i18n/mk-MK.json
@@@ -3164,22 -3230,13 +3256,24 @@@
"missingRequired_other": "{{count}} задолжителни полиња се празни",
"saveError": "{{field}} не може да се зачува",
"moreFields_one": "Уште {{count}} поле",
- "moreFields_other": "Уште {{count}} полиња"
+ "moreFields_other": "Уште {{count}} полиња",
+ "manage": "Управувај со полиња"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Притиснете Space за преглед и Enter за да ја отворите оваа задача. Користете Alt или Option со стрелките за да ја преместите."
},
+ "recurrence": {
+ "daily_one": "На секој {{count}} ден",
+ "daily_other": "На секои {{count}} дена",
+ "monthly_one": "На секој {{count}} месец",
+ "monthly_other": "На секои {{count}} месеци",
+ "weekly_one": "На секоја {{count}} недела",
+ "weekly_other": "На секои {{count}} недели",
+ "yearly_one": "На секоја {{count}} година",
+ "yearly_other": "На секои {{count}} години",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "Пребарај задачи",
"clearSearch": "Исчисти пребарување",
diff --cc i18n/nl-NL.json
index 451a5f2c9,cb6ba0006..d6951bbfd
--- a/i18n/nl-NL.json
+++ b/i18n/nl-NL.json
@@@ -3164,22 -3230,13 +3256,24 @@@
"missingRequired_other": "{{count}} verplichte velden zijn leeg",
"saveError": "{{field}} kon niet worden opgeslagen",
"moreFields_one": "Nog {{count}} veld",
- "moreFields_other": "Nog {{count}} velden"
+ "moreFields_other": "Nog {{count}} velden",
+ "manage": "Velden beheren"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Druk op Spatie voor een voorbeeld en op Enter om deze taak te openen. Gebruik Alt of Option met de pijltjestoetsen om haar te verplaatsen."
},
+ "recurrence": {
+ "daily_one": "Elke dag",
+ "daily_other": "Om de {{count}} dagen",
+ "monthly_one": "Elke maand",
+ "monthly_other": "Om de {{count}} maanden",
+ "weekly_one": "Elke week",
+ "weekly_other": "Om de {{count}} weken",
+ "yearly_one": "Elk jaar",
+ "yearly_other": "Om de {{count}} jaar",
+ "onDays": "{{rule}} op {{days}}"
+ },
"toolbar": {
"search": "Taken zoeken",
"clearSearch": "Zoekopdracht wissen",
diff --cc i18n/pl-PL.json
index 6b43d715e,d268e8a81..509d3e161
--- a/i18n/pl-PL.json
+++ b/i18n/pl-PL.json
@@@ -3556,30 -3616,13 +3650,32 @@@
"moreFields_one": "Jeszcze {{count}} pole",
"moreFields_few": "Jeszcze {{count}} pola",
"moreFields_many": "Jeszcze {{count}} pól",
- "moreFields_other": "Jeszcze {{count}} pola"
+ "moreFields_other": "Jeszcze {{count}} pola",
+ "manage": "Zarządzaj polami"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Naciśnij Spację, aby wyświetlić podgląd, i Enter, aby otworzyć to zadanie. Użyj Alt lub Option ze strzałkami, aby je przenieść."
},
+ "recurrence": {
+ "daily_few": "Co {{count}} dni",
+ "daily_many": "Co {{count}} dni",
+ "daily_one": "Codziennie",
+ "daily_other": "Co {{count}} dnia",
+ "monthly_few": "Co {{count}} miesiące",
+ "monthly_many": "Co {{count}} miesięcy",
+ "monthly_one": "Co miesiąc",
+ "monthly_other": "Co {{count}} miesiąca",
+ "weekly_few": "Co {{count}} tygodnie",
+ "weekly_many": "Co {{count}} tygodni",
+ "weekly_one": "Co tydzień",
+ "weekly_other": "Co {{count}} tygodnia",
+ "yearly_few": "Co {{count}} lata",
+ "yearly_many": "Co {{count}} lat",
+ "yearly_one": "Co rok",
+ "yearly_other": "Co {{count}} roku",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "Szukaj zadań",
"clearSearch": "Wyczyść wyszukiwanie",
diff --cc i18n/pt-BR.json
index 8947d9e63,ee7377f92..02f54e442
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@@ -3219,26 -3282,13 +3312,28 @@@
"saveError": "Não foi possível salvar {{field}}",
"moreFields_one": "Mais {{count}} campo",
"moreFields_many": "Mais {{count}} campos",
- "moreFields_other": "Mais {{count}} campos"
+ "moreFields_other": "Mais {{count}} campos",
+ "manage": "Gerenciar campos"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Pressione Espaço para pré-visualizar e Enter para abrir esta tarefa. Use Alt ou Option com as setas para movê-la."
},
+ "recurrence": {
+ "daily_many": "A cada {{count}} dias",
+ "daily_one": "Todos os dias",
+ "daily_other": "A cada {{count}} dias",
+ "monthly_many": "A cada {{count}} meses",
+ "monthly_one": "Todo mês",
+ "monthly_other": "A cada {{count}} meses",
+ "weekly_many": "A cada {{count}} semanas",
+ "weekly_one": "Toda semana",
+ "weekly_other": "A cada {{count}} semanas",
+ "yearly_many": "A cada {{count}} anos",
+ "yearly_one": "Todo ano",
+ "yearly_other": "A cada {{count}} anos",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "Buscar tarefas",
"clearSearch": "Limpar busca",
diff --cc i18n/ru-RU.json
index 1c2a64dfb,35295effd..0c90edfba
--- a/i18n/ru-RU.json
+++ b/i18n/ru-RU.json
@@@ -3326,30 -3386,13 +3420,32 @@@
"moreFields_one": "Ещё {{count}} поле",
"moreFields_few": "Ещё {{count}} поля",
"moreFields_many": "Ещё {{count}} полей",
- "moreFields_other": "Ещё {{count}} поля"
+ "moreFields_other": "Ещё {{count}} поля",
+ "manage": "Управлять полями"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Нажмите Пробел для предпросмотра и Enter, чтобы открыть эту задачу. Используйте Alt или Option со стрелками, чтобы переместить её."
},
+ "recurrence": {
+ "daily_few": "Каждые {{count}} дня",
+ "daily_many": "Каждые {{count}} дней",
+ "daily_one": "Каждый {{count}} день",
+ "daily_other": "Каждые {{count}} дня",
+ "monthly_few": "Каждые {{count}} месяца",
+ "monthly_many": "Каждые {{count}} месяцев",
+ "monthly_one": "Каждый {{count}} месяц",
+ "monthly_other": "Каждые {{count}} месяца",
+ "weekly_few": "Каждые {{count}} недели",
+ "weekly_many": "Каждые {{count}} недель",
+ "weekly_one": "Каждую {{count}} неделю",
+ "weekly_other": "Каждые {{count}} недели",
+ "yearly_few": "Каждые {{count}} года",
+ "yearly_many": "Каждые {{count}} лет",
+ "yearly_one": "Каждый {{count}} год",
+ "yearly_other": "Каждые {{count}} года",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "Поиск задач",
"clearSearch": "Очистить поиск",
diff --cc i18n/tr-TR.json
index 20fb7f039,b48599b2b..21d34e1a7
--- a/i18n/tr-TR.json
+++ b/i18n/tr-TR.json
@@@ -3164,22 -3230,13 +3256,24 @@@
"missingRequired_other": "{{count}} zorunlu alan boş",
"saveError": "{{field}} kaydedilemedi",
"moreFields_one": "{{count}} alan daha",
- "moreFields_other": "{{count}} alan daha"
+ "moreFields_other": "{{count}} alan daha",
+ "manage": "Alanları yönet"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Önizleme için Boşluk, bu talebi açmak için Enter tuşuna basın. Taşımak için Alt veya Option ile ok tuşlarını kullanın."
},
+ "recurrence": {
+ "daily_one": "Her gün",
+ "daily_other": "{{count}} günde bir",
+ "monthly_one": "Her ay",
+ "monthly_other": "{{count}} ayda bir",
+ "weekly_one": "Her hafta",
+ "weekly_other": "{{count}} haftada bir",
+ "yearly_one": "Her yıl",
+ "yearly_other": "{{count}} yılda bir",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "Görev ara",
"clearSearch": "Aramayı temizle",
diff --cc i18n/uk-UA.json
index 8060dedd9,06c19ae37..88aa54e94
--- a/i18n/uk-UA.json
+++ b/i18n/uk-UA.json
@@@ -3274,30 -3334,13 +3368,32 @@@
"moreFields_one": "Ще {{count}} поле",
"moreFields_few": "Ще {{count}} поля",
"moreFields_many": "Ще {{count}} полів",
- "moreFields_other": "Ще {{count}} поля"
+ "moreFields_other": "Ще {{count}} поля",
+ "manage": "Керувати полями"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Натисніть Пробіл для попереднього перегляду та Enter, щоб відкрити це завдання. Використовуйте Alt або Option зі стрілками, щоб перемістити його."
},
+ "recurrence": {
+ "daily_few": "Кожні {{count}} дні",
+ "daily_many": "Кожні {{count}} днів",
+ "daily_one": "Кожен {{count}} день",
+ "daily_other": "Кожні {{count}} дня",
+ "monthly_few": "Кожні {{count}} місяці",
+ "monthly_many": "Кожні {{count}} місяців",
+ "monthly_one": "Кожен {{count}} місяць",
+ "monthly_other": "Кожні {{count}} місяця",
+ "weekly_few": "Кожні {{count}} тижні",
+ "weekly_many": "Кожні {{count}} тижнів",
+ "weekly_one": "Кожен {{count}} тиждень",
+ "weekly_other": "Кожні {{count}} тижня",
+ "yearly_few": "Кожні {{count}} роки",
+ "yearly_many": "Кожні {{count}} років",
+ "yearly_one": "Кожен {{count}} рік",
+ "yearly_other": "Кожні {{count}} року",
+ "onDays": "{{rule}}: {{days}}"
+ },
"toolbar": {
"search": "Пошук завдань",
"clearSearch": "Очистити пошук",
diff --cc i18n/vi-VN.json
index a7755a4c3,e79e28d27..36aceb6e7
--- a/i18n/vi-VN.json
+++ b/i18n/vi-VN.json
@@@ -3109,18 -3178,13 +3200,20 @@@
"noMatches": "Không có tùy chọn phù hợp",
"missingRequired_other": "{{count}} trường bắt buộc còn trống",
"saveError": "Không thể lưu {{field}}",
- "moreFields_other": "Thêm {{count}} trường"
+ "moreFields_other": "Thêm {{count}} trường",
+ "manage": "Quản lý trường"
},
"board": {
- "reorderFailed": "Could not move task. Please try again."
+ "reorderFailed": "Could not move task. Please try again.",
+ "keyboardInstructions": "Nhấn Space để xem trước và Enter để mở công việc này. Dùng Alt hoặc Option với phím mũi tên để di chuyển."
},
+ "recurrence": {
+ "daily_other": "Mỗi {{count}} ngày",
+ "monthly_other": "Mỗi {{count}} tháng",
+ "weekly_other": "Mỗi {{count}} tuần",
+ "yearly_other": "Mỗi {{count}} năm",
+ "onDays": "{{rule}} vào {{days}}"
+ },
"toolbar": {
"search": "Tìm công việc",
"clearSearch": "Xóa tìm kiếm",
diff --cc i18n/zh-CN.json
index 2a602bb80,9d0cd8c9a..eef210e7c
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@@ -3109,18 -3178,13 +3200,20 @@@
"noMatches": "没有匹配的选项",
"missingRequired_other": "有 {{count}} 个必填字段为空",
"saveError": "无法保存{{field}}",
- "moreFields_other": "另外 {{count}} 个字段"
+ "moreFields_other": "另外 {{count}} 个字段",
+ "manage": "管理字段"
},
"board": {
- "reorderFailed": "无法移动任务,请重试。"
+ "reorderFailed": "无法移动任务,请重试。",
+ "keyboardInstructions": "按空格键预览,按 Enter 打开此任务。按住 Alt 或 Option 并使用方向键移动任务。"
},
+ "recurrence": {
+ "daily_other": "每 {{count}} 天",
+ "monthly_other": "每 {{count}} 个月",
+ "weekly_other": "每 {{count}} 周",
+ "yearly_other": "每 {{count}} 年",
+ "onDays": "{{rule}}的{{days}}"
+ },
"toolbar": {
"search": "搜索任务",
"clearSearch": "清除搜索",
diff --cc i18n/zh-TW.json
index f08200afa,37db4dcf8..85c396db4
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@@ -3109,18 -3178,13 +3200,20 @@@
"noMatches": "沒有符合的選項",
"missingRequired_other": "有 {{count}} 個必填欄位是空的",
"saveError": "無法儲存{{field}}",
- "moreFields_other": "另外 {{count}} 個欄位"
+ "moreFields_other": "另外 {{count}} 個欄位",
+ "manage": "管理欄位"
},
"board": {
- "reorderFailed": "無法移動任務,請再試一次。"
+ "reorderFailed": "無法移動任務,請再試一次。",
+ "keyboardInstructions": "按空白鍵預覽,按 Enter 開啟此任務。按住 Alt 或 Option 並使用方向鍵移動任務。"
},
+ "recurrence": {
+ "daily_other": "每 {{count}} 天",
+ "monthly_other": "每 {{count}} 個月",
+ "weekly_other": "每 {{count}} 週",
+ "yearly_other": "每 {{count}} 年",
+ "onDays": "{{rule}}的{{days}}"
+ },
"toolbar": {
"search": "搜尋任務",
"clearSearch": "清除搜尋",