Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.
JavaScript apple-watchbodyweightdockerfitnessfitness-trackergymhealthiosmcpnodejspasskeysprogressive-web-applicationspwareactself-hostedself-hostingvitewebauthnweightliftingworkout-tracker
feat(equipment): a real "I own no dumbbells" switch, honoured by the library, the picker and the Coach
Duarte Santos2947f7aff7e1
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 363f3e0ee..67f7e62f9 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -145,6 +145,10 @@ per muscle. Settings → Workout → Fine-tuning turns it off.felt, in RPE whatever your sets use, worded for a run instead of reps left. An easy walk thenloads your fatigue map less than a hard run; unrated cardio counts as it always did. The inclinekeeps its column.+- **"I own no dumbbells"** (Discord). Settings → Equipment → Dumbbells has a switch for it now,+ since an empty list only ever meant "any weight". On, dumbbell lifts leave the library, the+ picker and the Coach's plans, with or without an equipment profile, and even if the Coach was+ once told you have some. Your list of bells waits for the day you buy a pair.- **Count warm-ups in volume**, if you like (#719). A new switch in Settings → Units & languageadds your done warm-ups to every volume the app shows: the workout, the summary, history,Stats, the report and the coach. Off by default, and records ignore warm-ups either way. Thediff --git a/api/coach/core/library.js b/api/coach/core/library.jsindex 3f6ffc653..643b65c04 100644--- a/api/coach/core/library.js+++ b/api/coach/core/library.js@@ -25,6 +25,12 @@ export function equipmentAllows(equipment, id) {return !eq || eq === ALWAYS_AVAILABLE || wanted.includes(eq);}+/* "I own no dumbbells", the app's switch under Settings → Equipment → Dumbbells (frontend+ lib/dumbbells.js ownsNoDumbbells): kept in the synced dumbbell map under `none`. It holds+ whatever the Coach's own equipment answer says, the switch being the more direct statement. */+export const ownsNoDumbbells = S => S?.dumbbells?.none?.on === true;+export const isDumbbellLift = id => (LIB_BY_ID.get(id)?.eq || '').toLowerCase() === 'dumbbell';+/* ---------- the library slice the model gets to choose from ----------Bounded. The whole catalogue is 1,324 rows — 10k+ tokens on every job, which costs real moneyagainst a cloud API and does not fit a small local model's context at all; and a model does@@ -80,7 +86,9 @@ export function librarySlice(S, equipment, { keep = [], max = MAX_LIBRARY } = {}// No equipment stated (or "everything") ⇒ the whole catalogue. Filtering to nothing would// leave the Coach unable to propose anything at all, which is a worse failure than a// slightly larger payload.- const filtered = wanted.length ? LIBRARY.filter(e => equipmentAllows(wanted, e.id)) : LIBRARY;+ const noDumbbells = ownsNoDumbbells(S);+ const filtered = (wanted.length ? LIBRARY.filter(e => equipmentAllows(wanted, e.id)) : LIBRARY)+ .filter(e => !noDumbbells || !isDumbbellLift(e.id));const equipped = filtered.length ? filtered : LIBRARY;// Same reasoning as the equipment fallback: a filter that removed everything is not a filter// worth honouring. Someone whose only kit reaches nothing but stretches gets the stretches.diff --git a/api/coach/core/payload.js b/api/coach/core/payload.jsindex 6dfa3dbc4..e9cf75c7f 100644--- a/api/coach/core/payload.js+++ b/api/coach/core/payload.js@@ -11,7 +11,7 @@* and appearance settings, and every other profile's everything.*/import { glyphStr } from './glyphs.js';-import { LIBRARY, LIB_BY_ID, libraryHas, libraryName, librarySlice, isStretch, MAX_LIBRARY } from './library.js';+import { LIBRARY, LIB_BY_ID, libraryHas, libraryName, librarySlice, isStretch, MAX_LIBRARY, ownsNoDumbbells } from './library.js';export const CONTRACT = 1;// Bounds from FR-22. A review reads a training block, not a training career: more history@@ -521,6 +521,12 @@ export function build(S, opts = {}) {if (p.coachProfile && !p.coachProfile.equipment.length) {p.coachProfile.equipment = cleanProfile({ equipment: activeEquipment(S) }).equipment;}+ // Owning no dumbbells (the app's switch) wins over an equipment answer that lists them: they go+ // from what the model is told it has, and the validator turns a dumbbell lift away (noDumbbells).+ if (ownsNoDumbbells(S)) {+ p.noDumbbells = true;+ if (p.coachProfile) p.coachProfile.equipment = p.coachProfile.equipment.filter(e => e.toLowerCase() !== 'dumbbell');+ }// What the user already turned down, so the Coach does not re-propose it without new// evidence (FR-26). Summaries only — the log's full before/after stays on the device.diff --git a/api/coach/core/pipeline.js b/api/coach/core/pipeline.jsindex 1cac6e226..6ffa76e65 100644--- a/api/coach/core/pipeline.js+++ b/api/coach/core/pipeline.js@@ -67,19 +67,20 @@ export async function attemptOnce({ adapter, cfg, kind, payload, model, timeoutMconst customIds = (payload.library || []).filter(e => e && e.custom).map(e => e.id);const equipment = payload.coachProfile?.equipment || [];const offered = new Set((payload.library || []).map(e => e && e.id));+ const noDumbbells = payload.noDumbbells === true;// A revision answered as a review-style change list (#471) is laid onto the plan it revises// when every change can be placed exactly, and then judged as the plan it now is.const answer = kind === 'create' && isChangeList(parsed.value)? changesOntoPlan(payload.refine?.previous, parsed.value) || parsed.value: parsed.value;const checked = kind === 'review'- ? validateReview(parsed.value, payload.plan, { customIds, equipment, offered })+ ? validateReview(parsed.value, payload.plan, { customIds, equipment, offered, noDumbbells }): kind === 'debrief'? validateDebrief(parsed.value): kind === 'ask'? validateAsk(parsed.value): validatePlan(answer, {- customIds, equipment, offered,+ customIds, equipment, offered, noDumbbells,workingWeights: payload.history?.workingWeights,daysPerWeek: payload.coachProfile?.daysPerWeek});diff --git a/api/coach/core/validate.js b/api/coach/core/validate.jsindex b908ced8a..0d0e2abe8 100644--- a/api/coach/core/validate.js+++ b/api/coach/core/validate.js@@ -14,14 +14,15 @@* model verbatim for the one repair round (FR-48) — and a list of six problems produces a* better second attempt than the first of them does.*/-import { libraryHas, libraryName, equipmentAllows } from './library.js';+import { libraryHas, libraryName, equipmentAllows, isDumbbellLift } from './library.js';// A catalogue exercise the person's equipment does not reach, and that was not in the library// slice they were offered (which already pins what they train). The prompt says "their// equipment"; a model that names a leverage machine anyway is told so on the repair round// instead of the plan arriving with a machine they do not own.-const offEquipment = (ctx, id) => !!ctx.equipment?.length && libraryHas(id)- && !(ctx.offered && ctx.offered.has(id)) && !equipmentAllows(ctx.equipment, id);+// Someone who owns no dumbbells (ctx.noDumbbells) is held to it even with no equipment stated.+const offEquipment = (ctx, id) => libraryHas(id) && !(ctx.offered && ctx.offered.has(id))+ && ((!!ctx.equipment?.length && !equipmentAllows(ctx.equipment, id)) || (ctx.noDumbbells === true && isDumbbellLift(id)));const OFF_EQUIPMENT = (where, id) => `${where} "${id}" needs equipment the user does not have — use an exercise from the library provided in the payload`;import { glyphStr } from './glyphs.js';diff --git a/api/test/no-dumbbells.test.js b/api/test/no-dumbbells.test.jsnew file mode 100644index 000000000..785f84b4b--- /dev/null+++ b/api/test/no-dumbbells.test.js@@ -0,0 +1,51 @@+/* "I own no dumbbells" (Discord, deamondo): the app's switch, stored in the synced dumbbell map+ * as `none`, keeps dumbbell lifts out of what the Coach is offered, what it is told the person+ * has, and what the validator lets through, whatever the Coach's own equipment answer says. */+import test from 'node:test';+import assert from 'node:assert/strict';+import { tempData, sampleState } from './helpers.mjs';++tempData();+const payload = await import('../coach/core/payload.js');+const { validatePlan } = await import('../coach/core/validate.js');+const { handleFor } = await import('../coach/handle.js');++const eqOf = id => (payload.LIBRARY.find(e => e.id === id) || {}).eq;+const NONE = { none: { on: true, _ts: 1 } };+const aDumbbellLift = payload.LIBRARY.find(e => e.eq === 'dumbbell').id;++test('the library slice leaves dumbbell lifts out when the person owns none', () => {+ assert.ok(payload.librarySlice({}, []).some(e => eqOf(e.id) === 'dumbbell'), 'the plain slice has some');+ assert.ok(!payload.librarySlice({ dumbbells: NONE }, []).some(e => eqOf(e.id) === 'dumbbell'));+ assert.ok(!payload.librarySlice({ dumbbells: NONE }, ['dumbbell', 'barbell']).some(e => eqOf(e.id) === 'dumbbell'));+ // Switched back off (a stamped false), they return.+ assert.ok(payload.librarySlice({ dumbbells: { none: { on: false, _ts: 2 } } }, []).some(e => eqOf(e.id) === 'dumbbell'));+ // One they already train still travels: a review has to be able to name it.+ assert.ok(payload.librarySlice({ dumbbells: NONE }, [], { keep: [aDumbbellLift] }).some(e => e.id === aDumbbellLift));+});++test('the Coach is told no dumbbells even when its own answer listed them', () => {+ const S = sampleState();+ S.coach = { ...(S.coach || {}), profile: { goal: 'muscle', daysPerWeek: 3, equipment: ['dumbbell', 'barbell'] } };+ S.dumbbells = NONE;+ const p = payload.build(S, { handle: handleFor('u1'), kind: 'create' });+ assert.deepEqual(p.coachProfile.equipment, ['barbell']);+ assert.equal(p.noDumbbells, true);+ const trained = new Set((S.workouts || []).flatMap(w => (w.entries || []).map(en => en.id)));+ assert.ok(!p.library.some(e => eqOf(e.id) === 'dumbbell' && !trained.has(e.id)));+ // Without the switch nothing changes.+ delete S.dumbbells;+ const plain = payload.build(S, { handle: handleFor('u1'), kind: 'create' });+ assert.deepEqual(plain.coachProfile.equipment, ['dumbbell', 'barbell']);+ assert.equal(plain.noDumbbells, undefined);+});++test('a plan with a dumbbell lift goes back for repair, even with no equipment stated', () => {+ const plan = { routines: [{ name: 'A', ex: [{ id: aDumbbellLift, sets: 3, reps: 10 }] }] };+ const r = validatePlan(plan, { equipment: [], offered: new Set(), noDumbbells: true });+ assert.equal(r.ok, false);+ assert.match(r.errors.join('\n'), /needs equipment the user does not have/);+ assert.equal(validatePlan(plan, { equipment: [], offered: new Set() }).ok, true);+ // One they were offered (already in their training) stays allowed.+ assert.equal(validatePlan(plan, { equipment: [], offered: new Set([aDumbbellLift]), noDumbbells: true }).ok, true);+});diff --git a/frontend/src/lib/dumbbells.js b/frontend/src/lib/dumbbells.jsindex 5aa9a0b80..8481e6c85 100644--- a/frontend/src/lib/dumbbells.js+++ b/frontend/src/lib/dumbbells.js@@ -197,6 +197,17 @@ export const ownsDumbbells = S => dumbbellsOf(S).length > 0export const withDumbbells = (S, weights, now = Date.now()) =>({ ...(isMap(S?.dumbbells) ? S.dumbbells : {}), [unitOf(S)]: { weights: cleanWeights(weights), _ts: now } })+// "I own no dumbbells" (Discord, deamondo): an empty list means any weight, so owning none is a+// switch of its own. It sits in the same stamped map under `none` ({ on, _ts }), not under a unit,+// since no bells is no bells in kg and lb alike; the map's per-key merge keeps the last flip.+// lib/equipment.js then keeps dumbbell lifts out like missing equipment, and the Coach's library+// (api/coach/core/library.js) reads the same key.+/** Whether this profile said it owns no dumbbells at all. */+export const ownsNoDumbbells = S => S?.dumbbells?.none?.on === true+/** S.dumbbells with the "none" switch set, stamped. Off is kept as a stamped false, so it wins a sync. */+export const withNoDumbbells = (S, on, now = Date.now()) =>+ ({ ...(isMap(S?.dumbbells) ? S.dumbbells : {}), none: { on: !!on, _ts: now } })+/*** The loads this exercise can be done at with the bells you own, lightest first, in the unit and* meaning the sets are logged in; null when the inventory does not apply and the increment's griddiff --git a/frontend/src/lib/dumbbells.test.js b/frontend/src/lib/dumbbells.test.jsindex 59cd7bf16..fc184fbdb 100644--- a/frontend/src/lib/dumbbells.test.js+++ b/frontend/src/lib/dumbbells.test.js@@ -233,3 +233,20 @@ describe('sync and sharing', () => {expect(back.routines[0].ex[0].dbLoad).toBe('each')})})++// "I own no dumbbells" (Discord, deamondo) rides in the same stamped map, under `none`.+describe('the no-dumbbells switch', () => {+ it('is its own key, beside the per-unit lists, and the later flip wins a sync', async () => {+ const { ownsNoDumbbells, withNoDumbbells } = await import('./dumbbells.js')+ const { mergeStates } = await import('./sync-merge.js')+ const S = { unit: 'kg', dumbbells: { kg: { weights: [10], _ts: 1 } } }+ expect(ownsNoDumbbells(S)).toBe(false)+ const on = { ...S, dumbbells: withNoDumbbells(S, true, 5), _ts: 5 }+ expect(on.dumbbells).toEqual({ kg: { weights: [10], _ts: 1 }, none: { on: true, _ts: 5 } })+ expect(ownsNoDumbbells(on)).toBe(true)+ const off = { ...S, dumbbells: withNoDumbbells(S, false, 9), _ts: 9 }+ expect(ownsNoDumbbells(mergeStates(on, off))).toBe(false)+ expect(ownsNoDumbbells(mergeStates(off, on))).toBe(false)+ expect(mergeStates(on, off).dumbbells.kg.weights).toEqual([10])+ })+})diff --git a/frontend/src/lib/equipment.js b/frontend/src/lib/equipment.jsindex 66e1728d2..246661f86 100644--- a/frontend/src/lib/equipment.js+++ b/frontend/src/lib/equipment.js@@ -1,5 +1,6 @@import { t } from './i18n-core.js'import { EXDB } from './exercises-data.js'+import { ownsNoDumbbells } from './dumbbells.js'// Pieces of kit the catalogue never names as an exercise's equipment — "dumbbell bench press" is// tagged `dumbbell`, yet it needs a bench; "chin-up" is tagged `body weight`, yet it needs a bar.@@ -39,18 +40,27 @@ export const ALL_EQUIPMENT = (() => {// Only the accessory an exercise needs (a bar, a bench) can still gate it.const ALWAYS_AVAILABLE = 'body weight'+// "I own no dumbbells" (Settings → Equipment → Dumbbells) filters without a profile of its own:+// everything but the dumbbell. It stands in as the active profile, so the library, the picker and+// a routine's missing-equipment flags all filter by it, and their Show all still shows all. No id,+// so nothing that picks a saved profile (the starter plan's fitting) mistakes it for one.+const noDumbbellsProfile = () => ({+ id: '', name: t('Everything but dumbbells'), equipment: ALL_EQUIPMENT.filter(e => e !== 'dumbbell'), accV: ACC_V, noDumbbells: true,+})+export function activeProfile(S) {- if (!S.equipFilterOn) return null- const profiles = S.equipProfiles || []- return profiles.find(p => p.id === S.activeEquipId) || null+ const profiles = S.equipFilterOn ? S.equipProfiles || [] : []+ return profiles.find(p => p.id === S.activeEquipId) || (ownsNoDumbbells(S) ? noDumbbellsProfile() : null)}// Whether an exercise is usable under the active profile. With filtering off, or no profile// selected, everything is available — this is purely additive, never a trap that hides your-// whole library because you haven't set anything up yet.+// whole library because you haven't set anything up yet. Owning no dumbbells holds under any+// profile, even one that has them ticked: the switch is the more direct thing to have said.export function exAvailable(S, ex) {const p = activeProfile(S)if (!p) return true+ if (ownsNoDumbbells(S) && ex.eq === 'dumbbell') return falsereturn eqAvailable(profileEquipment(p), ex)}diff --git a/frontend/src/lib/equipment.test.js b/frontend/src/lib/equipment.test.jsindex d2e27f815..4116f1ca6 100644--- a/frontend/src/lib/equipment.test.js+++ b/frontend/src/lib/equipment.test.js@@ -1,5 +1,5 @@import { describe, expect, test, it } from 'vitest'-import { exAvailable, eqAvailable, profileEquipment, newProfile, ACC_V, ALL_EQUIPMENT, ACCESSORIES, accessoriesOf } from './equipment.js'+import { activeProfile, exAvailable, eqAvailable, profileEquipment, newProfile, ACC_V, ALL_EQUIPMENT, ACCESSORIES, accessoriesOf } from './equipment.js'import { EXIDX } from './exercises.js'// QA 1.3.11: an imported custom exercise is stored with eq "custom", which no profile can tick, so@@ -27,6 +27,33 @@ describe('exAvailable', () => {})})+// "I own no dumbbells" (Discord, deamondo): the switch in the Dumbbells sheet, S.dumbbells.none.+describe('owning no dumbbells', () => {+ const NONE = { dumbbells: { none: { on: true, _ts: 1 } } }+ const bench = { id: '0289', n: 'dumbbell bench press', eq: 'dumbbell' }++ test('filters dumbbell lifts with no profile at all, and nothing else', () => {+ expect(exAvailable({}, bench)).toBe(true)+ const p = activeProfile(NONE)+ expect(p).toMatchObject({ id: '', name: 'Everything but dumbbells' })+ expect(exAvailable(NONE, { n: 'dumbbell curl', eq: 'dumbbell' })).toBe(false)+ expect(exAvailable(NONE, { n: 'barbell curl', eq: 'barbell' })).toBe(true)+ expect(exAvailable(NONE, { n: 'chin-up', eq: 'body weight' })).toBe(true)+ // A dumbbell lift on a bench: the bench is not the problem, the bells are.+ expect(exAvailable(NONE, bench)).toBe(false)+ })++ test('holds under a profile that has dumbbells ticked, and goes when switched off', () => {+ const S = { ...NONE, equipFilterOn: true, activeEquipId: 'home', equipProfiles: [{ id: 'home', name: 'Home', equipment: ['dumbbell', 'barbell'], accV: ACC_V }] }+ expect(activeProfile(S).name).toBe('Home')+ expect(exAvailable(S, { n: 'dumbbell curl', eq: 'dumbbell' })).toBe(false)+ expect(exAvailable(S, { n: 'barbell curl', eq: 'barbell' })).toBe(true)+ const off = { ...S, dumbbells: { none: { on: false, _ts: 2 } } }+ expect(exAvailable(off, { n: 'dumbbell curl', eq: 'dumbbell' })).toBe(true)+ expect(activeProfile({ dumbbells: { none: { on: false, _ts: 2 } } })).toBe(null)+ })+})+// "dumbbell bench press" is tagged `dumbbell` and "chin-up" `body weight`, so the catalogue's// equipment value alone let a dumbbells-only profile see a bench and a bare one see a bar.describe('bench and pull-up bar', () => {diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.jsindex 3ab416b29..ccb3e133e 100644--- a/frontend/src/locales/ar.js+++ b/frontend/src/locales/ar.js@@ -2174,7 +2174,6 @@ export default {'Dumbbells': 'الدمبلز','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'الأوزان التي تملكها، دمبل واحد لكل وزن. التدرج والتخفيف والإحماء وزرّا + و − في تمارين الدمبل تقع على هذه فقط.','No list yet, so dumbbell lifts step by their increment as usual.': 'لا قائمة بعد، لذا تتقدم تمارين الدمبل بزيادتها المعتادة.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'لا تملك دمبل أصلًا؟ اتركه خارج ملف المعدات وشغّل «التصفية حسب المعدات». عندها تختفي تمارين الدمبل من المكتبة ومن أداة الاختيار، ومن خطط المدرب ما لم تذكرها إجابته عن المعدات.','Fill in {0} to {1} {2}, every {3}': 'املأ من {0} إلى {1} {2}، كل {3}','Clear the list': 'امسح القائمة','Any weight. Tap to list the ones you own.': 'أي وزن. اضغط لإدراج ما تملكه.',@@ -2614,4 +2613,8 @@ export default {'Hard, short sentences only': 'صعب، جمل قصيرة فقط','Working, but steady': 'مجهود، لكن بثبات','Easy, you could chat the whole way': 'سهل، يمكنك الدردشة طوال الوقت',+ 'I own no dumbbells': 'لا أملك دمبلز',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'تبقى تمارين الدمبل خارج المكتبة والمنتقي وخطط المدرب.',+ 'Everything but dumbbells': 'كل شيء ما عدا الدمبلز',+ 'None, so dumbbell lifts stay hidden.': 'لا شيء، لذا تبقى تمارين الدمبل مخفية.',}diff --git a/frontend/src/locales/bn.js b/frontend/src/locales/bn.jsindex f607bb829..2d3fc41dc 100644--- a/frontend/src/locales/bn.js+++ b/frontend/src/locales/bn.js@@ -2198,7 +2198,6 @@ export default {'Dumbbells': 'ডাম্বেল','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'আপনার যে ওজনগুলো আছে, প্রতিটি একটি ডাম্বেল। ডাম্বেল ব্যায়ামে প্রগ্রেশন, ডিলোড, ওয়ার্ম-আপ আর + ও − বোতাম শুধু এগুলোতেই পড়ে।','No list yet, so dumbbell lifts step by their increment as usual.': 'এখনো তালিকা নেই, তাই ডাম্বেল ব্যায়াম আগের মতো নিজের ধাপে বাড়ে।',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'একটাও ডাম্বেল নেই? সরঞ্জাম প্রোফাইলে সেগুলো বাদ রাখুন আর «সরঞ্জাম অনুযায়ী ফিল্টার করুন» চালু করুন। তখন ডাম্বেলের ব্যায়াম লাইব্রেরি আর পিকার থেকে সরে যাবে, আর কোচের প্ল্যান থেকেও, যদি না কোচের নিজের সরঞ্জামের উত্তরে সেগুলো থাকে।','Fill in {0} to {1} {2}, every {3}': '{0} থেকে {1} {2} পর্যন্ত পূরণ করুন, প্রতি {3}','Clear the list': 'তালিকা মুছুন','Any weight. Tap to list the ones you own.': 'যেকোনো ওজন। আপনারগুলো তালিকায় দিতে ট্যাপ করুন।',@@ -2638,4 +2637,8 @@ export default {'Hard, short sentences only': 'কঠিন, শুধু ছোট বাক্য','Working, but steady': 'পরিশ্রম হচ্ছে, তবে স্থির','Easy, you could chat the whole way': 'সহজ, পুরো সময় গল্প করা যায়',+ 'I own no dumbbells': 'আমার কোনো ডাম্বেল নেই',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'ডাম্বেলের ব্যায়াম লাইব্রেরি, পিকার আর কোচের প্ল্যানের বাইরে থাকবে।',+ 'Everything but dumbbells': 'ডাম্বেল ছাড়া সবকিছু',+ 'None, so dumbbell lifts stay hidden.': 'একটাও নেই, তাই ডাম্বেলের ব্যায়াম লুকানো থাকবে।',}diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.jsindex 5394a50fd..c565e0a9d 100644--- a/frontend/src/locales/de.js+++ b/frontend/src/locales/de.js@@ -2139,7 +2139,6 @@ export default {'Dumbbells': 'Kurzhanteln','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Die Gewichte, die du hast, je eine Hantel. Progression, Deloads, Aufwärmsätze und die Tasten + und − bei Kurzhantelübungen landen nur auf diesen.','No list yet, so dumbbell lifts step by their increment as usual.': 'Noch keine Liste, also steigen Kurzhantelübungen wie gewohnt in ihrem Schritt.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Gar keine Kurzhanteln? Lass sie in einem Geräteprofil weg und schalte „Nach Geräten filtern“ ein. Dann bleiben Kurzhantelübungen aus der Bibliothek und der Auswahl draußen, und aus den Plänen des Coachs, solange seine eigene Geräte-Antwort sie nicht nennt.','Fill in {0} to {1} {2}, every {3}': '{0} bis {1} {2} eintragen, alle {3}','Clear the list': 'Liste leeren','Any weight. Tap to list the ones you own.': 'Jedes Gewicht. Tippe, um deine aufzulisten.',@@ -2579,4 +2578,8 @@ export default {'Hard, short sentences only': 'Hart, nur kurze Sätze','Working, but steady': 'Fordernd, aber gleichmäßig','Easy, you could chat the whole way': 'Locker, du könntest die ganze Zeit plaudern',+ 'I own no dumbbells': 'Ich habe keine Kurzhanteln',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Kurzhantelübungen bleiben aus der Bibliothek, der Auswahl und den Plänen des Coachs draußen.',+ 'Everything but dumbbells': 'Alles außer Kurzhanteln',+ 'None, so dumbbell lifts stay hidden.': 'Keine, also bleiben Kurzhantelübungen ausgeblendet.',}diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.jsindex 9dd3a3ac2..e593a1d8c 100644--- a/frontend/src/locales/es.js+++ b/frontend/src/locales/es.js@@ -2119,7 +2119,6 @@ export default {'Dumbbells': 'Mancuernas','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Los pesos que tienes, uno por mancuerna. La progresión, las descargas, el calentamiento y los botones + y − de los ejercicios con mancuernas solo usan estos.','No list yet, so dumbbell lifts step by their increment as usual.': 'Aún no hay lista, así que los ejercicios con mancuernas suben con su incremento de siempre.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': '¿Nada de mancuernas? Déjalas fuera de un perfil de equipo y activa Filtrar por equipo. Así los ejercicios con mancuernas no salen en la biblioteca ni en el selector, ni en los planes del Entrenador, salvo que su propia respuesta de equipo las incluya.','Fill in {0} to {1} {2}, every {3}': 'Rellenar de {0} a {1} {2}, cada {3}','Clear the list': 'Vaciar la lista','Any weight. Tap to list the ones you own.': 'Cualquier peso. Toca para apuntar los que tienes.',@@ -2559,4 +2558,8 @@ export default {'Hard, short sentences only': 'Duro, solo frases cortas','Working, but steady': 'Exigente, pero estable','Easy, you could chat the whole way': 'Fácil, podrías charlar todo el rato',+ 'I own no dumbbells': 'No tengo mancuernas',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Los ejercicios con mancuernas no aparecen en la biblioteca, el selector ni los planes del Coach.',+ 'Everything but dumbbells': 'Todo menos mancuernas',+ 'None, so dumbbell lifts stay hidden.': 'Ninguna, así que los ejercicios con mancuernas quedan ocultos.',}diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.jsindex ac2044a27..ba106f131 100644--- a/frontend/src/locales/fr.js+++ b/frontend/src/locales/fr.js@@ -2119,7 +2119,6 @@ export default {'Dumbbells': 'Haltères','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Les poids que tu possèdes, un haltère chacun. La progression, les décharges, l’échauffement et les boutons + et − des exercices aux haltères ne tombent que sur ceux-ci.','No list yet, so dumbbell lifts step by their increment as usual.': 'Pas encore de liste, donc les exercices aux haltères avancent par leur incrément habituel.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Pas d’haltères du tout ? Laisse-les hors d’un profil d’équipement et active Filtrer par équipement. Les exercices aux haltères disparaissent alors de la bibliothèque et du sélecteur, et des plans du Coach, sauf si sa propre réponse sur l’équipement les cite.','Fill in {0} to {1} {2}, every {3}': 'Remplir de {0} à {1} {2}, tous les {3}','Clear the list': 'Vider la liste','Any weight. Tap to list the ones you own.': 'N’importe quel poids. Touche pour lister les tiens.',@@ -2559,4 +2558,8 @@ export default {'Hard, short sentences only': 'Dur, phrases courtes seulement','Working, but steady': 'Ça travaille, mais régulier','Easy, you could chat the whole way': 'Facile, tu pourrais papoter tout du long',+ 'I own no dumbbells': 'Je n’ai pas d’haltères',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Les exercices aux haltères restent hors de la bibliothèque, du sélecteur et des plans du Coach.',+ 'Everything but dumbbells': 'Tout sauf les haltères',+ 'None, so dumbbell lifts stay hidden.': 'Aucun, donc les exercices aux haltères restent cachés.',}diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.jsindex d0040eed3..24220864c 100644--- a/frontend/src/locales/hi.js+++ b/frontend/src/locales/hi.js@@ -2119,7 +2119,6 @@ export default {'Dumbbells': 'डम्बल','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'आपके पास जो वज़न हैं, हर एक डम्बल। डम्बल एक्सरसाइज़ में प्रोग्रेशन, डीलोड, वॉर्म-अप और + और − बटन सिर्फ़ इन्हीं पर आते हैं।','No list yet, so dumbbell lifts step by their increment as usual.': 'अभी कोई सूची नहीं, इसलिए डम्बल एक्सरसाइज़ हमेशा की तरह अपने स्टेप से बढ़ती हैं।',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'डम्बल बिल्कुल नहीं हैं? उन्हें किसी उपकरण प्रोफ़ाइल से बाहर रखें और «उपकरण से फ़िल्टर करें» चालू करें। तब डम्बल वाले व्यायाम लाइब्रेरी और पिकर में नहीं दिखेंगे, और कोच की योजनाओं में भी नहीं, जब तक कोच के अपने उपकरण वाले जवाब में वे न हों।','Fill in {0} to {1} {2}, every {3}': '{0} से {1} {2} तक भरें, हर {3}','Clear the list': 'सूची खाली करें','Any weight. Tap to list the ones you own.': 'कोई भी वज़न। अपने वाले लिखने के लिए टैप करें।',@@ -2559,4 +2558,8 @@ export default {'Hard, short sentences only': 'कठिन, बस छोटे वाक्य','Working, but steady': 'मेहनत है, पर स्थिर','Easy, you could chat the whole way': 'आसान, पूरे रास्ते बातें कर सकते हो',+ 'I own no dumbbells': 'मेरे पास डंबल नहीं हैं',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'डंबल वाली एक्सरसाइज़ लाइब्रेरी, पिकर और कोच के प्लान से बाहर रहेंगी।',+ 'Everything but dumbbells': 'डंबल के अलावा सब कुछ',+ 'None, so dumbbell lifts stay hidden.': 'कोई नहीं, इसलिए डंबल वाली एक्सरसाइज़ छिपी रहेंगी।',}diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.jsindex adb491f03..9750ef8fe 100644--- a/frontend/src/locales/hu.js+++ b/frontend/src/locales/hu.js@@ -2122,7 +2122,6 @@ export default {'Dumbbells': 'Kézisúlyzók','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'A súlyok, amelyek megvannak, darabonként. A kézisúlyzós gyakorlatoknál a progresszió, a deload, a bemelegítés és a + és − gomb csak ezekre esik.','No list yet, so dumbbell lifts step by their increment as usual.': 'Még nincs lista, így a kézisúlyzós gyakorlatok a szokásos lépésükkel haladnak.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Egyáltalán nincs kézisúlyzód? Hagyd ki egy eszközprofilból, és kapcsold be a Szűrés eszköz szerint opciót. Így a kézisúlyzós gyakorlatok kimaradnak a könyvtárból és a választóból, és a Coach terveiből is, hacsak a saját eszköz-válaszában nem szerepelnek.','Fill in {0} to {1} {2}, every {3}': 'Kitöltés {0} és {1} {2} között, {3} lépésközzel','Clear the list': 'Lista törlése','Any weight. Tap to list the ones you own.': 'Bármilyen súly. Koppints, és sorold fel a sajátjaidat.',@@ -2562,4 +2561,8 @@ export default {'Hard, short sentences only': 'Nehéz, csak rövid mondatok','Working, but steady': 'Dolgozol, de egyenletesen','Easy, you could chat the whole way': 'Könnyű, végig tudnál beszélgetni',+ 'I own no dumbbells': 'Nincs kézisúlyzóm',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'A kézisúlyzós gyakorlatok kimaradnak a könyvtárból, a választóból és az Edző terveiből.',+ 'Everything but dumbbells': 'Minden, kivéve a kézisúlyzót',+ 'None, so dumbbell lifts stay hidden.': 'Nincs, így a kézisúlyzós gyakorlatok rejtve maradnak.',}diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.jsindex c918aa84c..d5d3a90fa 100644--- a/frontend/src/locales/it.js+++ b/frontend/src/locales/it.js@@ -2119,7 +2119,6 @@ export default {'Dumbbells': 'Manubri','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'I pesi che hai, un manubrio ciascuno. Progressione, scarichi, riscaldamento e i tasti + e − degli esercizi con manubri cadono solo su questi.','No list yet, so dumbbell lifts step by their increment as usual.': 'Ancora nessuna lista, quindi gli esercizi con manubri salgono col loro incremento solito.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Niente manubri? Lasciali fuori da un profilo attrezzi e attiva Filtra per attrezzi. Così gli esercizi con manubri restano fuori dalla libreria e dal selettore, e dai piani del Coach, a meno che la sua risposta sugli attrezzi non li includa.','Fill in {0} to {1} {2}, every {3}': 'Compila da {0} a {1} {2}, ogni {3}','Clear the list': 'Svuota la lista','Any weight. Tap to list the ones you own.': 'Qualsiasi peso. Tocca per elencare i tuoi.',@@ -2559,4 +2558,8 @@ export default {'Hard, short sentences only': 'Duro, solo frasi brevi','Working, but steady': 'Impegnativo, ma costante','Easy, you could chat the whole way': 'Facile, potresti chiacchierare per tutto il tempo',+ 'I own no dumbbells': 'Non ho manubri',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Gli esercizi con manubri restano fuori da libreria, selettore e piani del Coach.',+ 'Everything but dumbbells': 'Tutto tranne i manubri',+ 'None, so dumbbell lifts stay hidden.': 'Nessuno, quindi gli esercizi con manubri restano nascosti.',}diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.jsindex 130305ada..1906ec946 100644--- a/frontend/src/locales/ko.js+++ b/frontend/src/locales/ko.js@@ -2119,7 +2119,6 @@ export default {'Dumbbells': '덤벨','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': '가지고 있는 무게를 하나씩 적어요. 덤벨 운동의 증량, 디로드, 워밍업, + 와 − 버튼은 이 무게에만 맞춰져요.','No list yet, so dumbbell lifts step by their increment as usual.': '아직 목록이 없어서 덤벨 운동은 평소 증량 단위대로 올라가요.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': '덤벨이 아예 없나요? 장비 프로필에서 빼 두고 장비로 필터를 켜세요. 그러면 덤벨 운동이 라이브러리와 선택 목록에서 빠지고, 코치의 장비 답변에 덤벨이 없으면 코치 플랜에서도 빠집니다.','Fill in {0} to {1} {2}, every {3}': '{0}부터 {1} {2}까지 {3} 간격으로 채우기','Clear the list': '목록 비우기','Any weight. Tap to list the ones you own.': '아무 무게나 가능해요. 눌러서 가진 덤벨을 적어 보세요.',@@ -2559,4 +2558,8 @@ export default {'Hard, short sentences only': '힘듦, 짧은 문장만','Working, but steady': '힘쓰지만 안정적','Easy, you could chat the whole way': '쉬움, 내내 수다 떨 수 있음',+ 'I own no dumbbells': '덤벨이 없어요',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': '덤벨 운동은 라이브러리, 선택 목록, 코치의 계획에서 빠져요.',+ 'Everything but dumbbells': '덤벨 빼고 전부',+ 'None, so dumbbell lifts stay hidden.': '없음, 그래서 덤벨 운동은 숨겨져요.',}diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.jsindex 0b54d03f8..6285c4031 100644--- a/frontend/src/locales/pl.js+++ b/frontend/src/locales/pl.js@@ -2119,7 +2119,6 @@ export default {'Dumbbells': 'Hantle','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Ciężary, które masz, po jednej hantli. Progresja, deloady, rozgrzewka i przyciski + i − w ćwiczeniach z hantlami trafiają tylko na nie.','No list yet, so dumbbell lifts step by their increment as usual.': 'Brak listy, więc ćwiczenia z hantlami rosną jak zwykle o swój krok.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Nie masz hantli? Pomiń je w profilu sprzętu i włącz Filtruj według sprzętu. Wtedy ćwiczenia z hantlami znikną z biblioteki i z wyboru, a także z planów Coacha, chyba że jego własna odpowiedź o sprzęcie je wymienia.','Fill in {0} to {1} {2}, every {3}': 'Wpisz od {0} do {1} {2}, co {3}','Clear the list': 'Wyczyść listę','Any weight. Tap to list the ones you own.': 'Dowolny ciężar. Dotknij, aby wpisać posiadane.',@@ -2559,4 +2558,8 @@ export default {'Hard, short sentences only': 'Ciężko, tylko krótkie zdania','Working, but steady': 'Wysiłek, ale równo','Easy, you could chat the whole way': 'Lekko, dałoby się gadać całą drogę',+ 'I own no dumbbells': 'Nie mam hantli',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Ćwiczenia z hantlami znikają z biblioteki, wyboru i planów Trenera.',+ 'Everything but dumbbells': 'Wszystko oprócz hantli',+ 'None, so dumbbell lifts stay hidden.': 'Brak, więc ćwiczenia z hantlami są ukryte.',}diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.jsindex aad52b1b4..aaead2a41 100644--- a/frontend/src/locales/pt-BR.js+++ b/frontend/src/locales/pt-BR.js@@ -1319,7 +1319,6 @@ export const PT_BR_OVERRIDES = {'Dumbbells': 'Halteres','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Os pesos que você tem, um halter cada. A progressão, as descargas, o aquecimento e os botões + e − dos exercícios com halteres só caem nestes.','No list yet, so dumbbell lifts step by their increment as usual.': 'Ainda sem lista, então os exercícios com halteres sobem pelo incremento de sempre.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Não tem halteres? Deixe-os fora de um perfil de equipamento e ative Filtrar por equipamento. Assim os exercícios com halteres ficam fora da biblioteca e do seletor, e dos planos do Coach, a não ser que a resposta dele sobre equipamento os inclua.','Any weight. Tap to list the ones you own.': 'Qualquer peso. Toque para listar os seus.',// --- sets to failure (v1.4.0) ---'Taken to failure': 'Até a falha',@@ -1652,6 +1651,10 @@ export const PT_BR_OVERRIDES = {'Hard, short sentences only': 'Puxado, só frases curtas','Working, but steady': 'Exigente, mas estável','Easy, you could chat the whole way': 'Fácil, dava para bater papo o tempo todo',+ 'I own no dumbbells': 'Não tenho halteres',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Os exercícios com halteres ficam fora da biblioteca, do seletor e dos planos do Coach.',+ 'Everything but dumbbells': 'Tudo menos halteres',+ 'None, so dumbbell lifts stay hidden.': 'Nenhum, então os exercícios com halteres ficam escondidos.',}export default { ...pt, ...PT_BR_OVERRIDES }diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.jsindex bcf3212b2..81ae74286 100644--- a/frontend/src/locales/pt.js+++ b/frontend/src/locales/pt.js@@ -2119,7 +2119,6 @@ export default {'Dumbbells': 'Halteres','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Os pesos que tens, um haltere cada. A progressão, as descargas, o aquecimento e os botões + e − dos exercícios com halteres só caem nestes.','No list yet, so dumbbell lifts step by their increment as usual.': 'Ainda sem lista, por isso os exercícios com halteres sobem pelo incremento de sempre.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Não tens halteres? Deixa-os fora de um perfil de equipamento e liga Filtrar por equipamento. Assim os exercícios com halteres ficam fora da biblioteca e do seletor, e dos planos do Coach, a não ser que a resposta dele sobre equipamento os inclua.','Fill in {0} to {1} {2}, every {3}': 'Preencher de {0} a {1} {2}, a cada {3}','Clear the list': 'Limpar a lista','Any weight. Tap to list the ones you own.': 'Qualquer peso. Toca para listar os teus.',@@ -2559,4 +2558,8 @@ export default {'Hard, short sentences only': 'Duro, só frases curtas','Working, but steady': 'Exigente, mas estável','Easy, you could chat the whole way': 'Fácil, dava para conversar o tempo todo',+ 'I own no dumbbells': 'Não tenho halteres',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Os exercícios com halteres ficam fora da biblioteca, do seletor e dos planos do Coach.',+ 'Everything but dumbbells': 'Tudo menos halteres',+ 'None, so dumbbell lifts stay hidden.': 'Nenhum, por isso os exercícios com halteres ficam escondidos.',}diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.jsindex 3215cf6b6..feee66f17 100644--- a/frontend/src/locales/ru.js+++ b/frontend/src/locales/ru.js@@ -2123,7 +2123,6 @@ export default {'Dumbbells': 'Гантели','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Веса, которые у вас есть, по одной гантели. Прогрессия, разгрузки, разминка и кнопки + и − в упражнениях с гантелями попадают только на них.','No list yet, so dumbbell lifts step by their increment as usual.': 'Списка пока нет, так что упражнения с гантелями растут на свой обычный шаг.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Гантелей нет совсем? Не отмечай их в профиле инвентаря и включи «Фильтровать по инвентарю». Тогда упражнения с гантелями пропадут из библиотеки и из выбора, а также из планов Коуча, если только его собственный ответ про инвентарь их не называет.','Fill in {0} to {1} {2}, every {3}': 'Заполнить от {0} до {1} {2}, шаг {3}','Clear the list': 'Очистить список','Any weight. Tap to list the ones you own.': 'Любой вес. Нажмите, чтобы перечислить свои.',@@ -2563,4 +2562,8 @@ export default {'Hard, short sentences only': 'Тяжело, только короткие фразы','Working, but steady': 'Работаю, но ровно','Easy, you could chat the whole way': 'Легко, можно болтать всю дорогу',+ 'I own no dumbbells': 'У меня нет гантелей',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Упражнения с гантелями не попадут в библиотеку, выбор и планы Тренера.',+ 'Everything but dumbbells': 'Всё, кроме гантелей',+ 'None, so dumbbell lifts stay hidden.': 'Нет, поэтому упражнения с гантелями скрыты.',}diff --git a/frontend/src/locales/sv.js b/frontend/src/locales/sv.jsindex 9521aa3ff..7b7b2e92a 100644--- a/frontend/src/locales/sv.js+++ b/frontend/src/locales/sv.js@@ -2140,7 +2140,6 @@ export default {'Dumbbells': 'Hantlar','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Vikterna du har, en hantel var. Progression, avlastning, uppvärmning och knapparna + och − för hantelövningar landar bara på dessa.','No list yet, so dumbbell lifts step by their increment as usual.': 'Ingen lista än, så hantelövningar ökar med sitt vanliga steg.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Inga hantlar alls? Lämna bort dem ur en utrustningsprofil och slå på Filtrera efter utrustning. Hantelövningar håller sig då borta från biblioteket och väljaren, och från coachens planer om inte ditt utrustningssvar till coachen tar upp dem.','Fill in {0} to {1} {2}, every {3}': 'Fyll i {0} till {1} {2}, var {3}','Clear the list': 'Rensa listan','Any weight. Tap to list the ones you own.': 'Valfri vikt. Tryck för att lista de du har.',@@ -2606,4 +2605,8 @@ export default {'Hard, short sentences only': 'Tungt, bara korta meningar','Working, but steady': 'Jobbigt, men jämnt','Easy, you could chat the whole way': 'Lätt, du kunde prata hela vägen',+ 'I own no dumbbells': 'Jag har inga hantlar',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Hantelövningar hålls borta från biblioteket, väljaren och Coachens planer.',+ 'Everything but dumbbells': 'Allt utom hantlar',+ 'None, so dumbbell lifts stay hidden.': 'Inga, så hantelövningar förblir dolda.',}diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.jsindex 2b154bf4c..293aa5115 100644--- a/frontend/src/locales/th.js+++ b/frontend/src/locales/th.js@@ -2130,7 +2130,6 @@ export default {'Dumbbells': 'ดัมเบล','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'น้ำหนักที่คุณมี อันละหนึ่งค่า การเพิ่มน้ำหนัก การดีโหลด วอร์มอัพ และปุ่ม + กับ − ของท่าดัมเบลจะใช้แค่ค่าเหล่านี้','No list yet, so dumbbell lifts step by their increment as usual.': 'ยังไม่มีรายการ ท่าดัมเบลจึงเพิ่มตามขั้นปกติ',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'ไม่มีดัมเบลเลยใช่ไหม? เว้นดัมเบลไว้ในโปรไฟล์อุปกรณ์แล้วเปิด «กรองตามอุปกรณ์» ท่าดัมเบลจะไม่โผล่ในคลังและตัวเลือก และไม่อยู่ในแผนของโค้ช เว้นแต่คำตอบเรื่องอุปกรณ์ของโค้ชจะมีดัมเบลอยู่','Fill in {0} to {1} {2}, every {3}': 'เติม {0} ถึง {1} {2} ทุก {3}','Clear the list': 'ล้างรายการ','Any weight. Tap to list the ones you own.': 'น้ำหนักใดก็ได้ แตะเพื่อใส่น้ำหนักที่คุณมี',@@ -2570,4 +2569,8 @@ export default {'Hard, short sentences only': 'หนัก พูดได้แค่ประโยคสั้นๆ','Working, but steady': 'เหนื่อย แต่คงที่','Easy, you could chat the whole way': 'สบายๆ คุยได้ตลอดทาง',+ 'I own no dumbbells': 'ฉันไม่มีดัมเบล',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'ท่าที่ใช้ดัมเบลจะไม่อยู่ในคลัง ตัวเลือก และแผนของโค้ช',+ 'Everything but dumbbells': 'ทุกอย่างยกเว้นดัมเบล',+ 'None, so dumbbell lifts stay hidden.': 'ไม่มี ท่าที่ใช้ดัมเบลจึงถูกซ่อนไว้',}diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.jsindex df3dbde8b..9b9a1fe9d 100644--- a/frontend/src/locales/tr.js+++ b/frontend/src/locales/tr.js@@ -2119,7 +2119,6 @@ export default {'Dumbbells': 'Dambıllar','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Sahip olduğun ağırlıklar, her biri tek dambıl. Dambıl hareketlerinde progresyon, deload, ısınma ve + ile − düğmeleri yalnızca bunlara düşer.','No list yet, so dumbbell lifts step by their increment as usual.': 'Henüz liste yok, bu yüzden dambıl hareketleri her zamanki artışla ilerler.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Hiç dambılın yok mu? Onları bir ekipman profilinin dışında bırak ve Ekipmana göre filtrele seçeneğini aç. Böylece dambıl hareketleri kütüphanede ve seçicide görünmez, koçun kendi ekipman cevabında yoksa koçun planlarında da.','Fill in {0} to {1} {2}, every {3}': '{0} ile {1} {2} arasını doldur, {3} arayla','Clear the list': 'Listeyi temizle','Any weight. Tap to list the ones you own.': 'Her ağırlık. Sahip olduklarını listelemek için dokun.',@@ -2559,4 +2558,8 @@ export default {'Hard, short sentences only': 'Zor, sadece kısa cümleler','Working, but steady': 'Zorlayıcı ama dengeli','Easy, you could chat the whole way': 'Kolay, yol boyunca sohbet edebilirdin',+ 'I own no dumbbells': 'Hiç dambılım yok',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Dambıl hareketleri kütüphanede, seçicide ve Koçun planlarında yer almaz.',+ 'Everything but dumbbells': 'Dambıl hariç her şey',+ 'None, so dumbbell lifts stay hidden.': 'Yok, bu yüzden dambıl hareketleri gizli kalır.',}diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.jsindex 874616a0a..8f9d4efbe 100644--- a/frontend/src/locales/uk.js+++ b/frontend/src/locales/uk.js@@ -2116,7 +2116,6 @@ export default {'Dumbbells': 'Гантелі','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': 'Ваги, які в тебе є, по одній гантелі. Прогресія, розвантаження, розминка і кнопки + та − у вправах з гантелями потрапляють тільки на них.','No list yet, so dumbbell lifts step by their increment as usual.': 'Списку ще немає, тож вправи з гантелями ростуть на свій звичний крок.',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': 'Гантелей зовсім немає? Не познач їх у профілі інвентарю й увімкни «Фільтрувати за інвентарем». Тоді вправи з гантелями зникнуть із бібліотеки та з вибору, а також із планів Коуча, якщо тільки його власна відповідь про інвентар їх не називає.','Fill in {0} to {1} {2}, every {3}': 'Заповнити від {0} до {1} {2}, крок {3}','Clear the list': 'Очистити список','Any weight. Tap to list the ones you own.': 'Будь-яка вага. Торкнися, щоб перелічити свої.',@@ -2556,4 +2555,8 @@ export default {'Hard, short sentences only': 'Важко, лише короткі речення','Working, but steady': 'Працюю, але рівно','Easy, you could chat the whole way': 'Легко, можна балакати всю дорогу',+ 'I own no dumbbells': 'У мене немає гантелей',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': 'Вправи з гантелями не потраплять у бібліотеку, вибір і плани Тренера.',+ 'Everything but dumbbells': 'Усе, крім гантелей',+ 'None, so dumbbell lifts stay hidden.': 'Немає, тож вправи з гантелями приховані.',}diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.jsindex 867b47afc..d05f7475b 100644--- a/frontend/src/locales/zh-TW.js+++ b/frontend/src/locales/zh-TW.js@@ -2112,7 +2112,6 @@ export default {'Dumbbells': '啞鈴','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': '你擁有的重量,每個一支。啞鈴動作的加重、減量、熱身以及 + 和 − 按鈕都只會落在這些重量上。','No list yet, so dumbbell lifts step by their increment as usual.': '還沒有清單,所以啞鈴動作照常按增量遞增。',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': '完全沒有啞鈴?在器材設定檔裡不要勾啞鈴,再開啟「依器材篩選」。這樣啞鈴動作就不會出現在動作庫和選擇器裡,也不會進教練的計畫,除非教練自己的器材回答裡列了啞鈴。','Fill in {0} to {1} {2}, every {3}': '填入 {0} 到 {1} {2},每隔 {3}','Clear the list': '清空清單','Any weight. Tap to list the ones you own.': '任意重量。點一下列出你有的啞鈴。',@@ -2552,4 +2551,8 @@ export default {'Hard, short sentences only': '累,只能說短句','Working, but steady': '有點吃力,但很穩','Easy, you could chat the whole way': '輕鬆,一路都能聊天',+ 'I own no dumbbells': '我沒有啞鈴',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': '啞鈴動作不會出現在動作庫、選擇器和教練的計畫裡。',+ 'Everything but dumbbells': '除啞鈴外的全部',+ 'None, so dumbbell lifts stay hidden.': '沒有,所以啞鈴動作會隱藏。',}diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.jsindex fe7cf3437..c35297756 100644--- a/frontend/src/locales/zh.js+++ b/frontend/src/locales/zh.js@@ -2119,7 +2119,6 @@ export default {'Dumbbells': '哑铃','The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.': '你拥有的重量,每个一只。哑铃动作的加重、减载、热身以及 + 和 − 按钮都只会落在这些重量上。','No list yet, so dumbbell lifts step by their increment as usual.': '还没有列表,所以哑铃动作照常按增量递增。',- 'No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.': '完全没有哑铃?在器械配置里别勾哑铃,再打开“按器械筛选”。这样哑铃动作就不会出现在动作库和选择器里,也不会进教练的计划,除非教练自己的器械回答里列了哑铃。','Fill in {0} to {1} {2}, every {3}': '填入 {0} 到 {1} {2},每隔 {3}','Clear the list': '清空列表','Any weight. Tap to list the ones you own.': '任意重量。点一下列出你有的哑铃。',@@ -2559,4 +2558,8 @@ export default {'Hard, short sentences only': '累,只能说短句','Working, but steady': '有点吃力,但很稳','Easy, you could chat the whole way': '轻松,一路都能聊天',+ 'I own no dumbbells': '我没有哑铃',+ 'Dumbbell lifts stay out of the library, the picker and the Coach’s plans.': '哑铃动作不会出现在动作库、选择器和教练的计划里。',+ 'Everything but dumbbells': '除哑铃外的全部',+ 'None, so dumbbell lifts stay hidden.': '没有,所以哑铃动作会隐藏。',}diff --git a/frontend/src/sheets.dumbbells.test.jsx b/frontend/src/sheets.dumbbells.test.jsxindex 172b7c5a9..0087ee35b 100644--- a/frontend/src/sheets.dumbbells.test.jsx+++ b/frontend/src/sheets.dumbbells.test.jsx@@ -35,11 +35,8 @@ describe('dumbbell inventory sheet', () => {act(() => dumbbellInventorySheet())const host = mountTopSheet()expect(host.textContent).toContain('No list yet')- // Owning none is said in an equipment profile, and the sheet says where (Discord, deamondo).- expect(host.textContent).toContain('No dumbbells at all? Leave them out of an equipment profile')act(() => button(host, 'Fill in 2 to 50 kg, every 2').click())expect(S().dumbbells.kg.weights).toHaveLength(25)- expect(host.textContent).not.toContain('No dumbbells at all?')expect(S().dumbbells.kg._ts).toEqual(expect.any(Number))expect(chips(host)[0]).toBe('2')act(() => host.querySelector('[aria-label="Remove 2 kg"]').click())@@ -48,6 +45,25 @@ describe('dumbbell inventory sheet', () => {expect(S().dumbbells.kg.weights).toEqual([])})+ // Discord (deamondo): an empty list means any weight, so owning none is a switch of its own.+ it('says "I own no dumbbells" with a switch, stamped, and keeps the list for later', () => {+ useStore.setState(s => ({ S: { ...s.S, dumbbells: { kg: { weights: [10, 12], _ts: 1 } } } }))+ act(() => dumbbellInventorySheet())+ const host = mountTopSheet()+ const sw = () => host.querySelector('[role="switch"], input[type="checkbox"]')+ expect(host.textContent).toContain('I own no dumbbells')+ expect(chips(host)).toHaveLength(2)+ act(() => sw().click())+ expect(S().dumbbells.none).toEqual({ on: true, _ts: expect.any(Number) })+ // Nothing to list while you own none; the list itself stays.+ expect(chips(host)).toHaveLength(0)+ expect(button(host, 'Fill in')).toBeUndefined()+ expect(S().dumbbells.kg.weights).toEqual([10, 12])+ act(() => sw().click())+ expect(S().dumbbells.none.on).toBe(false)+ expect(chips(host)).toHaveLength(2)+ })+it('adds a typed weight in order and keeps the other unit alone', () => {useStore.setState(s => ({ S: { ...s.S, dumbbells: { kg: { weights: [3, 9], _ts: 1 }, lb: { weights: [10], _ts: 1 } } } }))act(() => dumbbellInventorySheet())diff --git a/frontend/src/sheets.jsx b/frontend/src/sheets.jsxindex 3ffac1ddf..7a3d480a7 100644--- a/frontend/src/sheets.jsx+++ b/frontend/src/sheets.jsx@@ -41,7 +41,7 @@ import { printWorkout } from './lib/report-print.js'import { estimate1RM, best1RM, is1RMRecord, REP_CAP, formulaOf, FORMULA_NAMES } from './lib/onerm.js'import { exerciseHistory } from './lib/exercise-history.js'import { relativeSeries } from './lib/relative-strength.js'-import { isBellEx, dbLoadOf, dbLoadFor, withDbLoad, entryDbLoad, currentDbLoad, isOneArm, dumbbellsOf, ownsDumbbells, withDumbbells, presetWeights, cleanWeights, canHaveStack, stackOf, withStack, stackFromStep } from './lib/dumbbells.js'+import { isBellEx, dbLoadOf, dbLoadFor, withDbLoad, entryDbLoad, currentDbLoad, isOneArm, dumbbellsOf, ownsDumbbells, withDumbbells, ownsNoDumbbells, withNoDumbbells, presetWeights, cleanWeights, canHaveStack, stackOf, withStack, stackFromStep } from './lib/dumbbells.js'import { policyFor, defaultIncrement, POLICIES_FOR, POLICY_NAME, POLICY_DESC, MAX_BW_SETS, MAX_TRIPLE_SETS } from './lib/progression.js'import { normalizeRepRange } from './lib/rep-range.js'import { isBackoff, backoffWeights } from './lib/backoff.js'@@ -986,6 +986,8 @@ function DumbbellInventorySheet({ close }) {const list = dumbbellsOf(st)const [draft, setDraft] = useState(null)const save = ws => update(s => { s.dumbbells = withDumbbells(s, ws) })+ const none = ownsNoDumbbells(st)+ const setNone = on => update(s => { s.dumbbells = withNoDumbbells(s, on) })const preset = presetWeights(unit)const add = () => {const w = cleanWeights([draft])[0]@@ -998,23 +1000,30 @@ function DumbbellInventorySheet({ close }) {<div className="muted small" style={{ marginBottom: 14 }}>{t('The weights you own, one bell each. Progression, deloads, warm-ups and the + and − buttons of dumbbell lifts land only on these.')}</div>- {list.length > 0- ? <div className="chips" style={{ flexWrap: 'wrap', overflow: 'visible', touchAction: 'auto', marginBottom: 12 }}>- {list.map(w => <button key={w} className="chip on nocap" aria-label={t('Remove {0}', fmtPlate(w) + ' ' + unit)}- onClick={() => save(list.filter(x => x !== w))}>{fmtPlate(w)} <Icon name="xmark" /></button>)}- </div>- : <div className="small dim" style={{ marginBottom: 12 }}>{t('No list yet, so dumbbell lifts step by their increment as usual.')}</div>}- {/* An empty list means "any weight", not "none": owning no dumbbells is an equipment profile's job (Discord, deamondo). */}- {list.length === 0 && <div className="small dim" style={{ marginBottom: 12 }}>{t('No dumbbells at all? Leave them out of an equipment profile and turn on Filter by equipment. Dumbbell lifts then stay out of the library and the picker, and out of the Coach’s plans unless its own equipment answer lists them.')}</div>}- <div className="row" style={{ gap: 8, marginBottom: 12 }}>- <NumberField className="input" decimal value={draft ?? ''} onChange={v => setDraft(v)}- aria-label={t('Weight ({0})', unit)} placeholder={t('Weight ({0})', unit)} onKeyDown={e => { if (e.key === 'Enter') add() }} />- <Button icon="plus" onClick={add} style={{ flex: '0 0 auto', width: 'auto' }}>{t('Add')}</Button>+ {/* An empty list means "any weight", not "none", so owning none is its own switch (Discord,+ deamondo). On, the list has nothing to say and steps aside; it is kept for the day you buy a pair. */}+ <div className="list menu-list" style={{ marginBottom: 12 }}>+ <Row icon="dumbbell" title={t('I own no dumbbells')} subtitle={t('Dumbbell lifts stay out of the library, the picker and the Coach’s plans.')}>+ <Switch checked={none} onChange={setNone} />+ </Row></div>- <Button onClick={() => save(preset)} style={{ marginBottom: 8 }}>- {t('Fill in {0} to {1} {2}, every {3}', fmtPlate(preset[0]), fmtPlate(preset.at(-1)), unit, fmtPlate(preset[1] - preset[0]))}- </Button>- {list.length > 0 && <Button variant="danger" onClick={() => save([])} style={{ marginBottom: 8 }}>{t('Clear the list')}</Button>}+ {!none && <>+ {list.length > 0+ ? <div className="chips" style={{ flexWrap: 'wrap', overflow: 'visible', touchAction: 'auto', marginBottom: 12 }}>+ {list.map(w => <button key={w} className="chip on nocap" aria-label={t('Remove {0}', fmtPlate(w) + ' ' + unit)}+ onClick={() => save(list.filter(x => x !== w))}>{fmtPlate(w)} <Icon name="xmark" /></button>)}+ </div>+ : <div className="small dim" style={{ marginBottom: 12 }}>{t('No list yet, so dumbbell lifts step by their increment as usual.')}</div>}+ <div className="row" style={{ gap: 8, marginBottom: 12 }}>+ <NumberField className="input" decimal value={draft ?? ''} onChange={v => setDraft(v)}+ aria-label={t('Weight ({0})', unit)} placeholder={t('Weight ({0})', unit)} onKeyDown={e => { if (e.key === 'Enter') add() }} />+ <Button icon="plus" onClick={add} style={{ flex: '0 0 auto', width: 'auto' }}>{t('Add')}</Button>+ </div>+ <Button onClick={() => save(preset)} style={{ marginBottom: 8 }}>+ {t('Fill in {0} to {1} {2}, every {3}', fmtPlate(preset[0]), fmtPlate(preset.at(-1)), unit, fmtPlate(preset[1] - preset[0]))}+ </Button>+ {list.length > 0 && <Button variant="danger" onClick={() => save([])} style={{ marginBottom: 8 }}>{t('Clear the list')}</Button>}+ </>}<Button variant="primary" onClick={close}>{t('Done')}</Button></>}diff --git a/frontend/src/views/Settings.jsx b/frontend/src/views/Settings.jsxindex ae2449e91..1e3eab13e 100644--- a/frontend/src/views/Settings.jsx+++ b/frontend/src/views/Settings.jsx@@ -10,7 +10,7 @@ import { useUI } from '../store/useUI.js'import { ACCENTS, ACCENT_NAMES, todayISO, localTZ, weekStartOf, MONDAY, SUNDAY, fmtPlate } from '../lib/format.js'import { inventoryFor, ownsPlates } from '../lib/plates.js'import { BAR_TYPES, ownBarDefault } from '../lib/bar.js'-import { dumbbellsOf } from '../lib/dumbbells.js'+import { dumbbellsOf, ownsNoDumbbells } from '../lib/dumbbells.js'import { effortOf } from '../lib/history.js'import { figureOf } from '../lib/exercises.js'import { unlock, chime, playOnSilentSupported, vibrateSupported, appleTouchDevice } from '../lib/sound.js'@@ -445,7 +445,7 @@ export default function Settings({ page = null, find = null, via = null, entryKereminders: () => (S.reminder?.on ? (S.reminder.time || DEF.reminder?.time || '') : t('Off')),plan: () => (mode === 'rotation' ? t('Rotation') : t('Fixed Week')) + ' · ' + shortWeekday(weekStartOf(S) === SUNDAY ? 0 : 1),units: () => (S.unit || 'kg') + ' · ' + (LANGS[lang] || lang),- equipment: () => (S.equipFilterOn && activeProfile ? activeProfile.name : t('Everything')),+ equipment: () => (S.equipFilterOn && activeProfile ? activeProfile.name : ownsNoDumbbells(S) ? t('Everything but dumbbells') : t('Everything')),look: () => themeLabel + ' · ' + accentLabel(S),coach: () => (coachLocal?.mode === 'server' ? t('Your server') : coachLocal?.mode === 'byok' ? t('Your API key') : t('Off')),data: () => '',@@ -1442,9 +1442,9 @@ function EquipmentCard({ S, update }) {: t('Standard set. Tap to count the pairs you own.')// The dumbbells you own, per unit (lib/dumbbells.js): what dumbbell lifts step and progress over.const bells = dumbbellsOf(S)- const dumbbellSummary = bells.length- ? bells.map(fmtPlate).join(' · ')- : t('Any weight. Tap to list the ones you own.')+ const dumbbellSummary = ownsNoDumbbells(S) ? t('None, so dumbbell lifts stay hidden.')+ : bells.length ? bells.map(fmtPlate).join(' · ')+ : t('Any weight. Tap to list the ones you own.')// Your bars (lib/bar.js ownBarDefault): the types you set a weight for, in the profile unit.const unit = S.unit === 'lb' ? 'lb' : 'kg'const ownBars = BAR_TYPES.filter(eq => ownBarDefault(S, eq) !== null)