diff --git a/package.json b/package.json index d2ccab6..ac5470e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "homepage", - "version": "1.23.7", + "version": "1.23.8", "private": true, "type": "module", "scripts": { diff --git a/src/lib/js/fitnessI18n.ts b/src/lib/js/fitnessI18n.ts index 3b408d8..8457698 100644 --- a/src/lib/js/fitnessI18n.ts +++ b/src/lib/js/fitnessI18n.ts @@ -288,7 +288,7 @@ const translations: Translations = { protein: { en: 'Protein', de: 'Protein' }, fat: { en: 'Fat', de: 'Fett' }, carbs: { en: 'Carbs', de: 'Kohlenhydrate' }, - remaining: { en: 'remaining', de: 'übrig' }, + remaining: { en: 'left', de: 'übrig' }, over: { en: 'over', de: 'über' }, no_entries_yet: { en: 'No entries yet. Add food to start tracking.', de: 'Noch keine Einträge. Füge Essen hinzu, um zu tracken.' }, set_goal_prompt: { en: 'Set a daily calorie goal to start tracking.', de: 'Setze ein Kalorienziel, um mit dem Tracking zu beginnen.' }, diff --git a/src/routes/fitness/[nutrition=fitnessNutrition]/[[date=fitnessDate]]/+page.svelte b/src/routes/fitness/[nutrition=fitnessNutrition]/[[date=fitnessDate]]/+page.svelte index 8015785..3f62fab 100644 --- a/src/routes/fitness/[nutrition=fitnessNutrition]/[[date=fitnessDate]]/+page.svelte +++ b/src/routes/fitness/[nutrition=fitnessNutrition]/[[date=fitnessDate]]/+page.svelte @@ -1256,7 +1256,7 @@ {@const remaining = macro.goal ? macro.goal - macro.value : 0} {@const MacroBarIcon = macro.icon}
- {macro.label}{#if macro.goal} {fmt(macro.goal)}g/{isEn ? 'day' : 'Tag'}{/if} + {macro.label}
{#if over} @@ -1265,7 +1265,7 @@
{#if macro.goal} - {remaining >= 0 ? `${fmt(remaining)}g ${t('remaining', lang)}` : `${fmt(-remaining)}g ${t('over', lang)}`} + {remaining >= 0 ? `${fmt(remaining)}/${fmt(macro.goal)}g ${t('remaining', lang)}` : `${fmt(-remaining)}g ${t('over', lang)} ${fmt(macro.goal)}g`} {:else} {fmt(macro.value)}g