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
Equipment profiles: bench and pull-up bar as their own equipment
Pawel492d5a15bf2f
diff --git a/frontend/src/lib/equipment.js b/frontend/src/lib/equipment.jsindex a926a1e04..938455f53 100644--- a/frontend/src/lib/equipment.js+++ b/frontend/src/lib/equipment.js@@ -1,16 +1,36 @@import { t } from './i18n.js'import { EXDB } from './exercises-data.js'-// Every equipment value present in the catalogue, most common first — this becomes the-// checklist Settings shows when you build a profile.+// 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.+// They are read off the exercise name instead of stored on 1,300 rows, and sit in the profile+// checklist beside the real equipment values.+export const ACCESSORIES = ['bench', 'pull-up bar']++// Machines that carry their own seat, bar or bench: "lever incline chest press" needs no bench.+const SELF_CONTAINED = new Set(['leverage machine', 'sled machine', 'assisted'])++// Which accessories an exercise needs, e.g. ['bench'] for "dumbbell incline bench press".+export function accessoriesOf(ex) {+ if (!ex.n || SELF_CONTAINED.has(ex.eq)) return []+ const n = ex.n.toLowerCase()+ const need = []+ if (/\bbench\b|\bincline\b|\bdecline\b/.test(n)) need.push('bench')+ if (/pull-up|pull up|chin-up|\bchin\b|hanging|muscle-up|muscle up/.test(n)) need.push('pull-up bar')+ return need+}++// Every equipment value present in the catalogue, most common first, then the accessories —+// this becomes the checklist Settings shows when you build a profile.export const ALL_EQUIPMENT = (() => {const c = {}EXDB.forEach(e => { if (e.eq) c[e.eq] = (c[e.eq] || 0) + 1 })- return Object.keys(c).sort((a, b) => c[b] - c[a] || (a < b ? -1 : 1))+ return Object.keys(c).sort((a, b) => c[b] - c[a] || (a < b ? -1 : 1)).concat(ACCESSORIES)})()// Body weight is never gated by a profile — no gym or home setup can take it away from you,// and every profile should be able to see bodyweight exercises regardless of what's checked.+// Only the accessory an exercise needs (a bar, a bench) can still gate it.const ALWAYS_AVAILABLE = 'body weight'export function activeProfile(S) {@@ -25,11 +45,14 @@ export function activeProfile(S) {export function exAvailable(S, ex) {const p = activeProfile(S)if (!p) return true- if (!ex.eq || ex.eq === ALWAYS_AVAILABLE) return true- // Equipment no profile can tick (an imported exercise's "custom") would hide the user's own- // exercise under every profile, with no way to bring it back. It stays, like body weight.- if (!ALL_EQUIPMENT.includes(ex.eq)) return true- return (p.equipment || []).includes(ex.eq)+ const have = p.equipment || []+ if (ex.eq && ex.eq !== ALWAYS_AVAILABLE) {+ // Equipment no profile can tick (an imported exercise's "custom") would hide the user's own+ // exercise under every profile, with no way to bring it back. It stays, like body weight.+ if (!ALL_EQUIPMENT.includes(ex.eq)) return true+ if (!have.includes(ex.eq)) return false+ }+ return accessoriesOf(ex).every(a => have.includes(a))}export function newProfile(name) {diff --git a/frontend/src/lib/equipment.test.js b/frontend/src/lib/equipment.test.jsindex 679b79d0e..c3868c26a 100644--- a/frontend/src/lib/equipment.test.js+++ b/frontend/src/lib/equipment.test.js@@ -1,5 +1,6 @@import { describe, expect, test } from 'vitest'-import { exAvailable, ALL_EQUIPMENT } from './equipment.js'+import { exAvailable, 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// any active profile hid it from the Library, the picker and the muscle explorer for good.@@ -25,3 +26,54 @@ describe('exAvailable', () => {expect(exAvailable({ ...S, equipFilterOn: false }, { eq: 'barbell' })).toBe(true)})})++// "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', () => {+ const ex = (n, eq) => ({ n, eq })+ const profile = equipment => ({ equipFilterOn: true, activeEquipId: 'p', equipProfiles: [{ id: 'p', name: 'P', equipment }] })++ test('are read off the exercise name, whatever its equipment tag says', () => {+ expect(accessoriesOf(ex('dumbbell bench press', 'dumbbell'))).toEqual(['bench'])+ expect(accessoriesOf(ex('dumbbell incline curl', 'dumbbell'))).toEqual(['bench'])+ expect(accessoriesOf(ex('decline sit-up', 'body weight'))).toEqual(['bench'])+ expect(accessoriesOf(ex('chin-up', 'body weight'))).toEqual(['pull-up bar'])+ expect(accessoriesOf(ex('hanging leg raise', 'body weight'))).toEqual(['pull-up bar'])+ })++ test('exercises that name neither need neither', () => {+ expect(accessoriesOf(ex('dumbbell squat', 'dumbbell'))).toEqual([])+ expect(accessoriesOf(ex('push-up', 'body weight'))).toEqual([])+ expect(accessoriesOf({ eq: 'dumbbell' })).toEqual([])+ })++ test('machines with their own bench or bar are left alone', () => {+ expect(accessoriesOf(ex('lever incline chest press', 'leverage machine'))).toEqual([])+ expect(accessoriesOf(ex('assisted pull-up', 'assisted'))).toEqual([])+ })++ test('only ever name a listed accessory', () => {+ for (const e of Object.values(EXIDX)) for (const a of accessoriesOf(e)) expect(ACCESSORIES).toContain(a)+ })++ test('both are in the profile checklist', () => {+ for (const a of ACCESSORIES) expect(ALL_EQUIPMENT).toContain(a)+ })++ test('the dumbbell and the bench together unlock a bench press', () => {+ const press = ex('dumbbell bench press', 'dumbbell')+ expect(exAvailable(profile(['dumbbell']), press)).toBe(false)+ expect(exAvailable(profile(['bench']), press)).toBe(false)+ expect(exAvailable(profile(['dumbbell', 'bench']), press)).toBe(true)+ })++ test('an empty profile keeps plain body weight but loses what needs a bar', () => {+ expect(exAvailable(profile([]), ex('push-up', 'body weight'))).toBe(true)+ expect(exAvailable(profile([]), ex('chin-up', 'body weight'))).toBe(false)+ expect(exAvailable(profile(['pull-up bar']), ex('chin-up', 'body weight'))).toBe(true)+ })++ test('an imported custom exercise stays visible even if its name says bench', () => {+ expect(exAvailable(profile([]), { id: 'c', n: 'my bench thing', eq: 'custom', custom: true })).toBe(true)+ })+})diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.jsindex b92f6745e..7d2e33775 100644--- a/frontend/src/locales/ar.js+++ b/frontend/src/locales/ar.js@@ -363,6 +363,7 @@ export default {'Equipment': 'المعدات','Recovery': 'التعافي','Any equipment': 'أي معدات',+ 'bench': 'مقعد', 'pull-up bar': 'بار العقلة','assisted': 'مدعوم','band': 'شريط','barbell': 'بار',@@ -682,7 +683,7 @@ export default {'New equipment profile': 'ملف معدات جديد','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'سمِّه باسم مكان تدريبك (مثل «المنزل» أو «النادي»)، ثم حدد ما لديك فيه.','Profile name': 'اسم الملف',- 'Body-weight exercises are always available, in every profile.': 'تمارين وزن الجسم متاحة دائمًا في كل الملفات.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'تمارين وزن الجسم متاحة دائمًا، ما لم تتطلب بار عقلة أو مقعدًا.','{0} of {1} exercises need equipment outside "{2}"': '{0} من {1} تمارين تحتاج معدات خارج «{2}»','Needs {0}, which isn’t in your active profile': 'تحتاج {0}، وهي غير موجودة في ملفك النشط','Filter by equipment': 'التصفية حسب المعدات',diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.jsindex 7fdb20e04..8b714ebd2 100644--- a/frontend/src/locales/de.js+++ b/frontend/src/locales/de.js@@ -521,6 +521,7 @@ export default {'Equipment': 'Geräte','Recovery': 'Erholung','Any equipment': 'Alle Geräte',+ 'bench': 'Bank', 'pull-up bar': 'Klimmzugstange','assisted': 'assistiert', 'band': 'Band', 'barbell': 'Langhantel', 'body weight': 'Körpergewicht','bosu ball': 'Bosu-Ball', 'cable': 'Kabelzug', 'dumbbell': 'Kurzhantel','elliptical machine': 'Crosstrainer', 'ez barbell': 'SZ-Stange', 'hammer': 'Hammer',@@ -999,7 +1000,7 @@ export default {'New equipment profile': 'Neues Geräteprofil','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Benenne es nach deinem Trainingsort (z. B. „Zuhause“ oder „Gym“) und hake dann ab, was du dort hast.','Profile name': 'Profilname',- 'Body-weight exercises are always available, in every profile.': 'Körpergewichtsübungen sind immer verfügbar, in jedem Profil.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Körpergewichtsübungen sind immer verfügbar, außer sie brauchen eine Klimmzugstange oder eine Bank.','{0} of {1} exercises need equipment outside "{2}"': '{0} von {1} Übungen brauchen Geräte außerhalb von „{2}“','Needs {0}, which isn’t in your active profile': 'Braucht {0}, das nicht in deinem aktiven Profil ist','Filter by equipment': 'Nach Geräten filtern',diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.jsindex 592a333e1..4384e2c0f 100644--- a/frontend/src/locales/es.js+++ b/frontend/src/locales/es.js@@ -503,6 +503,7 @@ export default {'Equipment': 'Equipo','Recovery': 'Recuperación','Any equipment': 'Cualquier equipo',+ 'bench': 'banco', 'pull-up bar': 'barra de dominadas','assisted': 'asistido', 'band': 'banda', 'barbell': 'barra', 'body weight': 'peso corporal','bosu ball': 'bosu', 'cable': 'polea', 'dumbbell': 'mancuerna','elliptical machine': 'elíptica', 'ez barbell': 'barra EZ', 'hammer': 'martillo',@@ -981,7 +982,7 @@ export default {'New equipment profile': 'Nuevo perfil de equipo','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Ponle el nombre del sitio donde entrenas (como «Casa» o «Gimnasio») y marca lo que tienes allí.','Profile name': 'Nombre del perfil',- 'Body-weight exercises are always available, in every profile.': 'Los ejercicios con peso corporal están siempre disponibles, en todos los perfiles.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Los ejercicios con peso corporal siempre están disponibles, salvo que necesiten una barra de dominadas o un banco.','{0} of {1} exercises need equipment outside "{2}"': '{0} de {1} ejercicios necesitan equipo fuera de «{2}»','Needs {0}, which isn’t in your active profile': 'Necesita {0}, que no está en tu perfil activo','Filter by equipment': 'Filtrar por equipo',diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.jsindex a6c2a3d84..0de7cba4c 100644--- a/frontend/src/locales/fr.js+++ b/frontend/src/locales/fr.js@@ -503,6 +503,7 @@ export default {'Equipment': 'Équipement','Recovery': 'Récupération','Any equipment': 'Tout équipement',+ 'bench': 'banc', 'pull-up bar': 'barre de traction','assisted': 'assisté', 'band': 'élastique', 'barbell': 'barre', 'body weight': 'poids du corps','bosu ball': 'bosu', 'cable': 'poulie', 'dumbbell': 'haltère','elliptical machine': 'vélo elliptique', 'ez barbell': 'barre EZ', 'hammer': 'marteau',@@ -981,7 +982,7 @@ export default {'New equipment profile': 'Nouveau profil d’équipement','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Nomme-le d’après ton lieu d’entraînement (p. ex. « Maison » ou « Salle »), puis coche ce que tu y as.','Profile name': 'Nom du profil',- 'Body-weight exercises are always available, in every profile.': 'Les exercices au poids du corps sont toujours disponibles, dans tous les profils.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Les exercices au poids du corps sont toujours disponibles, sauf s\'ils demandent une barre de traction ou un banc.','{0} of {1} exercises need equipment outside "{2}"': '{0} exercices sur {1} nécessitent un équipement hors de « {2} »','Needs {0}, which isn’t in your active profile': 'Nécessite {0}, absent de ton profil actif','Filter by equipment': 'Filtrer par équipement',diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.jsindex 8c05a4933..79be789cd 100644--- a/frontend/src/locales/hi.js+++ b/frontend/src/locales/hi.js@@ -503,6 +503,7 @@ export default {'Equipment': 'उपकरण','Recovery': 'रिकवरी','Any equipment': 'कोई भी उपकरण',+ 'bench': 'बेंच', 'pull-up bar': 'पुल-अप बार','assisted': 'सहायता प्राप्त', 'band': 'बैंड', 'barbell': 'बारबेल', 'body weight': 'शरीर का वज़न','bosu ball': 'बोसु बॉल', 'cable': 'केबल', 'dumbbell': 'डम्बल','elliptical machine': 'एलिप्टिकल मशीन', 'ez barbell': 'EZ बारबेल', 'hammer': 'हैमर',@@ -981,7 +982,7 @@ export default {'New equipment profile': 'नई उपकरण प्रोफ़ाइल','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'जहाँ आप कसरत करते हैं उसी के नाम पर रखें (जैसे "घर" या "जिम"), फिर वहाँ जो है उस पर टिक करें।','Profile name': 'प्रोफ़ाइल का नाम',- 'Body-weight exercises are always available, in every profile.': 'शरीर के वज़न वाली कसरतें हर प्रोफ़ाइल में हमेशा उपलब्ध रहती हैं।',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'बॉडीवेट व्यायाम हमेशा उपलब्ध रहते हैं, जब तक उन्हें पुल-अप बार या बेंच की ज़रूरत न हो।','{0} of {1} exercises need equipment outside "{2}"': '{1} में से {0} कसरतों को “{2}” के बाहर के उपकरण चाहिए','Needs {0}, which isn’t in your active profile': '{0} चाहिए, जो आपकी सक्रिय प्रोफ़ाइल में नहीं है','Filter by equipment': 'उपकरण से फ़िल्टर करें',diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.jsindex 3b8a3698f..0c90ed78c 100644--- a/frontend/src/locales/hu.js+++ b/frontend/src/locales/hu.js@@ -506,6 +506,7 @@ export default {'Equipment': 'Eszköz','Recovery': 'Regeneráció','Any equipment': 'Bármilyen eszköz',+ 'bench': 'pad', 'pull-up bar': 'húzódzkodórúd','assisted': 'segített', 'band': 'gumiszalag', 'barbell': 'rúd', 'body weight': 'testsúly','bosu ball': 'bosu labda', 'cable': 'kábel', 'dumbbell': 'súlyzó','elliptical machine': 'elliptikus tréner', 'ez barbell': 'EZ-rúd', 'hammer': 'kalapácsfogás',@@ -859,7 +860,7 @@ export default {'Filter by equipment': 'Szűrés eszköz szerint','Needs {0}, which isn’t in your active profile': '{0} szükséges, ami nincs az aktív profilodban','{0} of {1} exercises need equipment outside "{2}"': '{0}/{1} gyakorlathoz kell eszköz a(z) „{2}” profilon kívülről',- 'Body-weight exercises are always available, in every profile.': 'A testsúlyos gyakorlatok minden profilban mindig elérhetők.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'A testsúlyos gyakorlatok mindig elérhetők, hacsak nem kell hozzájuk húzódzkodórúd vagy pad.','Profile name': 'Profil neve','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Nevezd el arról a helyről, ahol edzel (pl. „Otthon” vagy „Terem”), majd pipáld ki, ami ott megvan.','New equipment profile': 'Új eszközprofil',diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.jsindex 81f392217..79c2e6970 100644--- a/frontend/src/locales/it.js+++ b/frontend/src/locales/it.js@@ -503,6 +503,7 @@ export default {'Equipment': 'Attrezzi','Recovery': 'Recupero','Any equipment': 'Qualsiasi attrezzo',+ 'bench': 'panca', 'pull-up bar': 'sbarra per trazioni','assisted': 'assistito', 'band': 'elastico', 'barbell': 'bilanciere', 'body weight': 'corpo libero','bosu ball': 'bosu', 'cable': 'cavo', 'dumbbell': 'manubrio','elliptical machine': 'ellittica', 'ez barbell': 'bilanciere EZ', 'hammer': 'martello',@@ -981,7 +982,7 @@ export default {'New equipment profile': 'Nuovo profilo attrezzi','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Chiamalo come il posto dove ti alleni (ad es. “Casa” o “Palestra”), poi spunta ciò che hai lì.','Profile name': 'Nome del profilo',- 'Body-weight exercises are always available, in every profile.': 'Gli esercizi a corpo libero sono sempre disponibili, in ogni profilo.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Gli esercizi a corpo libero sono sempre disponibili, a meno che non servano una sbarra per trazioni o una panca.','{0} of {1} exercises need equipment outside "{2}"': '{0} di {1} esercizi richiedono attrezzi fuori da “{2}”','Needs {0}, which isn’t in your active profile': 'Richiede {0}, che non è nel profilo attivo','Filter by equipment': 'Filtra per attrezzi',diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.jsindex fc4f356c8..66c5e701c 100644--- a/frontend/src/locales/ko.js+++ b/frontend/src/locales/ko.js@@ -503,6 +503,7 @@ export default {'Equipment': '장비','Recovery': '회복','Any equipment': '모든 장비',+ 'bench': '벤치', 'pull-up bar': '턱걸이 바','assisted': '보조', 'band': '밴드', 'barbell': '바벨', 'body weight': '맨몸','bosu ball': '보수볼', 'cable': '케이블', 'dumbbell': '덤벨','elliptical machine': '일립티컬', 'ez barbell': 'EZ바', 'hammer': '해머',@@ -981,7 +982,7 @@ export default {'New equipment profile': '새 장비 프로필','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': '운동하는 장소 이름을 붙이고(예: ‘집’ 또는 ‘헬스장’), 그곳에 있는 장비를 체크하세요.','Profile name': '프로필 이름',- 'Body-weight exercises are always available, in every profile.': '맨몸 운동은 모든 프로필에서 항상 사용할 수 있습니다.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': '맨몸 운동은 턱걸이 바나 벤치가 필요하지 않은 한 항상 사용할 수 있습니다.','{0} of {1} exercises need equipment outside "{2}"': '{1}개 운동 중 {0}개가 ‘{2}’ 외의 장비를 필요로 합니다','Needs {0}, which isn’t in your active profile': '{0} 필요, 활성 프로필에 없음','Filter by equipment': '장비로 필터',diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.jsindex 92579d18f..06f29ecd3 100644--- a/frontend/src/locales/pl.js+++ b/frontend/src/locales/pl.js@@ -503,6 +503,7 @@ export default {'Equipment': 'Sprzęt','Recovery': 'Regeneracja','Any equipment': 'Dowolny sprzęt',+ 'bench': 'ławka', 'pull-up bar': 'drążek','assisted': 'z asystą', 'band': 'guma', 'barbell': 'sztanga', 'body weight': 'masa ciała','bosu ball': 'bosu', 'cable': 'wyciąg', 'dumbbell': 'hantla','elliptical machine': 'orbitrek', 'ez barbell': 'sztanga łamana', 'hammer': 'młot',@@ -981,7 +982,7 @@ export default {'New equipment profile': 'Nowy profil sprzętu','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Nazwij go tak jak miejsce, w którym trenujesz (np. „Dom” lub „Siłownia”), a potem zaznacz, co tam masz.','Profile name': 'Nazwa profilu',- 'Body-weight exercises are always available, in every profile.': 'Ćwiczenia z masą własnego ciała są zawsze dostępne, w każdym profilu.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Ćwiczenia z masą ciała są zawsze dostępne, chyba że potrzebują drążka lub ławki.','{0} of {1} exercises need equipment outside "{2}"': '{0} z {1} ćwiczeń wymaga sprzętu spoza „{2}”','Needs {0}, which isn’t in your active profile': 'Wymaga: {0}, a tego nie ma w aktywnym profilu','Filter by equipment': 'Filtruj według sprzętu',diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.jsindex c2c52d5f7..dae56f7a8 100644--- a/frontend/src/locales/pt-BR.js+++ b/frontend/src/locales/pt-BR.js@@ -446,7 +446,9 @@ export const PT_BR_OVERRIDES = {'New equipment profile': 'Novo perfil de equipamentos','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Dê o nome do lugar onde você treina (tipo “Casa” ou “Academia”) e marque o que tem por lá.','Profile name': 'Nome do perfil',- 'Body-weight exercises are always available, in every profile.': 'Exercícios com o peso do corpo estão sempre disponíveis, em todos os perfis.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Os exercícios com o peso do corpo estão sempre disponíveis, a não ser que precisem de uma barra fixa ou de um banco.',+ 'bench': 'banco',+ 'pull-up bar': 'barra fixa','{0} of {1} exercises need equipment outside "{2}"': '{0} de {1} exercícios precisam de equipamentos fora de “{2}”','Needs {0}, which isn’t in your active profile': 'Precisa de {0}, que não está no seu perfil ativo','Filter by equipment': 'Filtrar por equipamento',diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.jsindex ad06595ac..66abd704d 100644--- a/frontend/src/locales/pt.js+++ b/frontend/src/locales/pt.js@@ -503,6 +503,7 @@ export default {'Equipment': 'Equipamento','Recovery': 'Recuperação','Any equipment': 'Qualquer equipamento',+ 'bench': 'banco', 'pull-up bar': 'barra de elevações','assisted': 'assistido', 'band': 'banda', 'barbell': 'barra', 'body weight': 'peso corporal','bosu ball': 'bosu', 'cable': 'cabo', 'dumbbell': 'haltere','elliptical machine': 'elíptica', 'ez barbell': 'barra EZ', 'hammer': 'martelo',@@ -981,7 +982,7 @@ export default {'New equipment profile': 'Novo perfil de equipamento','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Dá-lhe o nome do sítio onde treinas (como «Casa» ou «Ginásio») e marca o que tens lá.','Profile name': 'Nome do perfil',- 'Body-weight exercises are always available, in every profile.': 'Os exercícios com o peso do corpo estão sempre disponíveis, em todos os perfis.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Os exercícios com o peso do corpo estão sempre disponíveis, a não ser que precisem de uma barra de elevações ou de um banco.','{0} of {1} exercises need equipment outside "{2}"': '{0} de {1} exercícios precisam de equipamento fora de «{2}»','Needs {0}, which isn’t in your active profile': 'Precisa de {0}, que não está no teu perfil ativo','Filter by equipment': 'Filtrar por equipamento',diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.jsindex 576e5cbe6..7517e0d5a 100644--- a/frontend/src/locales/ru.js+++ b/frontend/src/locales/ru.js@@ -493,6 +493,7 @@ export default {'Equipment': 'Инвентарь','Recovery': 'Восстановление','Any equipment': 'Любой инвентарь',+ 'bench': 'скамья', 'pull-up bar': 'турник','assisted': 'с поддержкой', 'band': 'лента', 'barbell': 'штанга', 'body weight': 'свой вес','bosu ball': 'босу', 'cable': 'блок', 'dumbbell': 'гантель','elliptical machine': 'эллипсоид', 'ez barbell': 'EZ-гриф', 'hammer': 'молот',@@ -961,7 +962,7 @@ export default {'New equipment profile': 'Новый профиль инвентаря','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Назови его по месту тренировок (например, «Дом» или «Зал») и отметь, что там есть.','Profile name': 'Название профиля',- 'Body-weight exercises are always available, in every profile.': 'Упражнения с собственным весом доступны всегда, в любом профиле.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Упражнения с собственным весом доступны всегда, если им не нужны турник или скамья.','{0} of {1} exercises need equipment outside "{2}"': '{0} из {1} упражнений требуют инвентаря вне «{2}»','Needs {0}, which isn’t in your active profile': 'Нужен инвентарь {0}, которого нет в активном профиле','Filter by equipment': 'Фильтровать по инвентарю',diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.jsindex 1031f9448..7c173d74e 100644--- a/frontend/src/locales/th.js+++ b/frontend/src/locales/th.js@@ -506,6 +506,7 @@ export default {'Equipment': 'อุปกรณ์','Recovery': 'การฟื้นตัว','Any equipment': 'อุปกรณ์ใดก็ได้',+ 'bench': 'ม้านั่ง', 'pull-up bar': 'บาร์โหน','assisted': 'มีตัวช่วย', 'band': 'ยางยืด', 'barbell': 'บาร์เบล', 'body weight': 'น้ำหนักตัว','bosu ball': 'บอลโบซู', 'cable': 'สายเคเบิล', 'dumbbell': 'ดัมเบล','elliptical machine': 'เครื่องเอลลิปติคัล', 'ez barbell': 'อีซีบาร์', 'hammer': 'แฮมเมอร์',@@ -818,7 +819,7 @@ export default {'New equipment profile': 'โปรไฟล์อุปกรณ์ใหม่','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'ตั้งชื่อตามที่ที่คุณฝึก (เช่น "บ้าน" หรือ "ยิม") แล้วติ๊กอุปกรณ์ที่มีอยู่ที่นั่น','Profile name': 'ชื่อโปรไฟล์',- 'Body-weight exercises are always available, in every profile.': 'ท่าที่ใช้น้ำหนักตัวจะพร้อมใช้งานเสมอในทุกโปรไฟล์',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'ท่าใช้น้ำหนักตัวใช้ได้เสมอ เว้นแต่ต้องใช้บาร์โหนหรือม้านั่ง','{0} of {1} exercises need equipment outside "{2}"': '{0} จาก {1} ท่าต้องใช้อุปกรณ์นอกเหนือจาก "{2}"','Needs {0}, which isn’t in your active profile': 'ต้องใช้ {0} ซึ่งไม่มีในโปรไฟล์ที่ใช้งานอยู่','Filter by equipment': 'กรองตามอุปกรณ์',diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.jsindex d6fa067cf..dee21c1d0 100644--- a/frontend/src/locales/tr.js+++ b/frontend/src/locales/tr.js@@ -503,6 +503,7 @@ export default {'Equipment': 'Ekipman','Recovery': 'Toparlanma','Any equipment': 'Tüm ekipmanlar',+ 'bench': 'sehpa', 'pull-up bar': 'barfiks barı','assisted': 'destekli', 'band': 'bant', 'barbell': 'halter', 'body weight': 'vücut ağırlığı','bosu ball': 'bosu topu', 'cable': 'kablo', 'dumbbell': 'dambıl','elliptical machine': 'eliptik bisiklet', 'ez barbell': 'EZ bar', 'hammer': 'çekiç',@@ -981,7 +982,7 @@ export default {'New equipment profile': 'Yeni ekipman profili','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Antrenman yaptığın yerin adını ver (“Ev” ya da “Spor salonu” gibi), sonra orada neyin olduğunu işaretle.','Profile name': 'Profil adı',- 'Body-weight exercises are always available, in every profile.': 'Vücut ağırlığı hareketleri her profilde her zaman kullanılabilir.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Vücut ağırlığı egzersizleri, bir barfiks barı veya sehpa gerektirmedikçe her zaman kullanılabilir.','{0} of {1} exercises need equipment outside "{2}"': '{1} hareketten {0} tanesi “{2}” dışında ekipman gerektiriyor','Needs {0}, which isn’t in your active profile': '{0} gerekiyor, o da aktif profilinde yok','Filter by equipment': 'Ekipmana göre filtrele',diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.jsindex a4a775ede..7b7bea1e0 100644--- a/frontend/src/locales/uk.js+++ b/frontend/src/locales/uk.js@@ -340,6 +340,7 @@ export default {'Equipment': 'Інвентар','Recovery': 'Відновлення','Any equipment': 'Будь-який інвентар',+ 'bench': 'лава', 'pull-up bar': 'турнік','assisted': 'з підтримкою', 'band': 'стрічка', 'barbell': 'штанга', 'body weight': 'своя вага','bosu ball': 'босу', 'cable': 'блок', 'dumbbell': 'гантель','elliptical machine': 'еліптичний тренажер', 'ez barbell': 'EZ-гриф', 'hammer': 'молот',@@ -791,7 +792,7 @@ export default {'New equipment profile': 'Новий профіль інвентарю','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': 'Назви його за місцем тренувань (наприклад, «Дім» або «Зал») і познач, що там є.','Profile name': 'Назва профілю',- 'Body-weight exercises are always available, in every profile.': 'Вправи з власною вагою доступні завжди, у будь-якому профілі.',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': 'Вправи з власною вагою доступні завжди, якщо їм не потрібні турнік або лава.','{0} of {1} exercises need equipment outside "{2}"': '{0} з {1} вправ потребують інвентарю поза «{2}»','Needs {0}, which isn’t in your active profile': 'Потрібен інвентар {0}, якого немає в активному профілі','Filter by equipment': 'Фільтрувати за інвентарем',diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.jsindex 0ab17d0bf..26a2dedc0 100644--- a/frontend/src/locales/zh-TW.js+++ b/frontend/src/locales/zh-TW.js@@ -498,6 +498,7 @@ export default {'Equipment': '器材','Recovery': '恢復狀態','Any equipment': '不限器材',+ 'bench': '臥推凳', 'pull-up bar': '單槓','assisted': '機械輔助', 'band': '彈力帶', 'barbell': '槓鈴', 'body weight': '自身體重 / 徒手','bosu ball': 'BOSU 半圓平衡球', 'cable': '滑輪纜繩', 'dumbbell': '啞鈴','elliptical machine': '滑步機', 'ez barbell': 'W槓 / 曲槓', 'hammer': '鐵鎚',@@ -973,7 +974,7 @@ export default {'New equipment profile': '新增器材設定檔','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': '依訓練場所命名(例如「家裡」或「健身房」),然後勾選那裡有的器材。','Profile name': '設定檔名稱',- 'Body-weight exercises are always available, in every profile.': '徒手動作在任何器材設定檔中皆隨時可用。',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': '徒手動作永遠可用,除非需要單槓或臥推凳。','{0} of {1} exercises need equipment outside "{2}"': '{1} 個動作中有 {0} 個需要「{2}」以外的器材','Needs {0}, which isn’t in your active profile': '需要 {0},但它不在你目前的設定檔中','Filter by equipment': '依器材篩選',diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.jsindex 07765586e..e526a41d5 100644--- a/frontend/src/locales/zh.js+++ b/frontend/src/locales/zh.js@@ -503,6 +503,7 @@ export default {'Equipment': '器械','Recovery': '恢复','Any equipment': '所有器械',+ 'bench': '卧推凳', 'pull-up bar': '引体向上杆','assisted': '辅助', 'band': '弹力带', 'barbell': '杠铃', 'body weight': '自重','bosu ball': '波速球', 'cable': '绳索', 'dumbbell': '哑铃','elliptical machine': '椭圆机', 'ez barbell': '曲杆杠铃', 'hammer': '锤',@@ -981,7 +982,7 @@ export default {'New equipment profile': '新建器械配置','Name it after where you train (like "Home" or "Gym"), then tick what you’ve got there.': '用你训练的地点命名(比如“家里”或“健身房”),然后勾选你在那里有的器械。','Profile name': '配置名称',- 'Body-weight exercises are always available, in every profile.': '自重动作在每个配置中都始终可用。',+ 'Body-weight exercises are always available, unless they need a pull-up bar or a bench.': '自重动作始终可用,除非需要引体向上杆或卧推凳。','{0} of {1} exercises need equipment outside "{2}"': '{1} 个动作中有 {0} 个需要“{2}”之外的器械','Needs {0}, which isn’t in your active profile': '需要{0},但它不在你的当前配置中','Filter by equipment': '按器械筛选',diff --git a/frontend/src/sheets.jsx b/frontend/src/sheets.jsxindex e5e4a6928..447c6c6c6 100644--- a/frontend/src/sheets.jsx+++ b/frontend/src/sheets.jsx@@ -1381,7 +1381,7 @@ function EquipmentProfileSheet({ profile, close }) {))}</div><div className="dim small" style={{ marginTop: 10 }}>- {t('Body-weight exercises are always available, in every profile.')}+ {t('Body-weight exercises are always available, unless they need a pull-up bar or a bench.')}</div><div style={{ height: 14 }} /><Button variant="primary" onClick={save}>{t('Save')}</Button></>