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
Machines: list the weights a stack really has, progression and the stepper land on them (#688)
Duarte Santos74e424873896
diff --git a/api/sync-stamps.js b/api/sync-stamps.jsindex fe0e7cf67..e44a55bfa 100644--- a/api/sync-stamps.js+++ b/api/sync-stamps.js@@ -64,13 +64,13 @@ const capStamps = m => {const OWN_MERGE = new Set(['_ts', '_rev', '_wid', '_wids', '_unstamped', '_prior', 'active', 'unit', 'unitSet', 'resetAt', 'resetIds', 'deleted', 'edited', 'undone', 'routineOrder','workouts', 'routines', 'customEx', 'equipProfiles', 'gymCards', 'bodyweight', 'measurements', 'favEx',- 'exWeights', 'balanceOverrides', 'loadKind', 'plates', 'dbLoad', 'dumbbells', 'dayNotes', 'dayPhotos',+ 'exWeights', 'balanceOverrides', 'loadKind', 'plates', 'dbLoad', 'dumbbells', 'stackWeights', 'dayNotes', 'dayPhotos',]);const PER_KEY = new Set(['week', 'dayPlan', 'exNotes', 'barWeights', 'exAliases']);// The maps whose every entry carries its own edit time (sync-merge.js STAMPED_MAPS): merged per// key by the app, so never stamped here as a whole setting. dayNotes is a note per day off,// dayPhotos a progress photo filed under a day (#557), one entry per photo.-export const STAMPED_MAPS = ['balanceOverrides', 'loadKind', 'plates', 'dbLoad', 'dumbbells', 'dayNotes', 'dayPhotos'];+export const STAMPED_MAPS = ['balanceOverrides', 'loadKind', 'plates', 'dbLoad', 'dumbbells', 'stackWeights', 'dayNotes', 'dayPhotos'];const ENTRY_META = new Set(['id', '_ts', '_f', '_u']);const ENTRY_LISTS = ['routines', 'customEx', 'equipProfiles', 'gymCards', 'workouts'];diff --git a/frontend/src/lib/dumbbells.js b/frontend/src/lib/dumbbells.jsindex 1d9094918..5aa9a0b80 100644--- a/frontend/src/lib/dumbbells.js+++ b/frontend/src/lib/dumbbells.js@@ -26,10 +26,14 @@// deloads, warm-ups, drops and stepper land on bells you have instead of on the increment's grid;// without one nothing changes.//+// A machine's own weight stack (issue #688) works the same way, per exercise: the weights a+// LifeFitness fly really has (5, 11.3, 18.1 …), as S.stackWeights[exId] = { unit, weights, _ts }.+// It wins over the rack on that one exercise, since it is what that machine really has.+//// Only lib/exercises.js is imported, so history.js, progression.js and plates.js can all use// this file without a cycle.-import { exerciseOf as exOf, isBodyweightEq } from './exercises.js'+import { exerciseOf as exOf, isBodyweightEq, isAssisted } from './exercises.js'const unitOf = S => (S?.unit === 'lb' ? 'lb' : 'kg')const isMap = v => !!v && typeof v === 'object' && !Array.isArray(v)@@ -201,15 +205,68 @@ export const withDumbbells = (S, weights, now = Date.now()) =>* moves in pairs (2 × each weight); every other meaning moves one bell at a time.*/export function ownedWeightsFor(S, cfg) {- const ex = exOf(cfg?.id)- if (ex?.eq !== 'dumbbell') return nullconst bw = cfg?.bodyweight != null ? !!cfg.bodyweight : isBodyweightEq(cfg?.id)if (bw) return null+ // An assistance machine's stack is help, not load, and its progression runs the other way.+ const stack = isAssisted({ ...(cfg || {}) }) ? [] : stackOf(S, cfg?.id)+ if (stack.length) return stack+ const ex = exOf(cfg?.id)+ if (ex?.eq !== 'dumbbell') return nullconst ws = dumbbellsOf(S)if (!ws.length) return nullreturn dbLoadFor(S, cfg) === 'total' && bellsIn(cfg) === 2 ? ws.map(w => tidy(w * 2)) : ws}+/** Which list ownedWeightsFor answers from: 'stack', 'dumbbells', or null for the increment. */+export function ownedKindFor(S, cfg) {+ if (!ownedWeightsFor(S, cfg)) return null+ return stackOf(S, cfg?.id).length ? 'stack' : 'dumbbells'+}++// ---- a machine's own weight stack (issue #688) -------------------------------------------------++/** Equipment with a pin-selected stack of its own. Your own exercises can have one too. */+export const STACK_EQ = new Set(['leverage machine', 'cable', 'sled machine'])+/** Whether the exercise (object or id) gets the stack editor: a machine or cable, not assistance. */+export function canHaveStack(exOrId) {+ const ex = typeof exOrId === 'string' ? exOf(exOrId) : exOrId+ if (!ex || isAssisted(ex)) return false+ return STACK_EQ.has(ex.eq) || ex.custom === true+}++/**+ * The weights this exercise's machine has, lightest first, in the profile's unit; [] when none+ * are listed. Kept in the unit they were typed in, so a stack entered in kg and read by a profile+ * now in lb is converted (to the tenth), not reinterpreted: the plates on the machine stay put.+ */+export function stackOf(S, exId) {+ const e = isMap(S?.stackWeights) ? S.stackWeights[exId] : null+ if (!isMap(e)) return []+ const ws = cleanWeights(e.weights)+ const from = e.unit === 'lb' ? 'lb' : 'kg', to = unitOf(S)+ if (from === to) return ws+ return cleanWeights(ws.map(w => Math.round((to === 'lb' ? w / LB_KG : w * LB_KG) * 10) / 10))+}+const LB_KG = 0.45359237++/**+ * S.stackWeights with this exercise's list set to `weights` in the profile's unit, stamped. An+ * empty list is "no stack" again, kept as a stamped entry so the clear wins a sync too.+ */+export function withStack(S, exId, weights, now = Date.now()) {+ const ws = cleanWeights(weights)+ return { ...(isMap(S?.stackWeights) ? S.stackWeights : {}), [exId]: ws.length ? { unit: unitOf(S), weights: ws, _ts: now } : { _ts: now } }+}++/** An even stack for the quick fill: `count` weights from `first` (or `step` when 0) up by `step`. */+export function stackFromStep(first, step, count) {+ const a = Number(first) || 0, d = Number(step) || 0, n = Math.min(100, Math.max(0, Math.floor(Number(count) || 0)))+ if (!(d > 0)) return []+ const out = []+ for (let i = 0; i < n; i++) out.push(tidy((a > 0 ? a : d) + d * i))+ return cleanWeights(out)+}+const EPS = 1e-6/** The `n`-th owned weight above `w` (the nearest one for an off-list weight); null past the heaviest. */export function ownedUp(ws, w, n = 1) {diff --git a/frontend/src/lib/machine-stack.test.js b/frontend/src/lib/machine-stack.test.jsnew file mode 100644index 000000000..4002d0424--- /dev/null+++ b/frontend/src/lib/machine-stack.test.js@@ -0,0 +1,154 @@+// A machine's own weight stack (issue #688): the weights a LifeFitness fly really has (5, 11.3,+// 18.1 …), listed on the exercise. Progression, deloads, the Epley target, warm-ups, drops and the+// + and − buttons land on them, the same way the dumbbell inventory (#376) works for dumbbells.+import { describe, expect, it } from 'vitest'+import {+ stackOf, withStack, canHaveStack, ownedWeightsFor, ownedKindFor, stackFromStep, cleanWeights,+} from './dumbbells.js'+import { nextPrescription } from './progression.js'+import { buildPlannedEntry } from './session-start.js'+import { dropGrid } from './plates.js'+import { nextDropWeight } from './workout-model.js'+import { mergeStates, STAMPED_MAPS } from './sync-merge.js'+import { STAMPED_MAPS as API_STAMPED_MAPS } from '../../../api/sync-stamps.js'+import { EXIDX } from './exercises.js'++const FLY = '0596' // lever seated fly+const PUSHDOWN = '0201' // cable pushdown+const DIP = '0009' // assisted chest dip (a leverage machine, but help, not load)+const CURL = '0294' // dumbbell curl+const SQUAT = '0043' // barbell+// The odd steps from the issue: no increment fits them.+const STACK = [5, 11.3, 18.1, 24.9, 31.7, 38.5, 45.3]++const state = (workouts = [], extra = {}) => ({+ unit: 'kg', workouts, routines: [], exWeights: {},+ stackWeights: { [FLY]: { unit: 'kg', weights: STACK, _ts: 1 } }, ...extra,+})+const session = (d, id, w, reps, target = {}) => ({+ id: 'w' + d, d, start: new Date(d + 'T10:00:00').getTime(),+ entries: [{ id, target: { sets: 2, reps: 8, mode: 'reps', ...target }, sets: reps.map(r => ({ w, r, done: true })) }],+})+const cfg = (id, extra = {}) => ({ id, sets: 2, reps: 8, weight: 0, mode: 'reps', inc: 2.5, ...extra })++describe('the stack', () => {+ it('the exercises used here are what the test assumes', () => {+ expect(EXIDX[FLY].eq).toBe('leverage machine')+ expect(EXIDX[PUSHDOWN].eq).toBe('cable')+ expect(EXIDX[DIP].n).toMatch(/assisted/)+ expect(EXIDX[CURL].eq).toBe('dumbbell')+ })++ it('is offered on machines, cables and your own exercises, not on bars, bells or assistance', () => {+ expect(canHaveStack(FLY)).toBe(true)+ expect(canHaveStack(PUSHDOWN)).toBe(true)+ expect(canHaveStack({ id: 'c1', n: 'My hip thrust machine', custom: true, eq: 'custom' })).toBe(true)+ expect(canHaveStack(DIP)).toBe(false)+ expect(canHaveStack(CURL)).toBe(false)+ expect(canHaveStack(SQUAT)).toBe(false)+ })++ it('is kept per exercise in the unit it was entered in, sorted and stamped', () => {+ const next = withStack({ unit: 'kg' }, FLY, [18.1, 5, 11.3, 5, -2], 7)+ expect(next[FLY]).toEqual({ unit: 'kg', weights: [5, 11.3, 18.1], _ts: 7 })+ expect(stackOf({ unit: 'kg', stackWeights: next }, FLY)).toEqual([5, 11.3, 18.1])+ // A cleared list is a stamped entry, so the clear wins a sync against the older list.+ const cleared = withStack({ unit: 'kg', stackWeights: next }, FLY, [], 8)+ expect(cleared[FLY]).toEqual({ _ts: 8 })+ expect(stackOf({ unit: 'kg', stackWeights: cleared }, FLY)).toEqual([])+ })++ it('a profile switched to lb reads the kg stack converted, so the plates on the machine stay what they are', () => {+ const S = { unit: 'lb', stackWeights: { [FLY]: { unit: 'kg', weights: [5, 11.3], _ts: 1 } } }+ expect(stackOf(S, FLY)).toEqual([11, 24.9])+ })++ it('builds an even stack from a first weight, a step and a count, for the quick fill', () => {+ expect(stackFromStep(5, 6.8, 4)).toEqual([5, 11.8, 18.6, 25.4])+ expect(stackFromStep(0, 5, 3)).toEqual([5, 10, 15])+ expect(stackFromStep(5, 0, 3)).toEqual([])+ expect(cleanWeights(stackFromStep(2.5, 2.5, 200)).length).toBe(100)+ })++ it('is what ownedWeightsFor answers for that exercise, and nothing else changes', () => {+ const S = state()+ expect(ownedWeightsFor(S, cfg(FLY))).toEqual(STACK)+ expect(ownedKindFor(S, cfg(FLY))).toBe('stack')+ expect(ownedWeightsFor(S, cfg(PUSHDOWN))).toBe(null)+ expect(ownedKindFor(S, cfg(PUSHDOWN))).toBe(null)+ // A stray list on an assistance machine is never used: there the stack is help, not load.+ const dip = state([], { stackWeights: { [DIP]: { unit: 'kg', weights: STACK, _ts: 1 } } })+ expect(ownedWeightsFor(dip, cfg(DIP))).toBe(null)+ })++ it('wins over the dumbbell rack on the exercise it was set on', () => {+ const S = state([], { dumbbells: { kg: { weights: [2, 4, 6], _ts: 1 } }, stackWeights: { [CURL]: { unit: 'kg', weights: [7, 9], _ts: 1 } } })+ expect(ownedWeightsFor(S, cfg(CURL))).toEqual([7, 9])+ expect(ownedKindFor(S, cfg(CURL))).toBe('stack')+ })+})++describe('progression over the stack', () => {+ it('raises to the next weight on the stack, not by the increment', () => {+ const S = state([session('2026-10-01', FLY, 18.1, [8, 8])])+ const p = nextPrescription(S, cfg(FLY), null)+ expect(p.kind).toBe('up')+ expect(p.weight).toBe(24.9)+ })++ it('without a list, the increment decides as before', () => {+ const S = state([session('2026-10-01', FLY, 18.1, [8, 8])], { stackWeights: {} })+ expect(nextPrescription(S, cfg(FLY), null).weight).toBe(20.6)+ })++ it('holds at the heaviest plate of the stack and says it is the stack, not a dumbbell', () => {+ const S = state([session('2026-10-01', FLY, 45.3, [8, 8])])+ const p = nextPrescription(S, cfg(FLY), null)+ expect(p.kind).toBe('hold')+ expect(p.weight).toBe(45.3)+ expect(p.why[0]).toMatch(/whole stack/)+ expect(p.why[0]).not.toMatch(/dumbbell/)+ })++ it('the Epley deload after three stalls lands on the stack', () => {+ const S = state(['2026-10-01', '2026-10-03', '2026-10-05'].map(d => session(d, FLY, 31.7, [8, 5])))+ const p = nextPrescription(S, cfg(FLY), null)+ expect(p.kind).toBe('deload')+ expect(STACK).toContain(p.weight)+ expect(p.weight).toBeLessThan(31.7)+ })+})++describe('warm-ups and drops over the stack', () => {+ it('ramps the warm-up onto a weight the stack has', () => {+ const S = state([session('2026-10-01', FLY, 31.7, [8, 6])])+ const built = buildPlannedEntry(S, cfg(FLY, { warmupSets: 1 }), null)+ const warm = built.sets.find(s => s.phase === 'warmup')+ expect(built.sets.at(-1).w).toBe(31.7)+ expect(STACK).toContain(warm.w)+ })++ it('drops onto the stack', () => {+ const grid = dropGrid(state(), cfg(FLY))+ expect(STACK).toContain(nextDropWeight(31.7, 20, grid))+ })+})++describe('sync and backups', () => {+ it('is a stamped map on both sides of the sync, kept per exercise', () => {+ expect(STAMPED_MAPS).toContain('stackWeights')+ expect(API_STAMPED_MAPS).toContain('stackWeights')+ const a = { ...state(), _ts: 10, stackWeights: { [FLY]: { unit: 'kg', weights: [5, 10], _ts: 10 } } }+ const b = { ...state(), _ts: 20, stackWeights: { [FLY]: { unit: 'kg', weights: [7], _ts: 5 }, [PUSHDOWN]: { unit: 'kg', weights: [4.5, 9], _ts: 4 } } }+ const merged = mergeStates(a, b)+ expect(merged.stackWeights[FLY]).toEqual({ unit: 'kg', weights: [5, 10], _ts: 10 })+ expect(merged.stackWeights[PUSHDOWN]).toEqual({ unit: 'kg', weights: [4.5, 9], _ts: 4 })+ })++ it('a backup from before stacks, or a broken entry, reads as no stack', () => {+ expect(stackOf({ unit: 'kg' }, FLY)).toEqual([])+ expect(stackOf({ unit: 'kg', stackWeights: { [FLY]: 'junk' } }, FLY)).toEqual([])+ expect(stackOf({ unit: 'kg', stackWeights: { [FLY]: { weights: 'x' } } }, FLY)).toEqual([])+ expect(ownedWeightsFor({ unit: 'kg', stackWeights: null }, cfg(FLY))).toBe(null)+ })+})diff --git a/frontend/src/lib/progression.js b/frontend/src/lib/progression.jsindex daef2dcca..ea25e04b4 100644--- a/frontend/src/lib/progression.js+++ b/frontend/src/lib/progression.js@@ -22,7 +22,7 @@ import { isWarmupRow, isSideSet, syncSideAggregate, makeSideSet } from './workouimport { normalizeRepRange } from './rep-range.js'import { isPyramid } from './pyramid.js'import { backoffAt } from './backoff.js'-import { ownedWeightsFor, ownedUp, ownedDeload, ownedAround } from './dumbbells.js'+import { ownedWeightsFor, ownedKindFor, ownedUp, ownedDeload, ownedAround } from './dumbbells.js'export const POLICIES = ['off', 'linear', 'greyskull', 'double', 'triple', 'time']@@ -458,7 +458,8 @@ export function nextPrescription(S, cfg, routine) {// The dumbbells you own (issue #376, lib/dumbbells.js), when the profile has listed them and// this is a dumbbell lift: a raise goes to the next bell up (a double jump two up), a deload// to the owned bell nearest the deload target, and at the heaviest bell the weight holds.- // Without a list, null, and the increment's grid decides as it always did.+ // Without a list, null, and the increment's grid decides as it always did. A machine with its+ // own stack listed (#688) walks that list the same way.const owned = mode === 'reps' && !assisted ? ownedWeightsFor(S, cfg) : nullconst harder = (weight, step) => (assisted ? Math.max(0, addStep(weight, -step, inc)): owned ? ownedUp(owned, weight, step > inc ? 2 : 1) ?? weight@@ -466,7 +467,11 @@ export function nextPrescription(S, cfg, routine) {const easier = weight => (assisted ? addStep(weight, inc, inc) : owned ? ownedDeload(owned, weight, DELOAD_FACTOR) : deloadTo(weight, inc))// At the heaviest bell there is nothing to raise to: the weight holds and the line says why.const topped = weight => !!owned && ownedUp(owned, weight) == null- const toppedOut = (weight, extra = {}) => ({ policy, kind: 'hold', weight, ...extra, why: ['You’ve outgrown the rack: {0} {1} is your heaviest dumbbell, so the weight stays.', weight, unit] })+ // A machine's own stack (#688) walks the same way; only the line at the top says which it is.+ const onStack = !!owned && ownedKindFor(S, cfg) === 'stack'+ const toppedOut = (weight, extra = {}) => ({ policy, kind: 'hold', weight, ...extra, why: onStack+ ? ['That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.', weight, unit]+ : ['You’ve outgrown the rack: {0} {1} is your heaviest dumbbell, so the weight stays.', weight, unit] })// The routine's own sessions of this exercise, or the exercise's whole history when thediff --git a/frontend/src/lib/pt-br-locale.test.js b/frontend/src/lib/pt-br-locale.test.jsindex 7d20f557d..a482c7243 100644--- a/frontend/src/lib/pt-br-locale.test.js+++ b/frontend/src/lib/pt-br-locale.test.js@@ -41,7 +41,7 @@ describe('Brazilian Portuguese locale', () => {// has to be taught is a number nobody reads. What the numbers stood for is asserted above.// If the hash fails, review the changed keys and wording before accepting a new one. From// frontend/: node scripts/pt-br-inheritance-fingerprint.mjs --list- expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('efa25b6f0f05522fc588701686b7d88ff745dc2a6d7690f81d814a900c5b9cbf')+ expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('4e88aaf93115063d8c310cc025e488198c8823f94e8a8e404e1b0475182f1fba')})// pt-PT labelled Unpair 'Desfazer': Undo, in Portuguese (it is pt-BR's Undo), on the button thatdiff --git a/frontend/src/lib/sync-merge.js b/frontend/src/lib/sync-merge.jsindex dc6ebf2ec..8bd5b7db8 100644--- a/frontend/src/lib/sync-merge.js+++ b/frontend/src/lib/sync-merge.js@@ -36,7 +36,7 @@* is the exception: the edit may have taken away the set the kept weight came from, so it* is the best of the merged history and of the editing copy's own, and the other copy's* can no longer bring a corrected typo back. exNotes, barWeights: key union- * - balanceOverrides, loadKind, plates, dbLoad, dumbbells, dayNotes, dayPhotos: key union; of a key both+ * - balanceOverrides, loadKind, plates, dbLoad, dumbbells, stackWeights, dayNotes, dayPhotos: key union; of a key both* have, the entry set last by its own `_ts`, a clear included (mergeStampedMap), the newer* copy's on a tie. For plates and dumbbells the key is the unit, so the inventory of one unit* is kept whole, as last edited; for dayNotes the key is the date, so each day's note is its own@@ -84,7 +84,7 @@ const list = v => (Array.isArray(v) ? v : [])// The maps whose every entry carries its own edit time (mergeStampedMap). dayNotes is a day's// note on a day off (lib/day-notes.js), one entry per date.// dayPhotos is a progress photo filed under a day (lib/day-photos.js), one entry per photo.-export const STAMPED_MAPS = ['balanceOverrides', 'loadKind', 'plates', 'dbLoad', 'dumbbells', 'dayNotes', 'dayPhotos']+export const STAMPED_MAPS = ['balanceOverrides', 'loadKind', 'plates', 'dbLoad', 'dumbbells', 'stackWeights', 'dayNotes', 'dayPhotos']/** The copy with the later `_ts`; on a tie the first argument (callers pass local first). */export const newerOf = (a, b) => ((b?._ts || 0) > (a?._ts || 0) ? b : a)@@ -616,7 +616,7 @@ function applyDeletions(S, deleted) {const OWN_MERGE = new Set(['_ts', '_rev', '_wid', '_wids', '_unstamped', '_prior', 'active', 'unit', 'unitSet', 'resetAt', 'resetIds', 'deleted', 'edited', 'undone', 'routineOrder','workouts', 'routines', 'customEx', 'equipProfiles', 'gymCards', 'bodyweight', 'measurements', 'favEx',- 'exWeights', 'balanceOverrides', 'loadKind', 'plates', 'dbLoad', 'dumbbells', 'dayNotes', 'dayPhotos',+ 'exWeights', 'balanceOverrides', 'loadKind', 'plates', 'dbLoad', 'dumbbells', 'stackWeights', 'dayNotes', 'dayPhotos',])// Stamped per key instead of whole: one day of the plan, one exercise's note or bar.const PER_KEY = new Set(['week', 'dayPlan', 'exNotes', 'barWeights', 'exAliases'])diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.jsindex 9a58361bd..c9b05df4d 100644--- a/frontend/src/locales/ar.js+++ b/frontend/src/locales/ar.js@@ -2587,4 +2587,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'أثقل مجموعة كنسبة من وزن الجسم، لكل تمرين','Estimated 1RM as a share of body weight, per workout': 'الحد الأقصى المقدّر لتكرار واحد (1RM) كنسبة من وزن الجسم، لكل تمرين','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'وزن الجسم خلال هذه الفترة: {0} → {1}. تحتسب تمارين وزن الجسم والتمارين المساعدة وزن جسمك كجزء من الحمل.',+ 'Weight stack': 'مجموعة الأوزان',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'الأوزان الموجودة فعلًا في هذا الجهاز، بخطواتها الغريبة كلها. التدرج والتخفيف والإحماء وزرّا + و − تقع على هذه فقط.',+ 'No list yet, so this exercise steps by its increment as usual.': 'لا قائمة بعد، لذا يتقدم هذا التمرين بزيادته المعتادة.',+ 'First ({0})': 'الأول ({0})',+ 'How many': 'كم عددها',+ 'Fill in': 'املأ',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'هذه المجموعة كلها: {0} {1} هو الأثقل، لذا يبقى الوزن كما هو.',}diff --git a/frontend/src/locales/bn.js b/frontend/src/locales/bn.jsindex dfe79893a..2050e509c 100644--- a/frontend/src/locales/bn.js+++ b/frontend/src/locales/bn.js@@ -2611,4 +2611,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'প্রতি ওয়ার্কআউটে শরীরের ওজনের অনুপাতে সবচেয়ে ভারী সেট','Estimated 1RM as a share of body weight, per workout': 'প্রতি ওয়ার্কআউটে শরীরের ওজনের অনুপাতে আনুমানিক 1RM','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'এই সময়ে শরীরের ওজন: {0} → {1}। বডিওয়েট ও অ্যাসিস্টেড ব্যায়ামে আপনার শরীরের ওজন লোডের অংশ হিসেবে ধরা হয়।',+ 'Weight stack': 'ওজনের স্ট্যাক',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'এই মেশিনে আসলে যে ওজনগুলো আছে, অদ্ভুত ধাপসহ। প্রগ্রেশন, ডিলোড, ওয়ার্ম-আপ আর + ও − বোতাম কেবল এগুলোতেই পড়ে।',+ 'No list yet, so this exercise steps by its increment as usual.': 'এখনও তালিকা নেই, তাই এই ব্যায়াম আগের মতো নিজের ধাপে বাড়ে।',+ 'First ({0})': 'প্রথম ({0})',+ 'How many': 'কতগুলো',+ 'Fill in': 'পূরণ করুন',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'এটাই পুরো স্ট্যাক: {0} {1} সবচেয়ে ভারী, তাই ওজন একই থাকে।',}diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.jsindex 59924d534..9d57554de 100644--- a/frontend/src/locales/de.js+++ b/frontend/src/locales/de.js@@ -2552,4 +2552,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Schwerster Satz im Verhältnis zum Körpergewicht, pro Training','Estimated 1RM as a share of body weight, per workout': 'Geschätztes 1RM im Verhältnis zum Körpergewicht, pro Training','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Körpergewicht in diesem Zeitraum: {0} → {1}. Bei Körpergewichts- und assistierten Übungen zählt dein Körpergewicht als Teil der Last.',+ 'Weight stack': 'Gewichtsblock',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'Die Gewichte, die diese Maschine wirklich hat, auch die krummen. Progression, Deloads, Aufwärmsätze und die Tasten + und − landen nur auf diesen.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Noch keine Liste, also geht diese Übung wie gewohnt in ihrem Schritt.',+ 'First ({0})': 'Erstes ({0})',+ 'How many': 'Wie viele',+ 'Fill in': 'Ausfüllen',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'Das ist der ganze Block: {0} {1} ist das Schwerste, also bleibt das Gewicht.',}diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.jsindex 5d6aea79d..6efa4b792 100644--- a/frontend/src/locales/es.js+++ b/frontend/src/locales/es.js@@ -2532,4 +2532,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Serie más pesada como proporción del peso corporal, por entrenamiento','Estimated 1RM as a share of body weight, per workout': '1RM estimado como proporción del peso corporal, por entrenamiento','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Peso corporal en este periodo: {0} → {1}. En los ejercicios con peso corporal y asistidos, tu peso corporal cuenta como parte de la carga.',+ 'Weight stack': 'Columna de pesos',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'Los pesos que de verdad tiene esta máquina, saltos raros incluidos. La progresión, las descargas, los calentamientos y los botones + y − solo caen en estos.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Aún no hay lista, así que este ejercicio sube según su incremento, como siempre.',+ 'First ({0})': 'Primero ({0})',+ 'How many': 'Cuántos',+ 'Fill in': 'Rellenar',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'Es toda la columna: {0} {1} es lo máximo que da, así que el peso se queda.',}diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.jsindex 8637f4ed2..8f63e2a9b 100644--- a/frontend/src/locales/fr.js+++ b/frontend/src/locales/fr.js@@ -2532,4 +2532,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Série la plus lourde en proportion du poids de corps, par séance','Estimated 1RM as a share of body weight, per workout': '1RM estimé en proportion du poids de corps, par séance','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Poids de corps sur cette période : {0} → {1}. Pour les exercices au poids de corps et assistés, ton poids de corps compte dans la charge.',+ 'Weight stack': 'Pile de poids',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'Les poids que cette machine a vraiment, sauts bizarres compris. La progression, les décharges, les échauffements et les boutons + et − ne tombent que sur ceux-ci.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Pas encore de liste, donc cet exercice avance de son incrément, comme d’habitude.',+ 'First ({0})': 'Premier ({0})',+ 'How many': 'Combien',+ 'Fill in': 'Remplir',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'C’est toute la pile : {0} {1} est le maximum, donc le poids reste.',}diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.jsindex 00417a16d..2b1d8a725 100644--- a/frontend/src/locales/hi.js+++ b/frontend/src/locales/hi.js@@ -2532,4 +2532,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'प्रति वर्कआउट शरीर के वज़न के अनुपात में सबसे भारी सेट','Estimated 1RM as a share of body weight, per workout': 'प्रति वर्कआउट शरीर के वज़न के अनुपात में अनुमानित 1RM','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'इस अवधि में शरीर का वज़न: {0} → {1}। बॉडीवेट और असिस्टेड व्यायामों में आपके शरीर का वज़न लोड का हिस्सा माना जाता है।',+ 'Weight stack': 'वज़न स्टैक',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'इस मशीन में सच में जो वज़न हैं, अजीब स्टेप समेत। प्रोग्रेशन, डीलोड, वार्म-अप और + व − बटन सिर्फ़ इन्हीं पर आते हैं।',+ 'No list yet, so this exercise steps by its increment as usual.': 'अभी कोई सूची नहीं, इसलिए यह एक्सरसाइज़ हमेशा की तरह अपने स्टेप से बढ़ती है।',+ 'First ({0})': 'पहला ({0})',+ 'How many': 'कितने',+ 'Fill in': 'भरें',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'यही पूरा स्टैक है: {0} {1} सबसे भारी है, इसलिए वज़न वही रहता है।',}diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.jsindex ecdcc8598..1130ea79e 100644--- a/frontend/src/locales/hu.js+++ b/frontend/src/locales/hu.js@@ -2535,4 +2535,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'A legnehezebb sorozat a testsúly arányában, edzésenként','Estimated 1RM as a share of body weight, per workout': 'Becsült 1RM a testsúly arányában, edzésenként','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Testsúly ebben az időszakban: {0} → {1}. A testsúlyos és segített gyakorlatoknál a testsúlyod is a terhelés részének számít.',+ 'Weight stack': 'Súlyoszlop',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'A súlyok, amik ezen a gépen tényleg vannak, a furcsa lépésekkel együtt. A progresszió, a deloadok, a bemelegítések és a + és − gombok csak ezekre esnek.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Még nincs lista, így ez a gyakorlat a szokásos lépésével halad.',+ 'First ({0})': 'Első ({0})',+ 'How many': 'Hány darab',+ 'Fill in': 'Kitöltés',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'Ez az egész oszlop: {0} {1} a legtöbb, így a súly marad.',}diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.jsindex 066a244fd..e162c9520 100644--- a/frontend/src/locales/it.js+++ b/frontend/src/locales/it.js@@ -2532,4 +2532,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Serie più pesante in proporzione al peso corporeo, per allenamento','Estimated 1RM as a share of body weight, per workout': '1RM stimato in proporzione al peso corporeo, per allenamento','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Peso corporeo in questo periodo: {0} → {1}. Negli esercizi a corpo libero e assistiti il tuo peso corporeo conta come parte del carico.',+ 'Weight stack': 'Pacco pesi',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'I pesi che questa macchina ha davvero, salti strani compresi. Progressione, scarichi, riscaldamenti e i tasti + e − cadono solo su questi.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Ancora nessuna lista, quindi questo esercizio sale del suo incremento, come sempre.',+ 'First ({0})': 'Primo ({0})',+ 'How many': 'Quanti',+ 'Fill in': 'Compila',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'È tutto il pacco: {0} {1} è il massimo, quindi il peso resta.',}diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.jsindex 01cbf0b3a..47436e9d0 100644--- a/frontend/src/locales/ko.js+++ b/frontend/src/locales/ko.js@@ -2532,4 +2532,11 @@ export default {'Heaviest set as a share of body weight, per workout': '운동별 체중 대비 가장 무거운 세트','Estimated 1RM as a share of body weight, per workout': '운동별 체중 대비 추정 1RM','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': '이 기간의 체중: {0} → {1}. 맨몸 운동과 보조 운동에서는 체중이 부하의 일부로 계산됩니다.',+ 'Weight stack': '웨이트 스택',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': '이 머신에 실제로 있는 무게예요. 들쭉날쭉한 간격도 그대로요. 진행, 디로드, 워밍업, + 와 − 버튼은 이 무게에만 맞춰져요.',+ 'No list yet, so this exercise steps by its increment as usual.': '아직 목록이 없어서 이 운동은 평소처럼 증가 단위로 올라가요.',+ 'First ({0})': '첫 무게 ({0})',+ 'How many': '개수',+ 'Fill in': '채우기',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': '스택 끝이에요: {0} {1}이(가) 가장 무거우니 무게를 유지해요.',}diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.jsindex c61924ed8..46f511150 100644--- a/frontend/src/locales/pl.js+++ b/frontend/src/locales/pl.js@@ -2532,4 +2532,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Najcięższa seria jako odsetek masy ciała, na trening','Estimated 1RM as a share of body weight, per workout': 'Szacowane 1RM jako odsetek masy ciała, na trening','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Masa ciała w tym okresie: {0} → {1}. W ćwiczeniach z masą ciała i wspomaganych Twoja masa ciała liczy się jako część obciążenia.',+ 'Weight stack': 'Stos obciążenia',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'Ciężary, które ta maszyna naprawdę ma, z dziwnymi skokami włącznie. Progresja, deloady, rozgrzewki i przyciski + i − trafiają tylko na nie.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Jeszcze bez listy, więc to ćwiczenie rośnie o swój krok, jak zwykle.',+ 'First ({0})': 'Pierwszy ({0})',+ 'How many': 'Ile',+ 'Fill in': 'Wypełnij',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'To cały stos: {0} {1} to najwięcej, więc ciężar zostaje.',}diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.jsindex 0e54c5a2e..a6d75c8e2 100644--- a/frontend/src/locales/pt-BR.js+++ b/frontend/src/locales/pt-BR.js@@ -1630,6 +1630,8 @@ export const PT_BR_OVERRIDES = {"Gain {0} to {1} a week.": "Ganhar de {0} a {1} por semana.","A cut is often 0.5 to 1 % a week, a lean bulk 0.25 to 0.5 %.": "Um cutting costuma ficar em 0,5 a 1 % por semana, um bulking limpo em 0,25 a 0,5 %.","Remove range": "Remover faixa",+ 'No list yet, so this exercise steps by its increment as usual.': 'Ainda sem lista, então este exercício sobe pelo seu incremento, como sempre.',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'É o bloco todo: {0} {1} é o máximo que dá, então o peso fica.',}export default { ...pt, ...PT_BR_OVERRIDES }diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.jsindex 2c3899679..e0e4b845d 100644--- a/frontend/src/locales/pt.js+++ b/frontend/src/locales/pt.js@@ -2532,4 +2532,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Série mais pesada como proporção do peso corporal, por treino','Estimated 1RM as a share of body weight, per workout': '1RM estimado como proporção do peso corporal, por treino','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Peso corporal neste período: {0} → {1}. Nos exercícios com peso corporal e assistidos, o teu peso corporal conta como parte da carga.',+ 'Weight stack': 'Bloco de pesos',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'Os pesos que esta máquina tem mesmo, saltos estranhos incluídos. A progressão, as descargas, os aquecimentos e os botões + e − só caem nestes.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Ainda sem lista, por isso este exercício sobe pelo seu incremento, como sempre.',+ 'First ({0})': 'Primeiro ({0})',+ 'How many': 'Quantos',+ 'Fill in': 'Preencher',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'É o bloco todo: {0} {1} é o máximo que dá, por isso o peso fica.',}diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.jsindex fb574c626..42ff62b0b 100644--- a/frontend/src/locales/ru.js+++ b/frontend/src/locales/ru.js@@ -2536,4 +2536,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Самый тяжёлый подход как доля от веса тела, по тренировкам','Estimated 1RM as a share of body weight, per workout': 'Расчётный 1ПМ как доля от веса тела, по тренировкам','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Вес тела за этот период: {0} → {1}. В упражнениях с собственным весом и в гравитронных вес вашего тела входит в нагрузку.',+ 'Weight stack': 'Стек грузов',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'Веса, которые на этом тренажёре реально есть, со всеми странными шагами. Прогрессия, разгрузки, разминка и кнопки + и − попадают только на них.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Списка пока нет, поэтому упражнение растёт на свой шаг, как обычно.',+ 'First ({0})': 'Первый ({0})',+ 'How many': 'Сколько',+ 'Fill in': 'Заполнить',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'Это весь стек: {0} {1} и есть максимум, так что вес остаётся.',}diff --git a/frontend/src/locales/sv.js b/frontend/src/locales/sv.jsindex 7a75ec369..c769afc01 100644--- a/frontend/src/locales/sv.js+++ b/frontend/src/locales/sv.js@@ -2579,4 +2579,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Tyngsta setet som andel av kroppsvikten, per pass','Estimated 1RM as a share of body weight, per workout': 'Uppskattat 1RM som andel av kroppsvikten, per pass','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Kroppsvikt under perioden: {0} → {1}. I kroppsviktsövningar och assisterade övningar räknas din kroppsvikt som en del av belastningen.',+ 'Weight stack': 'Viktstack',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'Vikterna som den här maskinen faktiskt har, udda steg och allt. Progression, deloads, uppvärmning och knapparna + och − landar bara på dessa.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Ingen lista än, så övningen stegar med sitt vanliga steg.',+ 'First ({0})': 'Första ({0})',+ 'How many': 'Hur många',+ 'Fill in': 'Fyll i',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'Det är hela stacken: {0} {1} är det tyngsta, så vikten står kvar.',}diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.jsindex 8e7e01883..3285edee9 100644--- a/frontend/src/locales/th.js+++ b/frontend/src/locales/th.js@@ -2543,4 +2543,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'เซ็ตที่หนักที่สุดเทียบกับน้ำหนักตัว ต่อการเทรนแต่ละครั้ง','Estimated 1RM as a share of body weight, per workout': '1RM โดยประมาณเทียบกับน้ำหนักตัว ต่อการเทรนแต่ละครั้ง','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'น้ำหนักตัวในช่วงนี้: {0} → {1} ท่าที่ใช้น้ำหนักตัวและท่าที่มีตัวช่วยจะนับน้ำหนักตัวของคุณเป็นส่วนหนึ่งของน้ำหนักที่ยก',+ 'Weight stack': 'สแต็กน้ำหนัก',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'น้ำหนักที่เครื่องนี้มีจริง รวมขั้นแปลก ๆ ด้วย การเพิ่มน้ำหนัก การดีโหลด การวอร์มอัป และปุ่ม + กับ − จะลงที่ค่าเหล่านี้เท่านั้น',+ 'No list yet, so this exercise steps by its increment as usual.': 'ยังไม่มีรายการ ท่านี้จึงเพิ่มตามขั้นปกติของมัน',+ 'First ({0})': 'แรก ({0})',+ 'How many': 'กี่ค่า',+ 'Fill in': 'เติม',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'สุดสแต็กแล้ว: {0} {1} หนักที่สุด น้ำหนักจึงคงเดิม',}diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.jsindex 7a7183a0f..42145e256 100644--- a/frontend/src/locales/tr.js+++ b/frontend/src/locales/tr.js@@ -2532,4 +2532,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Antrenman başına vücut ağırlığına oranla en ağır set','Estimated 1RM as a share of body weight, per workout': 'Antrenman başına vücut ağırlığına oranla tahmini 1RM','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Bu dönemdeki vücut ağırlığı: {0} → {1}. Vücut ağırlığı ve destekli egzersizlerde vücut ağırlığın yükün bir parçası sayılır.',+ 'Weight stack': 'Ağırlık bloğu',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'Bu makinede gerçekten olan ağırlıklar, tuhaf adımlar dahil. İlerleme, deload, ısınma ve + ile − düğmeleri yalnızca bunlara düşer.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Henüz liste yok, bu yüzden bu egzersiz her zamanki gibi kendi artışıyla ilerler.',+ 'First ({0})': 'İlk ({0})',+ 'How many': 'Kaç tane',+ 'Fill in': 'Doldur',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'Bloğun tamamı bu: {0} {1} en ağırı, o yüzden ağırlık sabit kalır.',}diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.jsindex 66b789140..99d899c98 100644--- a/frontend/src/locales/uk.js+++ b/frontend/src/locales/uk.js@@ -2529,4 +2529,11 @@ export default {'Heaviest set as a share of body weight, per workout': 'Найважчий підхід як частка ваги тіла, за тренуваннями','Estimated 1RM as a share of body weight, per workout': 'Розрахунковий 1ПМ як частка ваги тіла, за тренуваннями','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': 'Вага тіла за цей період: {0} → {1}. У вправах із власною вагою та з допомогою вага вашого тіла входить у навантаження.',+ 'Weight stack': 'Стек вантажів',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': 'Ваги, які на цьому тренажері справді є, з усіма дивними кроками. Прогресія, розвантаження, розминка й кнопки + і − потрапляють лише на них.',+ 'No list yet, so this exercise steps by its increment as usual.': 'Списку ще немає, тож вправа зростає на свій крок, як завжди.',+ 'First ({0})': 'Перший ({0})',+ 'How many': 'Скільки',+ 'Fill in': 'Заповнити',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': 'Це весь стек: {0} {1} і є максимум, тож вага лишається.',}diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.jsindex 2a79db34e..714d5c257 100644--- a/frontend/src/locales/zh-TW.js+++ b/frontend/src/locales/zh-TW.js@@ -2525,4 +2525,11 @@ export default {'Heaviest set as a share of body weight, per workout': '每次訓練中最重一組佔體重的比例','Estimated 1RM as a share of body weight, per workout': '每次訓練的預估 1RM 佔體重的比例','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': '此期間的體重:{0} → {1}。徒手與輔助動作會把你的體重計入負重。',+ 'Weight stack': '配重片',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': '這台器械實際有的重量,奇怪的級距也算。進階、減量、熱身和 + − 按鈕都只會落在這些重量上。',+ 'No list yet, so this exercise steps by its increment as usual.': '還沒有清單,所以這個動作照常按增量遞增。',+ 'First ({0})': '起始 ({0})',+ 'How many': '數量',+ 'Fill in': '填入',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': '已經到底了:{0} {1} 是最重的一檔,所以重量不變。',}diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.jsindex 4b4056a8f..849d4604b 100644--- a/frontend/src/locales/zh.js+++ b/frontend/src/locales/zh.js@@ -2532,4 +2532,11 @@ export default {'Heaviest set as a share of body weight, per workout': '每次训练中最重一组占体重的比例','Estimated 1RM as a share of body weight, per workout': '每次训练的预估 1RM 占体重的比例','Body weight over this period: {0} → {1}. Bodyweight and assisted exercises count your body weight as part of the load.': '此期间的体重:{0} → {1}。自重和辅助动作会把你的体重计入负重。',+ 'Weight stack': '配重片',+ 'The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons land only on these.': '这台器械真实有的重量,奇怪的档位也算。进阶、减载、热身和 + − 按钮都只落在这些重量上。',+ 'No list yet, so this exercise steps by its increment as usual.': '还没有列表,所以这个动作照常按增量递增。',+ 'First ({0})': '起始 ({0})',+ 'How many': '数量',+ 'Fill in': '填入',+ 'That’s the whole stack: {0} {1} is the heaviest it goes, so the weight stays.': '已经到底了:{0} {1} 是最重的一档,所以重量不变。',}diff --git a/frontend/src/sheets.jsx b/frontend/src/sheets.jsxindex 8b46c71eb..4f5bd431d 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 } from './lib/dumbbells.js'+import { isBellEx, dbLoadOf, dbLoadFor, withDbLoad, entryDbLoad, currentDbLoad, isOneArm, dumbbellsOf, ownsDumbbells, withDumbbells, 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'@@ -878,6 +878,61 @@ function DbLoadPicker({ ex, cfg, value, onChange }) {</>}+// A machine's own weight stack (issue #688, lib/dumbbells.js): the weights its pin really+// selects, for this exercise everywhere. With a list, progression, deloads, warm-ups, drops and the+// + and − buttons land on these instead of on the increment, like the dumbbell list (#376). Tap a+// weight to take it off, the field adds one, and the quick fill writes an even stack to edit from.+function StackEditor({ ex }) {+ const st = useStore(s => s.S)+ const unit = st.unit === 'lb' ? 'lb' : 'kg'+ const list = stackOf(st, ex.id)+ const [draft, setDraft] = useState(null)+ const [first, setFirst] = useState(null)+ const [step, setStep] = useState(null)+ const [count, setCount] = useState(null)+ const save = ws => update(s => { s.stackWeights = withStack(s, ex.id, ws) })+ const add = () => {+ const w = cleanWeights([draft])[0]+ if (!w) { toast(t('Enter a valid weight')); return }+ save([...list, w])+ setDraft(null)+ }+ const fill = () => {+ const ws = stackFromStep(first, step, count || 10)+ if (!ws.length) { toast(t('Enter a valid weight')); return }+ save(ws)+ }+ return <>+ <div className="small dim" style={{ marginBottom: 10 }}>+ {t('The weights this machine really has, odd steps and all. Progression, deloads, warm-ups and the + and − buttons 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 this exercise steps by its increment as usual.')}</div>}+ <div className="row" style={{ gap: 8, marginBottom: 8 }}>+ <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>+ {/* An evenly spaced stack in three numbers, to fix the odd ones on after. */}+ {list.length === 0 && <>+ <div className="row" style={{ gap: 8, marginBottom: 8 }}>+ <NumberField className="input" decimal value={first ?? ''} onChange={setFirst} aria-label={t('First ({0})', unit)} placeholder={t('First ({0})', unit)} />+ <NumberField className="input" decimal value={step ?? ''} onChange={setStep} aria-label={t('Step ({0})', unit)} placeholder={t('Step ({0})', unit)} />+ </div>+ <div className="row" style={{ gap: 8, marginBottom: 8 }}>+ <NumberField className="input" value={count ?? ''} onChange={setCount} aria-label={t('How many')} placeholder={t('How many')} />+ <Button onClick={fill} style={{ flex: '0 0 auto', width: 'auto' }}>{t('Fill in')}</Button>+ </div>+ </>}+ {list.length > 0 && <Button variant="danger" onClick={() => save([])} style={{ marginBottom: 8 }}>{t('Clear the list')}</Button>}+ <div style={{ height: 10 }} />+ </>+}+// Mid-workout sheet behind the ⋯ menu's "Plate loading" — same values, same editor.function BarWeightSheet({ exId, cfg, close }) {const ex = exOr(exId)@@ -885,6 +940,7 @@ function BarWeightSheet({ exId, cfg, close }) {<h3>{t('Plate loading')}</h3><div className={`muted small ${exerciseNameClass(ex)}`} style={{ marginBottom: 12 }}>{exerciseNameFor(ex)}</div><BarWeightEditor ex={ex} cfg={cfg} extra={t('Applies to this exercise everywhere, not just this plan.')} />+ {canHaveStack(ex) && <><h4 className="sec">{t('Weight stack')}</h4><StackEditor ex={ex} /></>}<Button variant="primary" onClick={close}>{t('Done')}</Button></>}@@ -1095,6 +1151,7 @@ function ExerciseDetail({ ex, close }) {{modeOf({ id: ex.id }) === 'reps' && <><h4 className="sec">{t('Plate loading')}</h4><BarWeightEditor ex={ex} extra={t('You still log the total weight. This only feeds the plate line under each set.')} />+ {canHaveStack(ex) && <><h4 className="sec">{t('Weight stack')}</h4><StackEditor ex={ex} /></>}</>}{/* The exercise's own default meaning of its weight (S.dbLoad), stamped like the loadingabove. A routine can still pick its own on the exercise's settings. */}@@ -2288,6 +2345,7 @@ function ExConfig({ ex, existing, onSave, onDelete, onReplace, close, routine, i{mode === 'reps' && <><h4 className="sec">{t('Plate loading')}</h4><BarWeightEditor ex={ex} cfg={c} extra={t('Applies to this exercise everywhere, not just this plan.')} />+ {canHaveStack(ex) && !bw && <><h4 className="sec">{t('Weight stack')}</h4><StackEditor ex={ex} /></>}</>}{pyramid? <div className="small dim" style={{ marginBottom: 18 }}>{t('Weight is up to you: pyramid sets are not progressed automatically.')}</div>diff --git a/frontend/src/sheets.stack.test.jsx b/frontend/src/sheets.stack.test.jsxnew file mode 100644index 000000000..9bc9d375e--- /dev/null+++ b/frontend/src/sheets.stack.test.jsx@@ -0,0 +1,68 @@+// @vitest-environment happy-dom+// A machine's own weight stack (issue #688): the editor under Plate loading writes the weights a+// machine really has for that exercise, stamped, the way lib/dumbbells.js stackOf reads them.+import React, { act } from 'react'+import { afterEach, beforeEach, describe, expect, it } from 'vitest'+import { createRoot } from 'react-dom/client'+import { useStore, DEF } from './store/useStore.js'+import { useUI } from './store/useUI.js'+import { barWeightSheet } from './sheets.jsx'++const FLY = '0596' // lever seated fly+const SQUAT = '0043' // barbell+const DIP = '0009' // assisted chest dip++const mounted = []+function mountTopSheet() {+ const sheet = useUI.getState().sheets.at(-1)+ const host = document.createElement('div')+ document.body.appendChild(host)+ const root = createRoot(host)+ mounted.push(root)+ act(() => root.render(sheet.render(() => useUI.getState().closeSheet(sheet.id))))+ return host+}+const S = () => useStore.getState().S+const button = (host, text) => [...host.querySelectorAll('button')].find(b => b.textContent.trim() === text)+const type = (input, v) => act(() => {+ const set = Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, 'value').set+ set.call(input, v)+ input.dispatchEvent(new Event('input', { bubbles: true }))+})+const field = (host, label) => host.querySelector(`input[aria-label="${label}"]`)++describe('weight stack editor', () => {+ beforeEach(() => {+ globalThis.IS_REACT_ACT_ENVIRONMENT = true+ useUI.setState({ sheets: [], toasts: [] })+ useStore.setState({ S: { ...JSON.parse(JSON.stringify(DEF)), unit: 'kg' }, user: null })+ document.body.innerHTML = ''+ })+ afterEach(() => { act(() => { mounted.splice(0).forEach(root => root.unmount()) }) })++ it('fills an even stack, takes the odd weight added, and a tap takes one off', () => {+ act(() => barWeightSheet(FLY, { id: FLY }))+ const host = mountTopSheet()+ expect(host.textContent).toContain('Weight stack')+ expect(host.textContent).toContain('No list yet')+ type(field(host, 'First (kg)'), '5')+ type(field(host, 'Step (kg)'), '6.8')+ type(field(host, 'How many'), '4')+ act(() => button(host, 'Fill in').click())+ expect(S().stackWeights[FLY]).toMatchObject({ unit: 'kg', weights: [5, 11.8, 18.6, 25.4], _ts: expect.any(Number) })+ type(field(host, 'Weight (kg)'), '11.3')+ act(() => button(host, 'Add').click())+ expect(S().stackWeights[FLY].weights).toEqual([5, 11.3, 11.8, 18.6, 25.4])+ act(() => host.querySelector('[aria-label="Remove 11.8 kg"]').click())+ expect(S().stackWeights[FLY].weights).toEqual([5, 11.3, 18.6, 25.4])+ act(() => button(host, 'Clear the list').click())+ expect(S().stackWeights[FLY]).toEqual({ _ts: expect.any(Number) })+ })++ it('is not offered on a barbell or an assistance machine', () => {+ act(() => barWeightSheet(SQUAT, { id: SQUAT }))+ expect(mountTopSheet().textContent).not.toContain('Weight stack')+ act(() => barWeightSheet(DIP, { id: DIP }))+ expect(mountTopSheet().textContent).not.toContain('Weight stack')+ })+})diff --git a/frontend/src/store/useStore.js b/frontend/src/store/useStore.jsindex 4780126f9..bd4399585 100644--- a/frontend/src/store/useStore.js+++ b/frontend/src/store/useStore.js@@ -187,6 +187,9 @@ export const DEF = {// (lib/dumbbells.js). Single bells, lightest first. Kept per unit and stamped like the plates;// absent or empty = no list, and dumbbell lifts step by their increment as before.dumbbells: {},+ // A machine's own weight stack, keyed by exercise id: { unit, weights: [5, 11.3, 18.1, …], _ts }+ // (lib/dumbbells.js, issue #688). Absent or empty = the increment decides, as before.+ stackWeights: {},// Gym check-in cards (see views/CheckIn.jsx). Each is a membership// code shown as a QR/barcode at the gym's turnstile — added by typing it, importing a photo// of the card, or scanning it. We only ever keep the code's VALUE, never a photo: the imagediff --git a/frontend/src/views/Workout.jsx b/frontend/src/views/Workout.jsxindex 880a538b5..d31714531 100644--- a/frontend/src/views/Workout.jsx+++ b/frontend/src/views/Workout.jsx@@ -287,6 +287,7 @@ function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSiconst loadStep = mode === 'reps' ? weightIncrement(cfg, S.unit) : 2.5// With the dumbbells you own listed (issue #376), + and − walk from bell to bell — 9, 11, 13 —// instead of along the increment's grid; an off-list weight goes to the nearest bell that way.+ // A machine's own stack (#688) is walked the same way: 5, 11.3, 18.1.const owned = mode === 'reps' ? ownedWeightsFor(S, cfg) : nullconst stepLoad = (v, step, dir) => (owned ? stepOwned(owned, v, dir) : stepWeight(v, step, dir))// The weight column says what a dumbbell weight means when the exercise has said (#474): one