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
Custom exercises: one photo or video waiting, and one file a zip backup left out, are named in the singular
Duarte Santos25d3a41c98a0
diff --git a/frontend/src/components/ServerSync.jsx b/frontend/src/components/ServerSync.jsxindex b7236b8a4..d7e7885f4 100644--- a/frontend/src/components/ServerSync.jsx+++ b/frontend/src/components/ServerSync.jsx@@ -203,7 +203,7 @@ export function OwedSheet({ kind, count: count0, media: media0 = 0, exportBackup{(count !== 0 || !media) && <div style={{ marginBottom: 6, fontWeight: 600 }}>{count > 0 ? t('Not on your server yet: {0}', changeCount(count)) : t('Some changes on this device have not reached your server.')}</div>}- {media > 0 && <div style={{ marginBottom: 6, fontWeight: 600 }}>{t('{0} photos or videos have not reached your server yet.', media)}</div>}+ {media > 0 && <div style={{ marginBottom: 6, fontWeight: 600 }}>{t(media === 1 ? '{0} photo or video has not reached your server yet.' : '{0} photos or videos have not reached your server yet.', media)}</div>}{(tried || refused) && view && <div className="small" style={{ color: 'var(--red)', marginBottom: 6 }}>{view.line}</div>}{/* It names the button below it: Try again, or Pair again / Sign in where the server refuses. */}<div className="muted small" style={{ marginBottom: 18, lineHeight: 1.5 }}>diff --git a/frontend/src/components/ServerSync.media.test.jsx b/frontend/src/components/ServerSync.media.test.jsxindex 3ac3f337d..788b9e825 100644--- a/frontend/src/components/ServerSync.media.test.jsx+++ b/frontend/src/components/ServerSync.media.test.jsx@@ -61,7 +61,14 @@ describe('OwedSheet with photos and videos waiting', () => {it('names the changes and the media when both are waiting', () => {act(() => root.render(<OwedSheet kind="signout" count={3} media={1} exportBackup={vi.fn()} exportBackupZip={vi.fn()} done={vi.fn()} close={vi.fn()} />))expect(host.textContent).toContain('Not on your server yet')- expect(host.textContent).toContain('1 photos or videos have not reached your server yet.')+ expect(host.textContent).toContain('1 photo or video has not reached your server yet.')+ })++ // QA, v1.3.9: "1 photos or videos have not reached your server yet."+ it('one file is named in the singular', () => {+ act(() => root.render(<OwedSheet kind="signout" count={0} media={1} exportBackup={vi.fn()} exportBackupZip={vi.fn()} done={vi.fn()} close={vi.fn()} />))+ expect(host.textContent).toContain('1 photo or video has not reached your server yet.')+ expect(host.textContent).not.toContain('1 photos')})it('Try again sends them too — the refused ones included — and the sheet follows the new count', async () => {@@ -104,7 +111,7 @@ describe('OwedSheet with photos and videos waiting', () => {mocks.sync = { status: 'auth', auth: true, lastError: { status: 401, code: 'auth' } }act(() => root.render(<OwedSheet kind="signout" count={null} media={1} exportBackup={vi.fn()} exportBackupZip={vi.fn()} done={vi.fn()} close={vi.fn()} />))expect(host.textContent).toContain('Some changes on this device have not reached your server.')- expect(host.textContent).toContain('1 photos or videos have not reached your server yet.')+ expect(host.textContent).toContain('1 photo or video has not reached your server yet.')expect(host.textContent).toContain('Sign in again, or export a backup first.')expect(host.textContent).not.toContain('Try again')expect(button('Sign in with passkey')).toBeTruthy()diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.jsindex 584735289..7f2357780 100644--- a/frontend/src/locales/ar.js+++ b/frontend/src/locales/ar.js@@ -1635,8 +1635,10 @@ export default {'{0} waiting to upload': 'بانتظار الرفع: {0}','Export with photos & videos (.zip)': 'تصدير مع الصور والفيديو (.zip)','{0} files could not be included': 'تعذّر تضمين {0} من الملفات',+ '{0} file could not be included': 'تعذّر تضمين {0} ملف','Without photos and videos': 'بدون الصور والفيديو','Name it and pick a body part — it behaves like any other exercise.': 'سمِّه واختر جزءًا من الجسم — يعمل مثل أي تمرين آخر.','name + body part, and a photo or video if you like': 'الاسم + جزء الجسم، وصورة أو فيديو إن أردت','{0} photos or videos have not reached your server yet.': 'لم تصل {0} من الصور أو مقاطع الفيديو إلى خادمك بعد.',+ '{0} photo or video has not reached your server yet.': 'لم تصل {0} صورة أو مقطع فيديو إلى خادمك بعد.',}diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.jsindex 7405f6063..c20231a79 100644--- a/frontend/src/locales/de.js+++ b/frontend/src/locales/de.js@@ -1602,8 +1602,10 @@ export default {'{0} waiting to upload': '{0} warten auf den Upload','Export with photos & videos (.zip)': 'Mit Fotos & Videos exportieren (.zip)','{0} files could not be included': '{0} Dateien konnten nicht aufgenommen werden',+ '{0} file could not be included': '{0} Datei konnte nicht aufgenommen werden','Without photos and videos': 'Ohne Fotos und Videos','Name it and pick a body part — it behaves like any other exercise.': 'Name und Körperpartie festlegen — die Übung verhält sich wie jede andere.','name + body part, and a photo or video if you like': 'Name + Körperpartie, auf Wunsch mit Foto oder Video','{0} photos or videos have not reached your server yet.': '{0} Fotos oder Videos sind noch nicht auf deinem Server.',+ '{0} photo or video has not reached your server yet.': '{0} Foto oder Video ist noch nicht auf deinem Server.',}diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.jsindex 5fe360d3c..0d2d98b63 100644--- a/frontend/src/locales/es.js+++ b/frontend/src/locales/es.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': '{0} pendientes de subir','Export with photos & videos (.zip)': 'Exportar con fotos y vídeos (.zip)','{0} files could not be included': 'No se pudieron incluir {0} archivos',+ '{0} file could not be included': 'No se pudo incluir {0} archivo','Without photos and videos': 'Sin fotos ni vídeos','Name it and pick a body part — it behaves like any other exercise.': 'Ponle nombre y elige una parte del cuerpo — funciona como cualquier otro ejercicio.','name + body part, and a photo or video if you like': 'nombre + parte del cuerpo, y una foto o vídeo si quieres','{0} photos or videos have not reached your server yet.': '{0} fotos o vídeos aún no han llegado a tu servidor.',+ '{0} photo or video has not reached your server yet.': '{0} foto o vídeo aún no ha llegado a tu servidor.',}diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.jsindex 57af27800..4f0fa1a8a 100644--- a/frontend/src/locales/fr.js+++ b/frontend/src/locales/fr.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': '{0} en attente d’envoi','Export with photos & videos (.zip)': 'Exporter avec photos et vidéos (.zip)','{0} files could not be included': '{0} fichiers n’ont pas pu être inclus',+ '{0} file could not be included': '{0} fichier n’a pas pu être inclus','Without photos and videos': 'Sans photos ni vidéos','Name it and pick a body part — it behaves like any other exercise.': 'Donnez-lui un nom et choisissez une partie du corps — il se comporte comme n’importe quel autre exercice.','name + body part, and a photo or video if you like': 'nom + partie du corps, et une photo ou vidéo si vous voulez','{0} photos or videos have not reached your server yet.': '{0} photos ou vidéos ne sont pas encore arrivées sur votre serveur.',+ '{0} photo or video has not reached your server yet.': '{0} photo ou vidéo n’est pas encore arrivée sur votre serveur.',}diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.jsindex 1e63fd6ac..739ce35a4 100644--- a/frontend/src/locales/hi.js+++ b/frontend/src/locales/hi.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': '{0} अपलोड की प्रतीक्षा में','Export with photos & videos (.zip)': 'फ़ोटो और वीडियो के साथ निर्यात करें (.zip)','{0} files could not be included': '{0} फ़ाइलें शामिल नहीं हो सकीं',+ '{0} file could not be included': '{0} फ़ाइल शामिल नहीं हो सकी','Without photos and videos': 'फ़ोटो और वीडियो के बिना','Name it and pick a body part — it behaves like any other exercise.': 'नाम दें और बॉडी पार्ट चुनें — यह किसी भी दूसरी एक्सरसाइज़ की तरह काम करती है।','name + body part, and a photo or video if you like': 'नाम + बॉडी पार्ट, और चाहें तो एक फ़ोटो या वीडियो','{0} photos or videos have not reached your server yet.': '{0} फ़ोटो या वीडियो अभी आपके सर्वर तक नहीं पहुँचे हैं।',+ '{0} photo or video has not reached your server yet.': '{0} फ़ोटो या वीडियो अभी आपके सर्वर तक नहीं पहुँचा है।',}diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.jsindex d28185f8b..e98126ecd 100644--- a/frontend/src/locales/hu.js+++ b/frontend/src/locales/hu.js@@ -1585,8 +1585,10 @@ export default {'{0} waiting to upload': '{0} feltöltésre vár','Export with photos & videos (.zip)': 'Exportálás fotókkal és videókkal (.zip)','{0} files could not be included': '{0} fájlt nem sikerült hozzáadni',+ '{0} file could not be included': '{0} fájlt nem sikerült hozzáadni','Without photos and videos': 'Fotók és videók nélkül','Name it and pick a body part — it behaves like any other exercise.': 'Adj neki nevet, és válassz testrészt — úgy működik, mint bármelyik másik gyakorlat.','name + body part, and a photo or video if you like': 'név + testrész, és ha szeretnéd, egy fotó vagy videó','{0} photos or videos have not reached your server yet.': '{0} fotó vagy videó még nem ért el a szerveredre.',+ '{0} photo or video has not reached your server yet.': '{0} fotó vagy videó még nem ért el a szerveredre.',}diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.jsindex 4e815dcc2..dc07f8cfb 100644--- a/frontend/src/locales/it.js+++ b/frontend/src/locales/it.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': '{0} in attesa di caricamento','Export with photos & videos (.zip)': 'Esporta con foto e video (.zip)','{0} files could not be included': 'Non è stato possibile includere {0} file',+ '{0} file could not be included': 'Non è stato possibile includere {0} file','Without photos and videos': 'Senza foto e video','Name it and pick a body part — it behaves like any other exercise.': 'Dagli un nome e scegli una parte del corpo — funziona come qualsiasi altro esercizio.','name + body part, and a photo or video if you like': 'nome + parte del corpo, e una foto o un video se vuoi','{0} photos or videos have not reached your server yet.': '{0} foto o video non hanno ancora raggiunto il tuo server.',+ '{0} photo or video has not reached your server yet.': '{0} foto o video non ha ancora raggiunto il tuo server.',}diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.jsindex cc4d85173..4947b314d 100644--- a/frontend/src/locales/ko.js+++ b/frontend/src/locales/ko.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': '업로드 대기 {0}개','Export with photos & videos (.zip)': '사진·동영상 포함 내보내기 (.zip)','{0} files could not be included': '파일 {0}개를 포함하지 못했습니다',+ '{0} file could not be included': '파일 {0}개를 포함하지 못했습니다','Without photos and videos': '사진·동영상 제외','Name it and pick a body part — it behaves like any other exercise.': '이름을 정하고 부위를 고르세요 — 다른 운동과 똑같이 쓸 수 있습니다.','name + body part, and a photo or video if you like': '이름 + 부위, 원하면 사진이나 동영상도','{0} photos or videos have not reached your server yet.': '아직 서버에 올라가지 않은 사진·동영상이 {0}개 있습니다.',+ '{0} photo or video has not reached your server yet.': '아직 서버에 올라가지 않은 사진·동영상이 {0}개 있습니다.',}diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.jsindex 82a6c6509..87dfbfcf5 100644--- a/frontend/src/locales/pl.js+++ b/frontend/src/locales/pl.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': 'Czeka na wysłanie: {0}','Export with photos & videos (.zip)': 'Eksportuj ze zdjęciami i filmami (.zip)','{0} files could not be included': 'Nie udało się dołączyć plików: {0}',+ '{0} file could not be included': 'Nie udało się dołączyć {0} pliku','Without photos and videos': 'Bez zdjęć i filmów','Name it and pick a body part — it behaves like any other exercise.': 'Nadaj nazwę i wybierz partię ciała — działa jak każde inne ćwiczenie.','name + body part, and a photo or video if you like': 'nazwa + partia ciała, a do tego zdjęcie lub film, jeśli chcesz','{0} photos or videos have not reached your server yet.': 'Zdjęcia lub filmy, które nie dotarły jeszcze na twój serwer: {0}.',+ '{0} photo or video has not reached your server yet.': 'Zdjęcie lub film, którego jeszcze nie ma na twoim serwerze: {0}.',}diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.jsindex 7bc5106e4..c644d04cd 100644--- a/frontend/src/locales/pt-BR.js+++ b/frontend/src/locales/pt-BR.js@@ -937,10 +937,12 @@ export const PT_BR_OVERRIDES = {'{0} waiting to upload': '{0} aguardando envio','Export with photos & videos (.zip)': 'Exportar com fotos e vídeos (.zip)','{0} files could not be included': 'Não foi possível incluir {0} arquivos',+ '{0} file could not be included': 'Não foi possível incluir {0} arquivo','Without photos and videos': 'Sem fotos nem vídeos','Name it and pick a body part — it behaves like any other exercise.': 'Dê um nome e escolha uma parte do corpo — ele funciona como qualquer outro exercício.','name + body part, and a photo or video if you like': 'nome + parte do corpo, e uma foto ou vídeo se quiser','{0} photos or videos have not reached your server yet.': '{0} fotos ou vídeos ainda não chegaram ao seu servidor.',+ '{0} photo or video has not reached your server yet.': '{0} foto ou vídeo ainda não chegou ao seu servidor.',}export default { ...pt, ...PT_BR_OVERRIDES }diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.jsindex d9473513f..d74a6a03e 100644--- a/frontend/src/locales/pt.js+++ b/frontend/src/locales/pt.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': '{0} à espera de envio','Export with photos & videos (.zip)': 'Exportar com fotos e vídeos (.zip)','{0} files could not be included': 'Não foi possível incluir {0} ficheiros',+ '{0} file could not be included': 'Não foi possível incluir {0} ficheiro','Without photos and videos': 'Sem fotos nem vídeos','Name it and pick a body part — it behaves like any other exercise.': 'Dá-lhe um nome e escolhe uma parte do corpo — comporta-se como qualquer outro exercício.','name + body part, and a photo or video if you like': 'nome + parte do corpo, e uma foto ou vídeo se quiseres','{0} photos or videos have not reached your server yet.': '{0} fotos ou vídeos ainda não chegaram ao teu servidor.',+ '{0} photo or video has not reached your server yet.': '{0} foto ou vídeo ainda não chegou ao teu servidor.',}diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.jsindex a7c6120bc..bb4a4e4a0 100644--- a/frontend/src/locales/ru.js+++ b/frontend/src/locales/ru.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': 'Ожидают загрузки: {0}','Export with photos & videos (.zip)': 'Экспорт с фото и видео (.zip)','{0} files could not be included': 'Не удалось добавить файлов: {0}',+ '{0} file could not be included': 'Не удалось добавить {0} файл','Without photos and videos': 'Без фото и видео','Name it and pick a body part — it behaves like any other exercise.': 'Дайте название и выберите часть тела — упражнение работает как любое другое.','name + body part, and a photo or video if you like': 'название + часть тела и, по желанию, фото или видео','{0} photos or videos have not reached your server yet.': 'Фото и видео, ещё не попавшие на ваш сервер: {0}.',+ '{0} photo or video has not reached your server yet.': 'Фото или видео, ещё не попавшее на ваш сервер: {0}.',}diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.jsindex e05f3b719..fea736433 100644--- a/frontend/src/locales/th.js+++ b/frontend/src/locales/th.js@@ -1593,8 +1593,10 @@ export default {'{0} waiting to upload': 'รออัปโหลด {0} รายการ','Export with photos & videos (.zip)': 'ส่งออกพร้อมรูปภาพและวิดีโอ (.zip)','{0} files could not be included': 'ใส่ไฟล์ไม่ได้ {0} ไฟล์',+ '{0} file could not be included': 'ใส่ไฟล์ไม่ได้ {0} ไฟล์','Without photos and videos': 'ไม่รวมรูปภาพและวิดีโอ','Name it and pick a body part — it behaves like any other exercise.': 'ตั้งชื่อและเลือกส่วนร่างกาย — ใช้งานได้เหมือนท่าอื่นทุกประการ','name + body part, and a photo or video if you like': 'ชื่อ + ส่วนร่างกาย และรูปหรือวิดีโอถ้าต้องการ','{0} photos or videos have not reached your server yet.': 'มีรูปภาพหรือวิดีโอ {0} รายการที่ยังไม่ถึงเซิร์ฟเวอร์ของคุณ',+ '{0} photo or video has not reached your server yet.': 'มีรูปภาพหรือวิดีโอ {0} รายการที่ยังไม่ถึงเซิร์ฟเวอร์ของคุณ',}diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.jsindex 21a1af965..4fd25a6d0 100644--- a/frontend/src/locales/tr.js+++ b/frontend/src/locales/tr.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': '{0} yükleme bekliyor','Export with photos & videos (.zip)': 'Fotoğraf ve videolarla dışa aktar (.zip)','{0} files could not be included': '{0} dosya eklenemedi',+ '{0} file could not be included': '{0} dosya eklenemedi','Without photos and videos': 'Fotoğraf ve videolar hariç','Name it and pick a body part — it behaves like any other exercise.': 'Bir ad ver ve bir vücut bölgesi seç — diğer egzersizler gibi çalışır.','name + body part, and a photo or video if you like': 'ad + vücut bölgesi, istersen bir fotoğraf veya video','{0} photos or videos have not reached your server yet.': '{0} fotoğraf veya video henüz sunucuna ulaşmadı.',+ '{0} photo or video has not reached your server yet.': '{0} fotoğraf veya video henüz sunucuna ulaşmadı.',}diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.jsindex 6f0c6c556..3939c2323 100644--- a/frontend/src/locales/uk.js+++ b/frontend/src/locales/uk.js@@ -1579,8 +1579,10 @@ export default {'{0} waiting to upload': 'Чекають на вивантаження: {0}','Export with photos & videos (.zip)': 'Експорт із фото й відео (.zip)','{0} files could not be included': 'Не вдалося додати файлів: {0}',+ '{0} file could not be included': 'Не вдалося додати {0} файл','Without photos and videos': 'Без фото й відео','Name it and pick a body part — it behaves like any other exercise.': 'Дай назву й вибери частину тіла — вправа працює як будь-яка інша.','name + body part, and a photo or video if you like': 'назва + частина тіла, а за бажання — фото чи відео','{0} photos or videos have not reached your server yet.': 'Фото й відео, які ще не дійшли до твого сервера: {0}.',+ '{0} photo or video has not reached your server yet.': 'Фото чи відео, яке ще не дійшло до твого сервера: {0}.',}diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.jsindex e6c0f0685..bf35418ca 100644--- a/frontend/src/locales/zh.js+++ b/frontend/src/locales/zh.js@@ -1582,8 +1582,10 @@ export default {'{0} waiting to upload': '{0} 个等待上传','Export with photos & videos (.zip)': '连同照片和视频导出(.zip)','{0} files could not be included': '有 {0} 个文件无法包含',+ '{0} file could not be included': '有 {0} 个文件无法包含','Without photos and videos': '不含照片和视频','Name it and pick a body part — it behaves like any other exercise.': '起个名字并选择身体部位——它和其他动作用法一样。','name + body part, and a photo or video if you like': '名称 + 身体部位,可附照片或视频','{0} photos or videos have not reached your server yet.': '有 {0} 个照片或视频尚未到达你的服务器。',+ '{0} photo or video has not reached your server yet.': '有 {0} 个照片或视频尚未到达你的服务器。',}diff --git a/frontend/src/views/Settings.jsx b/frontend/src/views/Settings.jsxindex b888e7874..7420141d4 100644--- a/frontend/src/views/Settings.jsx+++ b/frontend/src/views/Settings.jsx@@ -162,7 +162,7 @@ export default function Settings() {try { out = await exportBackupZip(st.S, { fetchOne: signedIn ? fetchToStore : null }) }catch { toast(t('Something went wrong')); return }const name = 'opengym-backup-' + todayISO() + '.zip'- if (out.missing) toast(t('{0} files could not be included', out.missing))+ if (out.missing) toast(t(out.missing === 1 ? '{0} file could not be included' : '{0} files could not be included', out.missing))if (MOBILE) {try { await shareExportBlob(out.blob, name); if (!out.missing) toast(t('Backup exported')) } catch (e) { /* share sheet dismissed */ }returndiff --git a/frontend/src/views/Settings.media.test.jsx b/frontend/src/views/Settings.media.test.jsxindex 3963ad28c..1a04cb90b 100644--- a/frontend/src/views/Settings.media.test.jsx+++ b/frontend/src/views/Settings.media.test.jsx@@ -150,6 +150,17 @@ describe('Settings — photos and videos', () => {vi.restoreAllMocks()})+ it('the zip export names one file it could not include in the singular', async () => {+ const created = vi.spyOn(URL, 'createObjectURL').mockImplementation(() => 'blob:zip')+ vi.spyOn(HTMLAnchorElement.prototype, 'click').mockImplementation(() => {})+ try {+ await mount() // the photo is not on this device, and a guest has nowhere to fetch it from+ act(() => { row('Export with photos & videos (.zip)').click() })+ await until(() => created.mock.calls.length > 0)+ expect(mocks.toast).toHaveBeenCalledWith('1 file could not be included')+ } finally { vi.restoreAllMocks() }+ })+it('importing a zip keeps its photo as pending, once confirmed', async () => {const S = stateWithPhoto()const zip = await zipStore([{ name: 'opengym-backup.json', blob: new Blob([JSON.stringify(S)]) }, { name: `media/${HASH}.jpg`, blob: new Blob([PHOTO]) }])