Skip to content

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.

fix(focus): adapt the focus view to v1.3.10

giulioleuci19a28ff181fb
diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.js
index 50bb28655..597ee72d0 100644
--- a/frontend/src/locales/ar.js
+++ b/frontend/src/locales/ar.js
@@ -2003,7 +2003,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'تظهر الألوان الرمادية أغمق في الوضع الفاتح، حتى لا تبدو الأزرار مُعطّلة.',
'custom color picker': 'لون خاص مخصص منتقي الألوان',
'Signed in from another tab. Your workout came along, keep going here.': 'تم تسجيل الدخول من علامة تبويب أخرى. تمرينك انتقل معك، تابعه هنا.',
- 'Enter how long it took — at least 1 minute.': 'أدخل المدة التي استغرقها — دقيقة واحدة على الأقل.',
// --- focus workout view ---
'Add burst': 'إضافة مجموعة راحة مؤقتة',
'Add drop set': 'إضافة مجموعة تنازلية',
diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.js
index 4bc15be5e..75ef946a7 100644
--- a/frontend/src/locales/de.js
+++ b/frontend/src/locales/de.js
@@ -1970,7 +1970,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'Grautöne werden im hellen Modus dunkler, damit Buttons nicht ausgeschaltet wirken.',
'custom color picker': 'eigene Farbe benutzerdefiniert Farbwähler Farbauswahl',
'Signed in from another tab. Your workout came along, keep going here.': 'In einem anderen Tab angemeldet. Dein Training ist mitgekommen, mach hier weiter.',
- 'Enter how long it took — at least 1 minute.': 'Gib ein, wie lange es gedauert hat — mindestens 1 Minute.',
// --- focus workout view ---
'Add burst': 'Rest-Pause-Satz hinzufügen',
'Add drop set': 'Dropsatz hinzufügen',
diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.js
index 69f360a1d..b63bb9e33 100644
--- a/frontend/src/locales/es.js
+++ b/frontend/src/locales/es.js
@@ -1950,7 +1950,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'Los grises se ven más oscuros en modo claro, para que los botones no parezcan apagados.',
'custom color picker': 'color propio personalizado selector de color',
'Signed in from another tab. Your workout came along, keep going here.': 'Sesión iniciada en otra pestaña. Tu entreno vino contigo, sigue aquí.',
- 'Enter how long it took — at least 1 minute.': 'Indica cuánto duró — al menos 1 minuto.',
// --- focus workout view ---
'Add burst': 'Añadir serie rest-pause',
'Add drop set': 'Añadir serie descendente',
diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.js
index a4d19f95b..b4d7a6c29 100644
--- a/frontend/src/locales/fr.js
+++ b/frontend/src/locales/fr.js
@@ -1950,7 +1950,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'Les gris foncent en mode clair, pour que les boutons n’aient pas l’air éteints.',
'custom color picker': 'couleur perso personnalisée sélecteur nuancier',
'Signed in from another tab. Your workout came along, keep going here.': 'Connecté depuis un autre onglet. Ta séance a suivi, continue ici.',
- 'Enter how long it took — at least 1 minute.': 'Indique combien de temps ça a duré — au moins 1 minute.',
// --- focus workout view ---
'Add burst': 'Ajouter une série rest-pause',
'Add drop set': 'Ajouter une série dégressive',
diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.js
index 918d4c40c..825af6faf 100644
--- a/frontend/src/locales/hi.js
+++ b/frontend/src/locales/hi.js
@@ -1950,7 +1950,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'लाइट मोड में ग्रे रंग गहरे दिखते हैं, ताकि बटन बंद जैसे न लगें।',
'custom color picker': 'अपना रंग कस्टम रंग चुनने वाला',
'Signed in from another tab. Your workout came along, keep going here.': 'दूसरे टैब से साइन इन हुआ। आपका वर्कआउट साथ आ गया, यहीं जारी रखें।',
- 'Enter how long it took — at least 1 minute.': 'बताएँ कि इसमें कितना समय लगा — कम से कम 1 मिनट।',
// --- focus workout view ---
'Add burst': 'रेस्ट-पॉज़ सेट जोड़ें',
'Add drop set': 'ड्रॉप सेट जोड़ें',
diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.js
index 8771edd9a..b02529268 100644
--- a/frontend/src/locales/hu.js
+++ b/frontend/src/locales/hu.js
@@ -1953,7 +1953,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'A szürkék világos módban sötétebbek, hogy a gombok ne tűnjenek kikapcsoltnak.',
'custom color picker': 'saját szín egyéni színválasztó',
'Signed in from another tab. Your workout came along, keep going here.': 'Bejelentkeztél egy másik lapon. Az edzésed is jött vele, folytasd itt.',
- 'Enter how long it took — at least 1 minute.': 'Add meg, meddig tartott — legalább 1 perc.',
// --- focus workout view ---
'Add burst': 'Rest-pause sorozat hozzáadása',
'Add drop set': 'Vetkőző sorozat hozzáadása',
diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.js
index ea6610da3..34c922fa4 100644
--- a/frontend/src/locales/it.js
+++ b/frontend/src/locales/it.js
@@ -1950,7 +1950,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'I grigi diventano più scuri in modalità chiara, così i pulsanti non sembrano spenti.',
'custom color picker': 'colore personalizzato proprio selettore colore',
'Signed in from another tab. Your workout came along, keep going here.': 'Accesso fatto da un’altra scheda. Il tuo allenamento è venuto con te, continua qui.',
- 'Enter how long it took — at least 1 minute.': 'Inserisci quanto è durato — almeno 1 minuto.',
// --- focus workout view ---
'Add burst': 'Aggiungi serie rest-pause',
'Add drop set': 'Aggiungi drop set',
diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.js
index 636c00496..0956f8be9 100644
--- a/frontend/src/locales/ko.js
+++ b/frontend/src/locales/ko.js
@@ -1950,7 +1950,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': '라이트 모드에서는 버튼이 꺼진 것처럼 보이지 않게 회색을 어둡게 표시해요.',
'custom color picker': '나만의 색상 사용자 지정 색상 선택기',
'Signed in from another tab. Your workout came along, keep going here.': '다른 탭에서 로그인했어요. 운동도 함께 넘어왔으니 여기서 이어서 하세요.',
- 'Enter how long it took — at least 1 minute.': '걸린 시간을 입력하세요 — 최소 1분.',
// --- focus workout view ---
'Add burst': '레스트-포즈 세트 추가',
'Add drop set': '드롭 세트 추가',
diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.js
index 46349c475..1b58dabfc 100644
--- a/frontend/src/locales/pl.js
+++ b/frontend/src/locales/pl.js
@@ -1950,7 +1950,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'Szarości są ciemniejsze w trybie jasnym, żeby przyciski nie wyglądały na wyłączone.',
'custom color picker': 'własny kolor niestandardowy próbnik wybór koloru',
'Signed in from another tab. Your workout came along, keep going here.': 'Zalogowano w innej karcie. Twój trening przeszedł razem z kontem, kontynuuj tutaj.',
- 'Enter how long it took — at least 1 minute.': 'Wpisz, ile to trwało — co najmniej 1 minutę.',
// --- focus workout view ---
'Add burst': 'Dodaj serię rest-pause',
'Add drop set': 'Dodaj serię zmniejszaną',
diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.js
index 99a506edc..fee0a5576 100644
--- a/frontend/src/locales/pt-BR.js
+++ b/frontend/src/locales/pt-BR.js
@@ -1212,7 +1212,6 @@ export const PT_BR_OVERRIDES = {
'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Os cinzas ficam mais claros no modo escuro, para os botões não parecerem desligados.',
'Greys show darker in light mode, so buttons don’t look switched off.': 'Os cinzas ficam mais escuros no modo claro, para os botões não parecerem desligados.',
'Signed in from another tab. Your workout came along, keep going here.': 'Login feito em outra aba. Seu treino veio junto, continue por aqui.',
- 'Enter how long it took — at least 1 minute.': 'Informe quanto tempo levou — pelo menos 1 minuto.',
// --- focus workout view ---
'Add burst': 'Adicionar série rest-pause',
'Add drop set': 'Adicionar drop set',
@@ -1225,7 +1224,6 @@ export const PT_BR_OVERRIDES = {
'Delete set': 'Excluir série',
'Exercise {0} of {1}': 'Exercício {0} de {1}',
'Focus': 'Foco',
- 'Left': 'Esquerda',
'Load': 'Carga',
'Load ({0})': 'Carga ({0})',
'Mark as warm-up': 'Marcar como aquecimento',
@@ -1234,7 +1232,6 @@ export const PT_BR_OVERRIDES = {
'Next superset set': 'Próxima série do superset',
'Previous set': 'Série anterior',
'Previous superset set': 'Série anterior do superset',
- 'Right': 'Direita',
'Round {0}': 'Rodada {0}',
'Set menu': 'Menu da série',
'Set note': 'Nota da série',
diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.js
index 50aba0aaa..a1377c8e7 100644
--- a/frontend/src/locales/pt.js
+++ b/frontend/src/locales/pt.js
@@ -1950,7 +1950,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'Os cinzentos ficam mais escuros no modo claro, para os botões não parecerem desligados.',
'custom color picker': 'cor própria personalizada seletor de cor',
'Signed in from another tab. Your workout came along, keep going here.': 'Sessão iniciada noutro separador. O teu treino veio junto, continua aqui.',
- 'Enter how long it took — at least 1 minute.': 'Indica quanto tempo demorou — pelo menos 1 minuto.',
// --- focus workout view ---
'Add burst': 'Adicionar série rest-pause',
'Add drop set': 'Adicionar série descendente',
diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.js
index 6abe96e5a..5318a2981 100644
--- a/frontend/src/locales/ru.js
+++ b/frontend/src/locales/ru.js
@@ -1954,7 +1954,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'Серые оттенки в светлой теме темнее, чтобы кнопки не казались выключенными.',
'custom color picker': 'свой цвет пользовательский палитра выбор цвета',
'Signed in from another tab. Your workout came along, keep going here.': 'Вход выполнен в другой вкладке. Тренировка сохранилась, продолжай здесь.',
- 'Enter how long it took — at least 1 minute.': 'Укажите, сколько это длилось — не меньше 1 минуты.',
// --- focus workout view ---
'Add burst': 'Добавить подход рест-пауза',
'Add drop set': 'Добавить дроп-сет',
diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.js
index 05436bcc0..2749f5485 100644
--- a/frontend/src/locales/th.js
+++ b/frontend/src/locales/th.js
@@ -1961,7 +1961,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'สีเทาจะเข้มขึ้นในโหมดสว่าง ปุ่มจะได้ไม่ดูเหมือนถูกปิดอยู่',
'custom color picker': 'สีเอง กำหนดเอง ตัวเลือกสี',
'Signed in from another tab. Your workout came along, keep going here.': 'ลงชื่อเข้าใช้จากแท็บอื่นแล้ว การออกกำลังกายของคุณมาด้วย ทำต่อที่นี่ได้เลย',
- 'Enter how long it took — at least 1 minute.': 'ใส่ระยะเวลาที่ใช้ — อย่างน้อย 1 นาที',
// --- focus workout view ---
'Add burst': 'เพิ่มเซ็ตพักสั้น',
'Add drop set': 'เพิ่มดรอปเซ็ต',
diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.js
index d3265f287..2717cedca 100644
--- a/frontend/src/locales/tr.js
+++ b/frontend/src/locales/tr.js
@@ -1950,7 +1950,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'Griler aydınlık modda daha koyu görünür, düğmeler kapalıymış gibi durmasın diye.',
'custom color picker': 'kendi renk özel renk seçici',
'Signed in from another tab. Your workout came along, keep going here.': 'Başka bir sekmede giriş yapıldı. Antrenmanın da geldi, buradan devam et.',
- 'Enter how long it took — at least 1 minute.': 'Ne kadar sürdüğünü gir — en az 1 dakika.',
// --- focus workout view ---
'Add burst': 'Rest-pause seti ekle',
'Add drop set': 'Drop set ekle',
diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.js
index b8d603617..0e45526e1 100644
--- a/frontend/src/locales/uk.js
+++ b/frontend/src/locales/uk.js
@@ -1947,7 +1947,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': 'Сірі відтінки у світлій темі темніші, щоб кнопки не здавалися вимкненими.',
'custom color picker': 'свій колір власний палітра вибір кольору',
'Signed in from another tab. Your workout came along, keep going here.': 'Вхід виконано в іншій вкладці. Тренування збережено, продовжуй тут.',
- 'Enter how long it took — at least 1 minute.': 'Вкажи, скільки це тривало — щонайменше 1 хвилину.',
// --- focus workout view ---
'Add burst': 'Додати підхід рест-паузи',
'Add drop set': 'Додати дроп-сет',
diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.js
index 0ab17d0bf..3c54d6d31 100644
--- a/frontend/src/locales/zh-TW.js
+++ b/frontend/src/locales/zh-TW.js
@@ -1943,4 +1943,30 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': '淺色模式下灰色會調暗一些,免得按鈕看起來像被停用了。',
'custom color picker': '自訂顏色 自己的顏色 取色器 調色盤',
'Signed in from another tab. Your workout came along, keep going here.': '已在另一個分頁登入。你的訓練也一起帶過去了,在這裡繼續吧。',
+ // --- focus workout view ---
+ 'Add burst': '新增衰竭組',
+ 'Add drop set': '新增遞減組',
+ 'Anything specific to remember about this set.': '關於這一組有什麼特別要記住的。',
+ 'Complete': '完成',
+ 'Complete left side': '完成左側',
+ 'Complete right side': '完成右側',
+ 'Complete set': '完成這一組',
+ 'Complete set {0} to edit this one.': '請先完成第 {0} 組,再編輯這一組。',
+ 'Delete set': '刪除組數',
+ 'Exercise {0} of {1}': '第 {0} 個動作,共 {1} 個',
+ 'Focus': '專注',
+ 'Load': '負重',
+ 'Load ({0})': '負重({0})',
+ 'Mark as warm-up': '標記為熱身組',
+ 'Mark as work set': '標記為正式組',
+ 'Next set': '下一組',
+ 'Next superset set': '超級組的下一組',
+ 'Previous set': '上一組',
+ 'Previous superset set': '超級組的上一組',
+ 'Round {0}': '第 {0} 輪',
+ 'Set menu': '組數選單',
+ 'Set note': '組數備註',
+ 'Skip set': '略過這一組',
+ 'Superset:': '超級組:',
+ '{0}s hold': '維持 {0} 秒',
}
diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.js
index 7366b309f..1674e7488 100644
--- a/frontend/src/locales/zh.js
+++ b/frontend/src/locales/zh.js
@@ -1950,7 +1950,6 @@ export default {
'Greys show darker in light mode, so buttons don’t look switched off.': '浅色模式下灰色会调暗一些,免得按钮看起来像被停用了。',
'custom color picker': '自定义颜色 自己的颜色 取色器 调色板',
'Signed in from another tab. Your workout came along, keep going here.': '已在另一个标签页登录。你的训练也一起带过去了,在这里继续吧。',
- 'Enter how long it took — at least 1 minute.': '请输入用时 — 至少 1 分钟。',
// --- focus workout view ---
'Add burst': '添加暂停组',
'Add drop set': '添加递减组',
diff --git a/frontend/src/views/FocusView.jsx b/frontend/src/views/FocusView.jsx
index ce183589e..9239056c7 100644
--- a/frontend/src/views/FocusView.jsx
+++ b/frontend/src/views/FocusView.jsx
@@ -94,7 +94,7 @@ function PlateBadge({ S, entry, set }) {
if (!load) return null
const stack = load.plates.map(fmtPlate).join(' + ')
const text = load.barOnly ? t('Bar only')
- : load.kind === 'pairs' ? t('{0} per side', stack || '—') : t('Load {0}', stack || '—')
+ : load.kind === 'pairs' ? t('{0} per side', stack || '–') : t('Load {0}', stack || '–')
return <span className="focus-badge plate"><Icon name="plate" />{text}{load.missing > 0 && <> · <span className="short">{t('{0} short', fmtPlate(load.missing) + ' ' + S.unit)}</span></>}</span>
}
diff --git a/frontend/src/views/Workout.test.jsx b/frontend/src/views/Workout.test.jsx
index 515f9581f..c28e344b3 100644
--- a/frontend/src/views/Workout.test.jsx
+++ b/frontend/src/views/Workout.test.jsx
@@ -1679,7 +1679,7 @@ describe('workout focus view', () => {
await click(buttonNamed('Complete set'))
expect(mocks.S.active.entries[0].sets[0].done).toBe(true)
- expect(mocks.startRest).toHaveBeenCalledWith(90, expect.any(Number))
+ expect(mocks.startRest).toHaveBeenCalledWith(90, expect.any(Number), { forSet: expect.any(Number) })
expect(container.textContent).toContain('2/2')
await click(buttonNamed('Complete set'))
@@ -1705,7 +1705,7 @@ describe('workout focus view', () => {
await click(buttonNamed('Complete set'))
expect(mocks.S.active.cur).toBe(0)
- expect(mocks.startRest).toHaveBeenCalledWith(90, expect.any(Number))
+ expect(mocks.startRest).toHaveBeenCalledWith(90, expect.any(Number), { forSet: expect.any(Number) })
await rerender()
expect(container.textContent).toContain('Round 2')
@@ -2156,18 +2156,14 @@ describe('workout view header menu', () => {
expect(item(layout, 'Cards').on).toBe(false)
})
- it('includes Rename workout, Add routine and the whole-workout progression switch, then a Layout sheet with the four layouts marked current', async () => {
+ it('marks Focus current in the Layout sheet when the session is in the focus view', async () => {
await mount([exercise('plain-bench', [false])], 0, { active: { workoutView: 'focus', routineIds: [] } })
const menu = await openMenu()
- expect(menu.items.filter(Boolean).map(it => it.label)).toEqual(['Rename workout', 'Add routine', 'Don’t count for progression', 'Layout'])
expect(item(menu, 'Layout').sub).toBe('Focus')
- await act(async () => { item(menu, 'Rename workout').onClick() })
- expect(mocks.renameWorkoutSheet).toHaveBeenCalled()
-
const layout = await openLayout(menu)
- expect(layout.items.filter(Boolean).map(it => it.label)).toEqual(['Cards', 'List', 'Compact', 'Focus'])
+ expect(menuItemsOf(layout).map(it => it.label)).toEqual(['Cards', 'List', 'Compact', 'Focus'])
expect(item(layout, 'Focus').on).toBe(true)
expect(item(layout, 'Cards').on).toBe(false)
})