k1nq/TREK
1
0
Fork 0
mirror of https://github.com/mauriceboe/TREK.git synced 2026-10-20 22:16:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tours): name the piste router switches and the stage message keys where the key scan sees them

Browse Source
This commit is contained in:
Maurice
2026-10-20 23:06:29 +02:00
parent 7fa8b3fe35
commit 0dda5bc3e9
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/Tours/ski/SkiRouteOptions.tsx
+10 -10
View File
@@ -22,16 +22,16 @@ import { fs } from '../../shared/DialogShell';
/** The switches of the piste router, each with the key of its label, in the order they are read. */
const SWITCHES = [
['use_lifts', 'tours.ski.options.useLifts'],
['allow_freeride', 'tours.ski.options.freeride'],
['allow_lift_down', 'tours.ski.options.liftDown'],
['groomed_only', 'tours.ski.options.groomedOnly'],
['lit_only', 'tours.ski.options.litOnly'],
['touring_uphill_on_pistes', 'tours.ski.options.uphillOnPistes'],
['avoid_inferred_links', 'tours.ski.options.avoidLinks'],
{ key: 'use_lifts', labelKey: 'tours.ski.options.useLifts' },
{ key: 'allow_freeride', labelKey: 'tours.ski.options.freeride' },
{ key: 'allow_lift_down', labelKey: 'tours.ski.options.liftDown' },
{ key: 'groomed_only', labelKey: 'tours.ski.options.groomedOnly' },
{ key: 'lit_only', labelKey: 'tours.ski.options.litOnly' },
{ key: 'touring_uphill_on_pistes', labelKey: 'tours.ski.options.uphillOnPistes' },
{ key: 'avoid_inferred_links', labelKey: 'tours.ski.options.avoidLinks' },
] as const;
type SwitchKey = (typeof SWITCHES)[number][0];
type SwitchKey = (typeof SWITCHES)[number]['key'];
/** One switch set, the rest of the options kept. */
function switchPatch(key: SwitchKey, on: boolean): Partial<SkiRouteOptionsInput> {
@@ -108,7 +108,7 @@ export function SkiRouteOptions({ discipline, options, onChange }: SkiRouteOptio
const current: Options = { ...DEFAULT_SKI_ROUTE_OPTIONS, ...options };
const usesLifts = skiUsesLifts(discipline, current);
const switchOn = (key: SwitchKey) => (key === 'use_lifts' ? usesLifts : current[key]);
const switches = SWITCHES.filter(([key]) => read.has(key) && (usesLifts || !LIFT_SWITCHES.has(key)));
const switches = SWITCHES.filter(({ key }) => read.has(key) && (usesLifts || !LIFT_SWITCHES.has(key)));
return (
<div data-testid="tour-planner-ski-options" className="flex min-w-0 flex-col gap-2.5">
{read.has('max_difficulty') && (
@@ -150,7 +150,7 @@ export function SkiRouteOptions({ discipline, options, onChange }: SkiRouteOptio
/>
</div>
)}
{switches.map(([key, labelKey]) => (
{switches.map(({ key, labelKey }) => (
<OptionSwitch
key={key}
label={t(labelKey)}
client/src/pages/tripPlanner/useTourDayChoice.ts
+4 -2
View File
@@ -170,8 +170,10 @@ function spreadMessage(plan: StageSpread, days: readonly Day[], t: Translate): s
if (plan.wholeOff.length > 0) {
const off = plan.wholeOff.map(numberOf).sort((a, b) => a - b);
// A tour can sit whole on several days, once on each; the sentence then names them all.
const key = off.length > 1 ? 'tours.stages.placedReplacedMany' : 'tours.stages.placedReplaced';
parts.push(t(key, { list: off.join(', ') }));
const list = off.join(', ');
parts.push(
off.length > 1 ? t('tours.stages.placedReplacedMany', { list }) : t('tours.stages.placedReplaced', { list })
);
}
return parts.join(' ');
}