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.

Progress photos: its strings in every pack, counts through tn(), and one file on two workouts is two photos

Duarte Santos24c8c8ce20f7
diff --git a/frontend/src/lib/pt-br-locale.test.js b/frontend/src/lib/pt-br-locale.test.js
index 78383cebf..d8e70f1a1 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('6f95ac68b50839ada03e02db9a6b018b2d84e6c053c0a567fdee32f8a43b49cc')
+ expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('6589d993b090e6cb87f418166053aacfda52d1e009d15f08408e096bfc948d57')
})
test('does not leak European Portuguese UI terms', () => {
diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.js
index f74ec05c7..563f40bcf 100644
--- a/frontend/src/locales/ar.js
+++ b/frontend/src/locales/ar.js
@@ -1776,4 +1776,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} مجموعة تصبح {1}: واحدة لكل جانب، مع ثبات {2} ث في كل مرة.',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} مجموعات تصبح {1}: واحدة لكل جانب، مع ثبات {2} ث في كل مرة.',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'للبلانك الجانبي والثبات بذراع واحدة وما شابه — يدرّب كل جانب على حدة.',
+ 'Add a photo to today': 'أضف صورة إلى اليوم',
+ 'Compare photos': 'قارن الصور',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'كل صورة احتفظت بها مع تمرين، مرتبة حسب التاريخ — مع شريط قبل/بعد.',
+ 'Log today’s workout to add a photo': 'سجّل تمرين اليوم لإضافة صورة',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'لا توجد صور تقدّم بعد — يضيف الزر أعلاه صورة إلى اليوم عندما يكون لليوم تمرين مسجّل.',
+ 'Photo': 'صورة',
+ 'Photo added': 'تمت إضافة الصورة',
+ 'Pick two photos to compare.': 'اختر صورتين للمقارنة.',
+ 'Progress photos': 'صور التقدّم',
+ 'Ready — open the comparison.': 'جاهز — افتح المقارنة.',
+ 'Same day': 'اليوم نفسه',
+ '{0} day apart': 'بفارق {0} يوم',
+ '{0} days apart': 'بفارق {0} أيام',
+ '{0} photo': '{0} صورة',
+ '{0} photos': '{0} صور',
}
diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.js
index 64533e522..ae215373b 100644
--- a/frontend/src/locales/de.js
+++ b/frontend/src/locales/de.js
@@ -1743,4 +1743,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': 'Aus {0} Satz werden {1}: einer pro Seite, jedes Mal {2} s gehalten.',
'{0} sets become {1}: one on each side, {2}s held every time.': 'Aus {0} Sätzen werden {1}: einer pro Seite, jedes Mal {2} s gehalten.',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Für Seitstütz, einarmiges Halten und Ähnliches — trainiert jede Seite für sich.',
+ 'Add a photo to today': 'Foto zu heute hinzufügen',
+ 'Compare photos': 'Fotos vergleichen',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Jedes Foto, das du zu einem Training gespeichert hast, nach Datum geordnet — mit Vorher-nachher-Schieberegler.',
+ 'Log today’s workout to add a photo': 'Trag das heutige Training ein, um ein Foto hinzuzufügen',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Noch keine Fortschrittsfotos — die Schaltfläche oben fügt eins zu heute hinzu, sobald heute ein Training eingetragen ist.',
+ 'Photo': 'Foto',
+ 'Photo added': 'Foto hinzugefügt',
+ 'Pick two photos to compare.': 'Wähle zwei Fotos zum Vergleichen.',
+ 'Progress photos': 'Fortschrittsfotos',
+ 'Ready — open the comparison.': 'Bereit — öffne den Vergleich.',
+ 'Same day': 'Am selben Tag',
+ '{0} day apart': '{0} Tag dazwischen',
+ '{0} days apart': '{0} Tage dazwischen',
+ '{0} photo': '{0} Foto',
+ '{0} photos': '{0} Fotos',
}
diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.js
index 41193b7c4..b1460326a 100644
--- a/frontend/src/locales/es.js
+++ b/frontend/src/locales/es.js
@@ -1723,4 +1723,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} serie se convierte en {1}: una por lado, {2} s de sostenimiento cada vez.',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} series se convierten en {1}: una por lado, {2} s de sostenimiento cada vez.',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Para una plancha lateral, un agarre a una mano y similares — entrena cada lado por separado.',
+ 'Add a photo to today': 'Añadir una foto a hoy',
+ 'Compare photos': 'Comparar fotos',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Todas las fotos que guardaste con un entrenamiento, ordenadas por fecha — y un deslizador de antes/después.',
+ 'Log today’s workout to add a photo': 'Registra el entrenamiento de hoy para añadir una foto',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Aún no hay fotos de progreso — el botón de arriba añade una a hoy, cuando hoy tenga un entrenamiento registrado.',
+ 'Photo': 'Foto',
+ 'Photo added': 'Foto añadida',
+ 'Pick two photos to compare.': 'Elige dos fotos para comparar.',
+ 'Progress photos': 'Fotos de progreso',
+ 'Ready — open the comparison.': 'Listo — abre la comparación.',
+ 'Same day': 'El mismo día',
+ '{0} day apart': '{0} día de diferencia',
+ '{0} days apart': '{0} días de diferencia',
+ '{0} photo': '{0} foto',
+ '{0} photos': '{0} fotos',
}
diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.js
index 2450c8c93..da8a52769 100644
--- a/frontend/src/locales/fr.js
+++ b/frontend/src/locales/fr.js
@@ -1723,4 +1723,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} série devient {1} : une de chaque côté, {2} s de maintien à chaque fois.',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} séries deviennent {1} : une de chaque côté, {2} s de maintien à chaque fois.',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Pour une planche latérale, un maintien à un bras et autres — chaque côté travaille seul.',
+ 'Add a photo to today': 'Ajouter une photo à aujourd’hui',
+ 'Compare photos': 'Comparer les photos',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Chaque photo gardée avec une séance, classée par date — et un curseur avant/après.',
+ 'Log today’s workout to add a photo': 'Enregistre la séance du jour pour ajouter une photo',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Pas encore de photo de progression — le bouton ci-dessus en ajoute une à aujourd’hui, dès qu’une séance y est enregistrée.',
+ 'Photo': 'Photo',
+ 'Photo added': 'Photo ajoutée',
+ 'Pick two photos to compare.': 'Choisis deux photos à comparer.',
+ 'Progress photos': 'Photos de progression',
+ 'Ready — open the comparison.': 'Prêt — ouvre la comparaison.',
+ 'Same day': 'Le même jour',
+ '{0} day apart': '{0} jour d’écart',
+ '{0} days apart': '{0} jours d’écart',
+ '{0} photo': '{0} photo',
+ '{0} photos': '{0} photos',
}
diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.js
index 0fadb1a51..8101ccd07 100644
--- a/frontend/src/locales/hi.js
+++ b/frontend/src/locales/hi.js
@@ -1723,4 +1723,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} सेट {1} बन जाता है: हर तरफ़ एक, हर बार {2} सेकंड होल्ड।',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} सेट {1} बन जाते हैं: हर तरफ़ एक, हर बार {2} सेकंड होल्ड।',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'साइड प्लैंक, एक हाथ से होल्ड और ऐसे व्यायामों के लिए — हर तरफ़ को अलग से ट्रेन करता है।',
+ 'Add a photo to today': 'आज में फ़ोटो जोड़ें',
+ 'Compare photos': 'फ़ोटो की तुलना करें',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'वर्कआउट के साथ रखी हर फ़ोटो, तारीख़ के क्रम में — और पहले/बाद का स्लाइडर।',
+ 'Log today’s workout to add a photo': 'फ़ोटो जोड़ने के लिए आज का वर्कआउट लॉग करें',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'अभी कोई प्रोग्रेस फ़ोटो नहीं — आज वर्कआउट लॉग होने पर ऊपर का बटन आज में एक फ़ोटो जोड़ देता है।',
+ 'Photo': 'फ़ोटो',
+ 'Photo added': 'फ़ोटो जोड़ी गई',
+ 'Pick two photos to compare.': 'तुलना के लिए दो फ़ोटो चुनें।',
+ 'Progress photos': 'प्रोग्रेस फ़ोटो',
+ 'Ready — open the comparison.': 'तैयार — तुलना खोलें।',
+ 'Same day': 'उसी दिन',
+ '{0} day apart': '{0} दिन का अंतर',
+ '{0} days apart': '{0} दिन का अंतर',
+ '{0} photo': '{0} फ़ोटो',
+ '{0} photos': '{0} फ़ोटो',
}
diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.js
index 647d9d1a6..3807c2ac7 100644
--- a/frontend/src/locales/hu.js
+++ b/frontend/src/locales/hu.js
@@ -1726,4 +1726,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} sorozatból {1} lesz: oldalanként egy, minden alkalommal {2} mp tartás.',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} sorozatból {1} lesz: oldalanként egy, minden alkalommal {2} mp tartás.',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Oldalsó plankhoz, egykezes tartáshoz és hasonlókhoz — minden oldalt külön edz.',
+ 'Add a photo to today': 'Fotó hozzáadása a mai naphoz',
+ 'Compare photos': 'Fotók összehasonlítása',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Minden fotó, amit edzéshez mentettél, dátum szerint — és egy előtte/utána csúszka.',
+ 'Log today’s workout to add a photo': 'Rögzítsd a mai edzést, hogy fotót adhass hozzá',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Még nincs fejlődési fotó — a fenti gomb hozzáad egyet a mai naphoz, ha ma már van rögzített edzés.',
+ 'Photo': 'Fotó',
+ 'Photo added': 'Fotó hozzáadva',
+ 'Pick two photos to compare.': 'Válassz két fotót az összehasonlításhoz.',
+ 'Progress photos': 'Fejlődési fotók',
+ 'Ready — open the comparison.': 'Kész — nyisd meg az összehasonlítást.',
+ 'Same day': 'Ugyanazon a napon',
+ '{0} day apart': '{0} nap különbség',
+ '{0} days apart': '{0} nap különbség',
+ '{0} photo': '{0} fotó',
+ '{0} photos': '{0} fotó',
}
diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.js
index 1fdd756d1..9678767f3 100644
--- a/frontend/src/locales/it.js
+++ b/frontend/src/locales/it.js
@@ -1723,4 +1723,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} serie diventa {1}: una per lato, {2} s di tenuta ogni volta.',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} serie diventano {1}: una per lato, {2} s di tenuta ogni volta.',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Per plank laterale, tenute a un braccio e simili — allena ogni lato da solo.',
+ 'Add a photo to today': 'Aggiungi una foto a oggi',
+ 'Compare photos': 'Confronta foto',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Ogni foto salvata con un allenamento, in ordine di data — e un cursore prima/dopo.',
+ 'Log today’s workout to add a photo': 'Registra l’allenamento di oggi per aggiungere una foto',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Ancora nessuna foto dei progressi — il pulsante sopra ne aggiunge una a oggi, quando oggi c’è un allenamento registrato.',
+ 'Photo': 'Foto',
+ 'Photo added': 'Foto aggiunta',
+ 'Pick two photos to compare.': 'Scegli due foto da confrontare.',
+ 'Progress photos': 'Foto dei progressi',
+ 'Ready — open the comparison.': 'Pronto — apri il confronto.',
+ 'Same day': 'Stesso giorno',
+ '{0} day apart': '{0} giorno di distanza',
+ '{0} days apart': '{0} giorni di distanza',
+ '{0} photo': '{0} foto',
+ '{0} photos': '{0} foto',
}
diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.js
index b94f4e18b..03437bdca 100644
--- a/frontend/src/locales/ko.js
+++ b/frontend/src/locales/ko.js
@@ -1723,4 +1723,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0}세트가 {1}세트가 됩니다: 양쪽 각각 한 번씩, 매번 {2}초 유지.',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0}세트가 {1}세트가 됩니다: 양쪽 각각 한 번씩, 매번 {2}초 유지.',
'For a side plank, single-arm hold and the like — trains each side on its own.': '사이드 플랭크, 한 팔 버티기 등에 — 각 쪽을 따로 훈련합니다.',
+ 'Add a photo to today': '오늘에 사진 추가',
+ 'Compare photos': '사진 비교',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': '운동과 함께 저장한 모든 사진을 날짜순으로 — 비포/애프터 슬라이더와 함께.',
+ 'Log today’s workout to add a photo': '사진을 추가하려면 오늘 운동을 기록하세요',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': '아직 진행 사진이 없습니다 — 오늘 운동을 기록하면 위 버튼으로 오늘에 사진을 추가할 수 있습니다.',
+ 'Photo': '사진',
+ 'Photo added': '사진 추가됨',
+ 'Pick two photos to compare.': '비교할 사진 두 장을 고르세요.',
+ 'Progress photos': '진행 사진',
+ 'Ready — open the comparison.': '준비 완료 — 비교를 여세요.',
+ 'Same day': '같은 날',
+ '{0} day apart': '{0}일 차이',
+ '{0} days apart': '{0}일 차이',
+ '{0} photo': '사진 {0}장',
+ '{0} photos': '사진 {0}장',
}
diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.js
index fb8bd4c7a..4c6046226 100644
--- a/frontend/src/locales/pl.js
+++ b/frontend/src/locales/pl.js
@@ -1723,4 +1723,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} seria zmienia się w {1}: po jednej na każdą stronę, za każdym razem {2} s utrzymania.',
'{0} sets become {1}: one on each side, {2}s held every time.': { one: '{0} seria zmienia się w {1}: po jednej na każdą stronę, za każdym razem {2} s utrzymania.', few: '{0} serie zmieniają się w {1}: po jednej na każdą stronę, za każdym razem {2} s utrzymania.', many: '{0} serii zmienia się w {1}: po jednej na każdą stronę, za każdym razem {2} s utrzymania.' },
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Do deski bocznej, utrzymań jednorącz i podobnych — każda strona trenuje osobno.',
+ 'Add a photo to today': 'Dodaj zdjęcie do dzisiaj',
+ 'Compare photos': 'Porównaj zdjęcia',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Każde zdjęcie zapisane z treningiem, ułożone według daty — i suwak przed/po.',
+ 'Log today’s workout to add a photo': 'Zapisz dzisiejszy trening, aby dodać zdjęcie',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Brak zdjęć postępów — przycisk powyżej doda zdjęcie do dzisiaj, gdy dzisiaj będzie zapisany trening.',
+ 'Photo': 'Zdjęcie',
+ 'Photo added': 'Dodano zdjęcie',
+ 'Pick two photos to compare.': 'Wybierz dwa zdjęcia do porównania.',
+ 'Progress photos': 'Zdjęcia postępów',
+ 'Ready — open the comparison.': 'Gotowe — otwórz porównanie.',
+ 'Same day': 'Ten sam dzień',
+ '{0} day apart': '{0} dzień różnicy',
+ '{0} days apart': { one: '{0} dzień różnicy', few: '{0} dni różnicy', many: '{0} dni różnicy' },
+ '{0} photo': '{0} zdjęcie',
+ '{0} photos': { one: '{0} zdjęcie', few: '{0} zdjęcia', many: '{0} zdjęć' },
}
diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.js
index 0ef0b49ff..69f1770ef 100644
--- a/frontend/src/locales/pt-BR.js
+++ b/frontend/src/locales/pt-BR.js
@@ -1055,6 +1055,11 @@ export const PT_BR_OVERRIDES = {
'Routine updated': 'Rotina atualizada',
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} série vira {1}: uma de cada lado, {2} s de isometria cada vez.',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} séries viram {1}: uma de cada lado, {2} s de isometria cada vez.',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Todas as fotos que você salvou com um treino, ordenadas por data — e um controle deslizante antes/depois.',
+ 'Log today’s workout to add a photo': 'Registre o treino de hoje para adicionar uma foto',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Ainda sem fotos de progresso — o botão acima adiciona uma a hoje, quando hoje tiver um treino registrado.',
+ 'Pick two photos to compare.': 'Escolha duas fotos para comparar.',
+ 'Ready — open the comparison.': 'Pronto — abra a comparação.',
}
export default { ...pt, ...PT_BR_OVERRIDES }
diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.js
index f6e68e801..6265b2d2f 100644
--- a/frontend/src/locales/pt.js
+++ b/frontend/src/locales/pt.js
@@ -1723,4 +1723,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} série passa a {1}: uma de cada lado, {2} s de isometria de cada vez.',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} séries passam a {1}: uma de cada lado, {2} s de isometria de cada vez.',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Para prancha lateral, isometria com um braço e afins — treina cada lado separadamente.',
+ 'Add a photo to today': 'Adicionar uma foto a hoje',
+ 'Compare photos': 'Comparar fotos',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Todas as fotos que guardaste com um treino, ordenadas por data — e um controlo deslizante antes/depois.',
+ 'Log today’s workout to add a photo': 'Regista o treino de hoje para adicionar uma foto',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Ainda sem fotos de progresso — o botão acima adiciona uma a hoje, quando hoje tiver um treino registado.',
+ 'Photo': 'Foto',
+ 'Photo added': 'Foto adicionada',
+ 'Pick two photos to compare.': 'Escolhe duas fotos para comparar.',
+ 'Progress photos': 'Fotos de progresso',
+ 'Ready — open the comparison.': 'Pronto — abre a comparação.',
+ 'Same day': 'No mesmo dia',
+ '{0} day apart': '{0} dia de diferença',
+ '{0} days apart': '{0} dias de diferença',
+ '{0} photo': '{0} foto',
+ '{0} photos': '{0} fotos',
}
diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.js
index 6674365d1..d54e2cd5f 100644
--- a/frontend/src/locales/ru.js
+++ b/frontend/src/locales/ru.js
@@ -1727,4 +1727,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} подход превращается в {1}: по одному на каждую сторону, каждый раз удержание {2} с.',
'{0} sets become {1}: one on each side, {2}s held every time.': { one: '{0} подход превращается в {1}: по одному на каждую сторону, каждый раз удержание {2} с.', few: '{0} подхода превращаются в {1}: по одному на каждую сторону, каждый раз удержание {2} с.', many: '{0} подходов превращаются в {1}: по одному на каждую сторону, каждый раз удержание {2} с.' },
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Для боковой планки, удержания одной рукой и подобного — каждая сторона тренируется отдельно.',
+ 'Add a photo to today': 'Добавить фото к сегодняшней тренировке',
+ 'Compare photos': 'Сравнить фото',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Все фото, сохранённые с тренировками, по датам — и ползунок «до/после».',
+ 'Log today’s workout to add a photo': 'Запишите сегодняшнюю тренировку, чтобы добавить фото',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Фото прогресса пока нет — кнопка выше добавляет фото к сегодняшней тренировке, когда она записана.',
+ 'Photo': 'Фото',
+ 'Photo added': 'Фото добавлено',
+ 'Pick two photos to compare.': 'Выберите два фото для сравнения.',
+ 'Progress photos': 'Фото прогресса',
+ 'Ready — open the comparison.': 'Готово — откройте сравнение.',
+ 'Same day': 'В тот же день',
+ '{0} day apart': '{0} день между ними',
+ '{0} days apart': { one: '{0} день между ними', few: '{0} дня между ними', many: '{0} дней между ними' },
+ '{0} photo': '{0} фото',
+ '{0} photos': '{0} фото',
}
diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.js
index 7dcf1e29c..0d277982a 100644
--- a/frontend/src/locales/th.js
+++ b/frontend/src/locales/th.js
@@ -1734,4 +1734,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} เซ็ตกลายเป็น {1} เซ็ต: ข้างละหนึ่งเซ็ต ค้างไว้ {2} วินาทีทุกครั้ง',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} เซ็ตกลายเป็น {1} เซ็ต: ข้างละหนึ่งเซ็ต ค้างไว้ {2} วินาทีทุกครั้ง',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'สำหรับแพลงก์ด้านข้าง การค้างแขนเดียว และท่าที่คล้ายกัน — ฝึกแต่ละข้างแยกกัน',
+ 'Add a photo to today': 'เพิ่มรูปให้วันนี้',
+ 'Compare photos': 'เปรียบเทียบรูป',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'ทุกรูปที่คุณเก็บไว้กับการออกกำลังกาย เรียงตามวันที่ — พร้อมแถบเลื่อนก่อน/หลัง',
+ 'Log today’s workout to add a photo': 'บันทึกการออกกำลังกายวันนี้ก่อนเพื่อเพิ่มรูป',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'ยังไม่มีรูปความคืบหน้า — ปุ่มด้านบนจะเพิ่มรูปให้วันนี้ เมื่อวันนี้มีการออกกำลังกายที่บันทึกแล้ว',
+ 'Photo': 'รูปภาพ',
+ 'Photo added': 'เพิ่มรูปแล้ว',
+ 'Pick two photos to compare.': 'เลือกรูปสองรูปเพื่อเปรียบเทียบ',
+ 'Progress photos': 'รูปความคืบหน้า',
+ 'Ready — open the comparison.': 'พร้อมแล้ว — เปิดการเปรียบเทียบ',
+ 'Same day': 'วันเดียวกัน',
+ '{0} day apart': 'ห่างกัน {0} วัน',
+ '{0} days apart': 'ห่างกัน {0} วัน',
+ '{0} photo': '{0} รูป',
+ '{0} photos': '{0} รูป',
}
diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.js
index 995a944e0..81103685f 100644
--- a/frontend/src/locales/tr.js
+++ b/frontend/src/locales/tr.js
@@ -1723,4 +1723,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} set {1} olur: her tarafa bir tane, her seferinde {2} sn tutuş.',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} set {1} olur: her tarafa bir tane, her seferinde {2} sn tutuş.',
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Yan plank, tek kolla tutuş ve benzerleri için — her tarafı ayrı çalıştırır.',
+ 'Add a photo to today': 'Bugüne fotoğraf ekle',
+ 'Compare photos': 'Fotoğrafları karşılaştır',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Bir antrenmanla sakladığın her fotoğraf, tarihe göre sıralı — ve önce/sonra kaydırıcısı.',
+ 'Log today’s workout to add a photo': 'Fotoğraf eklemek için bugünkü antrenmanı kaydet',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Henüz ilerleme fotoğrafı yok — yukarıdaki düğme, bugün kayıtlı bir antrenman olduğunda bugüne bir fotoğraf ekler.',
+ 'Photo': 'Fotoğraf',
+ 'Photo added': 'Fotoğraf eklendi',
+ 'Pick two photos to compare.': 'Karşılaştırmak için iki fotoğraf seç.',
+ 'Progress photos': 'İlerleme fotoğrafları',
+ 'Ready — open the comparison.': 'Hazır — karşılaştırmayı aç.',
+ 'Same day': 'Aynı gün',
+ '{0} day apart': '{0} gün arayla',
+ '{0} days apart': '{0} gün arayla',
+ '{0} photo': '{0} fotoğraf',
+ '{0} photos': '{0} fotoğraf',
}
diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.js
index 1e680186b..1b1f2add8 100644
--- a/frontend/src/locales/uk.js
+++ b/frontend/src/locales/uk.js
@@ -1720,4 +1720,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} підхід перетворюється на {1}: по одному на кожну сторону, щоразу утримання {2} с.',
'{0} sets become {1}: one on each side, {2}s held every time.': { one: '{0} підхід перетворюється на {1}: по одному на кожну сторону, щоразу утримання {2} с.', few: '{0} підходи перетворюються на {1}: по одному на кожну сторону, щоразу утримання {2} с.', many: '{0} підходів перетворюються на {1}: по одному на кожну сторону, щоразу утримання {2} с.' },
'For a side plank, single-arm hold and the like — trains each side on its own.': 'Для бічної планки, утримання однією рукою тощо — кожна сторона тренується окремо.',
+ 'Add a photo to today': 'Додати фото до сьогоднішнього тренування',
+ 'Compare photos': 'Порівняти фото',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': 'Усі фото, збережені з тренуваннями, за датами — і повзунок «до/після».',
+ 'Log today’s workout to add a photo': 'Запишіть сьогоднішнє тренування, щоб додати фото',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': 'Фото прогресу ще немає — кнопка вище додає фото до сьогоднішнього тренування, коли його записано.',
+ 'Photo': 'Фото',
+ 'Photo added': 'Фото додано',
+ 'Pick two photos to compare.': 'Виберіть два фото для порівняння.',
+ 'Progress photos': 'Фото прогресу',
+ 'Ready — open the comparison.': 'Готово — відкрийте порівняння.',
+ 'Same day': 'Того ж дня',
+ '{0} day apart': '{0} день між ними',
+ '{0} days apart': { one: '{0} день між ними', few: '{0} дні між ними', many: '{0} днів між ними' },
+ '{0} photo': '{0} фото',
+ '{0} photos': '{0} фото',
}
diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.js
index e2049cbc3..bb76232e3 100644
--- a/frontend/src/locales/zh-TW.js
+++ b/frontend/src/locales/zh-TW.js
@@ -1719,4 +1719,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} 組變成 {1} 組:每側各一組,每次維持 {2} 秒。',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} 組變成 {1} 組:每側各一組,每次維持 {2} 秒。',
'For a side plank, single-arm hold and the like — trains each side on its own.': '適用於側棒式、單手懸吊等——每側分開訓練。',
+ 'Add a photo to today': '為今天新增照片',
+ 'Compare photos': '比較照片',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': '你隨訓練保存的每張照片,依日期排列——還有前後對比滑桿。',
+ 'Log today’s workout to add a photo': '記錄今天的訓練後即可新增照片',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': '還沒有進度照片——今天記錄訓練後,可用上方按鈕為今天新增一張。',
+ 'Photo': '照片',
+ 'Photo added': '已新增照片',
+ 'Pick two photos to compare.': '選擇兩張照片進行比較。',
+ 'Progress photos': '進度照片',
+ 'Ready — open the comparison.': '準備好了——開啟比較。',
+ 'Same day': '同一天',
+ '{0} day apart': '相隔 {0} 天',
+ '{0} days apart': '相隔 {0} 天',
+ '{0} photo': '{0} 張照片',
+ '{0} photos': '{0} 張照片',
}
diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.js
index 1297d3638..e5f4c3f43 100644
--- a/frontend/src/locales/zh.js
+++ b/frontend/src/locales/zh.js
@@ -1723,4 +1723,19 @@ export default {
'{0} set becomes {1}: one on each side, {2}s held every time.': '{0} 组变为 {1} 组:每侧各一组,每次保持 {2} 秒。',
'{0} sets become {1}: one on each side, {2}s held every time.': '{0} 组变为 {1} 组:每侧各一组,每次保持 {2} 秒。',
'For a side plank, single-arm hold and the like — trains each side on its own.': '适用于侧平板支撑、单臂悬挂等——每侧单独训练。',
+ 'Add a photo to today': '为今天添加照片',
+ 'Compare photos': '对比照片',
+ 'Every photo you kept with a workout, lined up by date — and a before/after slider.': '你随训练保存的每张照片,按日期排列——还有前后对比滑块。',
+ 'Log today’s workout to add a photo': '记录今天的训练后即可添加照片',
+ 'No progress photos yet — the button above adds one to today, once today has a logged workout.': '还没有进度照片——今天记录训练后,可用上方按钮为今天添加一张。',
+ 'Photo': '照片',
+ 'Photo added': '照片已添加',
+ 'Pick two photos to compare.': '选择两张照片进行对比。',
+ 'Progress photos': '进度照片',
+ 'Ready — open the comparison.': '准备好了——打开对比。',
+ 'Same day': '同一天',
+ '{0} day apart': '相隔 {0} 天',
+ '{0} days apart': '相隔 {0} 天',
+ '{0} photo': '{0} 张照片',
+ '{0} photos': '{0} 张照片',
}
diff --git a/frontend/src/views/ProgressPhotos.jsx b/frontend/src/views/ProgressPhotos.jsx
index 419dd97af..b4bddfc2b 100644
--- a/frontend/src/views/ProgressPhotos.jsx
+++ b/frontend/src/views/ProgressPhotos.jsx
@@ -13,7 +13,7 @@ import { useMemo, useRef, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { useStore } from '../store/useStore.js'
import { useUI } from '../store/useUI.js'
-import { t } from '../lib/i18n.js'
+import { t, tn } from '../lib/i18n.js'
import { fmtDate, todayISO } from '../lib/format.js'
import { workoutMediaOf, WORKOUT_MEDIA_MAX } from '../lib/media-refs.js'
import { addWorkoutMedia } from '../lib/workout-media.js'
@@ -43,7 +43,8 @@ export function progressPhotosOf(S) {
for (const w of (S && S.workouts) || []) {
for (const m of workoutMediaOf(w)) {
if (m.kind === 'video') continue
- out.push({ d: w.d, start: w.start || 0, w, m })
+ // `key`: the same file can sit on two workouts (one hash), and each is its own photo here.
+ out.push({ key: (w.id || w.start || w.d) + ':' + m.hash, d: w.d, start: w.start || 0, w, m })
}
}
out.sort((a, b) => (a.d < b.d ? 1 : a.d > b.d ? -1 : b.start - a.start))
@@ -104,7 +105,7 @@ function ProgressCompare({ a, b, close }) {
return <div className="mviewer" role="dialog" aria-modal="true" aria-label={t('Compare photos')}>
<div className="mviewer-bar">
<button type="button" className="iconbtn" aria-label={t('Close')} onClick={close}><Icon name="xmark" /></button>
- <span className="mviewer-count">{days > 0 ? t('{0} days apart', days) : t('Same day')}</span>
+ <span className="mviewer-count">{days > 0 ? tn('{0} day apart', '{0} days apart', days) : t('Same day')}</span>
<span style={{ width: 36 }} />
</div>
<div className="pp-compare" ref={stageRef} data-swipe-ignore
@@ -132,21 +133,21 @@ export default function ProgressPhotos() {
const photos = useMemo(() => progressPhotosOf(S), [S.workouts])
const groups = useMemo(() => groupByDate(photos), [photos])
const [comparing, setComparing] = useState(false)
- const [picked, setPicked] = useState([]) // up to 2 hashes, in tap order
+ const [picked, setPicked] = useState([]) // up to 2 photo keys, in tap order
const today = todaysWorkout(S)
const { pick, busy, canAdd, showAdd } = useMediaPicker()
const fileRef = useRef(null)
const toggle = p => setPicked(cur => {
- if (cur.includes(p.m.hash)) return cur.filter(h => h !== p.m.hash)
- return cur.length >= 2 ? [cur[1], p.m.hash] : [...cur, p.m.hash]
+ if (cur.includes(p.key)) return cur.filter(k => k !== p.key)
+ return cur.length >= 2 ? [cur[1], p.key] : [...cur, p.key]
})
const cancelCompare = () => { setComparing(false); setPicked([]) }
const runCompare = () => {
if (picked.length !== 2) return
const [ha, hb] = picked
- const a = photos.find(p => p.m.hash === ha)
- const b = photos.find(p => p.m.hash === hb)
+ const a = photos.find(p => p.key === ha)
+ const b = photos.find(p => p.key === hb)
cancelCompare()
if (a && b) openProgressCompare(a, b)
}
@@ -169,7 +170,7 @@ export default function ProgressPhotos() {
return <>
<div className="hdr"><button className="iconbtn" onClick={() => nav('/stats')} aria-label={t('Stats')}><Icon name="chevronLeft" /></button>
<div style={{ flex: 1, marginInlineStart: 12 }}><h1>{t('Progress photos')}</h1>
- <div className="sub">{t('{0} photos', photos.length)}</div></div>
+ <div className="sub">{tn('{0} photo', '{0} photos', photos.length)}</div></div>
{photos.length >= 2 && (comparing
? <Button size="sm" variant="ghost" onClick={cancelCompare}>{t('Cancel')}</Button>
: <Button size="sm" variant="tinted" onClick={() => setComparing(true)}>{t('Compare')}</Button>)}
@@ -197,9 +198,9 @@ export default function ProgressPhotos() {
<div className="small muted" style={{ marginBottom: 6 }}>{fmtDate(g.d, true, true)}</div>
<div className="wmedia-grid">
{g.items.map(p => {
- const selected = picked.includes(p.m.hash)
+ const selected = picked.includes(p.key)
return (
- <button key={p.m.hash} type="button" data-swipe-ignore
+ <button key={p.key} type="button" data-swipe-ignore
className={'wmedia-item' + (selected ? ' pp-selected' : '')}
aria-label={fmtDate(p.d, true)}
onClick={() => (comparing ? toggle(p) : openPhotoView(p))}>
diff --git a/frontend/src/views/ProgressPhotos.test.js b/frontend/src/views/ProgressPhotos.test.js
index 1e3e9deb2..3aeef2c08 100644
--- a/frontend/src/views/ProgressPhotos.test.js
+++ b/frontend/src/views/ProgressPhotos.test.js
@@ -100,3 +100,13 @@ describe('daysBetween', () => {
expect(daysBetween('2026-01-01', '2026-01-01')).toBe(0)
})
})
+
+describe('progressPhotosOf — one file on two workouts', () => {
+ it('keeps them apart, so the grid and the comparison can tell them apart', () => {
+ const m = img('shared')
+ const S = { workouts: [{ id: 'w1', d: '2026-09-01', start: 1, media: [m] }, { id: 'w2', d: '2026-09-08', start: 2, media: [m] }] }
+ const keys = progressPhotosOf(S).map(p => p.key)
+ expect(keys).toHaveLength(2)
+ expect(new Set(keys).size).toBe(2)
+ })
+})