Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### Changed

- Expanded French translations across the diary, foods, goals, statistics and wellness screens, including desktop panels and dynamic metric labels.
- **API tokens for every user** ([#245](https://github.com/TraceApps/nutritrace/pull/245)). Anyone signed in can create and revoke their own API tokens in Settings > API Tokens, so connecting your own MCP client no longer needs an admin account. Webhooks stay admin-only. Thanks @tarzan77cz.

### Fixed
Expand Down
15 changes: 12 additions & 3 deletions public/offline.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,19 @@
<body>
<div class="card">
<div class="icon">📡</div>
<h1>Can't reach your server</h1>
<p>NutriTrace couldn't connect. Make sure your server is running and try again.</p>
<button class="btn" onclick="window.location.reload()">Try again</button>
<h1 id="offline-title">Can't reach your server</h1>
<p id="offline-help">NutriTrace couldn't connect. Make sure your server is running and try again.</p>
<button class="btn" id="offline-retry" onclick="window.location.reload()">Try again</button>
<div class="tagline">NutriTrace · Trace Every Bite</div>
</div>
<script>
if ((navigator.language || '').toLowerCase().startsWith('fr')) {
document.documentElement.lang = 'fr';
document.title = 'NutriTrace — Hors connexion';
document.getElementById('offline-title').textContent = 'Serveur inaccessible';
document.getElementById('offline-help').textContent = 'NutriTrace ne parvient pas à se connecter. Vérifiez que le serveur fonctionne, puis réessayez.';
document.getElementById('offline-retry').textContent = 'Réessayer';
}
</script>
</body>
</html>
9 changes: 8 additions & 1 deletion scripts/i18n-check.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,14 @@ function main() {
}

const { direct, indirect } = collectKeyRefs(topLevel);
const unresolved = [...direct.values(), ...indirect.values()].filter(r => !enKeys.has(r.key));
// Indirect literals can name an existing namespace passed to a helper
// (e.g. tr('statistics_page.desktop', id)). Only direct $_() arguments
// must point to a leaf string.
const hasNamespace = key => key.split('.').reduce((value, part) => value?.[part], en) != null;
const unresolved = [
...[...direct.values()].filter(r => !enKeys.has(r.key)),
...[...indirect.values()].filter(r => !enKeys.has(r.key) && !hasNamespace(r.key)),
];
if (unresolved.length) {
errors.push(`${unresolved.length} code-referenced key(s) missing from ${SOURCE_FILE}`);
console.log(` ✗ keys referenced in code but absent from ${SOURCE_FILE}:`);
Expand Down
8 changes: 4 additions & 4 deletions src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@
} else {
lastBack = now;
import('./stores/toast.js').then(({ showSuccess }) => {
showSuccess('Tap again to exit');
showSuccess($_('feedback.general.tap_again_to_exit'));
});
}
}
Expand Down Expand Up @@ -541,7 +541,7 @@
const { isShortcutHash } = await import('./lib/app-shortcut.js');
const shortcutWaiting = isShortcutHash(window.location.hash);
setAuthToken(token);
import('./stores/toast.js').then(({ showSuccess }) => showSuccess('Signed in'));
import('./stores/toast.js').then(({ showSuccess }) => showSuccess($_('common.signed_in')));
await loadAuthState();
// Re-evaluate the NativeSetup gate. Without this the user
// completes OIDC from NativeSetup, gets a valid token, and
Expand Down Expand Up @@ -572,7 +572,7 @@
params.get('withings') ? 'withings' : 'garmin';
const label = provider === 'google_health' ? 'Google Health' :
provider.charAt(0).toUpperCase() + provider.slice(1);
import('./stores/toast.js').then(({ showSuccess }) => showSuccess(`${label} connected!`));
import('./stores/toast.js').then(({ showSuccess }) => $_('dynamic_feedback.connected', { values: { service: label } }));
// Navigate to Wellness page to pick up new connection
window.location.hash = '#/wellness';
} else if (
Expand Down Expand Up @@ -1001,7 +1001,7 @@
<button
class="hamburger"
on:click={() => sidebarOpen = !sidebarOpen}
aria-label="Open menu"
aria-label={$_('extracted.general.open_menu_1')}
>
<span class="material-symbols-rounded">menu</span>
{#if (_syncModeActive && !_serverReachable) || _webOffline}
Expand Down
42 changes: 21 additions & 21 deletions src/components/ai/Trace.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@
maxResults: 1,
partialResults: false,
popup: false,
prompt: 'Tell me what you ate',
prompt: $_('voice_prompt.tell_me_what_you_ate'),
}).then(async (result) => {
// Result returns when stop() is called OR speech ends naturally.
// Skip processing if the user cancelled by sliding off the FAB.
Expand Down Expand Up @@ -2218,9 +2218,9 @@ Diary logging streak: ${ctx.streakText || '(unknown)'}`
style={fabPos ? `left:${fabPos.x + 30}px; top:${fabPos.y - 44}px; right:auto; transform:translateX(-50%);` : ''}
>
{#if cancelPreview}
✕ Release to cancel
{$_('extracted.assistant.release_to_cancel_2')}
{:else}
● Listening… release to log
{$_('extracted.assistant.listening_release_to_log_3')}
{/if}
</div>
{/if}
Expand Down Expand Up @@ -2254,7 +2254,7 @@ Diary logging streak: ${ctx.streakText || '(unknown)'}`
</div>
<div>
<div class="ai-header-name">{assistantName}</div>
<div class="ai-header-sub">Your AI Health & Nutrition Coach</div>
<div class="ai-header-sub">{$_('extracted.assistant.your_ai_health_nutrition_coach_4')}</div>
</div>
</div>
<div class="ai-header-actions">
Expand Down Expand Up @@ -2293,19 +2293,19 @@ Diary logging streak: ${ctx.streakText || '(unknown)'}`
<TraceFace size={48} />
</div>
<p class="ai-welcome-name">Hi, I'm {assistantName}!</p>
<p class="ai-welcome-desc">Ask me anything — nutrition, sleep, activity, recovery, hydration, body composition. I have access to all your data from today.</p>
<p class="ai-welcome-desc">{$_('extracted.assistant.ask_me_anything_nutrition_sleep_activity_recov_5')}</p>
<div class="ai-quick-chips">
<button class="ai-chip" on:click={() => quickAsk("How am I doing today?")}>
How am I doing today?
{$_('extracted.assistant.how_am_i_doing_today_6')}
</button>
<button class="ai-chip" on:click={() => quickAsk("What should I eat for my next meal?")}>
Meal suggestion
{$_('extracted.assistant.meal_suggestion_7')}
</button>
<button class="ai-chip" on:click={() => quickAsk("How was my sleep and recovery?")}>
Sleep & recovery
{$_('extracted.assistant.sleep_recovery_8')}
</button>
<button class="ai-chip" on:click={() => quickAsk("Am I on track with my goals?")}>
Goal progress
{$_('extracted.assistant.goal_progress_9')}
</button>
</div>
</div>
Expand Down Expand Up @@ -2334,7 +2334,7 @@ Diary logging streak: ${ctx.streakText || '(unknown)'}`
{/if}
<div class="ai-msg-body">
{#if msg.image}
<img src={msg.image} alt="Attached" class="ai-msg-image" />
<img src={msg.image} alt={$_('extracted.assistant.attached_10')} class="ai-msg-image" />
{/if}
<div class="ai-bubble">{msg.content}</div>
{#if _cardOffer && _cardOffer.msg === msg}
Expand Down Expand Up @@ -2385,7 +2385,7 @@ Diary logging streak: ${ctx.streakText || '(unknown)'}`
forceShowAll={true} />
<div class="proposal-meal-picker">
<label>
Meal
{$_('extracted.assistant.meal_11')}
<select bind:value={_pendingProposal.meal}>
{#each (mealNames.get() || ['Breakfast','Lunch','Dinner','Snacks']) as mn, mi}
<option value={mi}>{mn}</option>
Expand All @@ -2395,17 +2395,17 @@ Diary logging streak: ${ctx.streakText || '(unknown)'}`
</div>
<div class="proposal-actions">
<button class="btn btn-secondary btn-sm" on:click={_discardProposal}>
Discard
{$_('coaching.trace.discard')}
</button>
<button class="btn btn-primary btn-sm" on:click={_commitProposal}>
<span class="material-symbols-rounded" style="font-size:16px">add</span>
Add to Diary
{$_('foods.add_to_diary')}
</button>
</div>
{:else}
<div class="proposal-committed">
<span class="material-symbols-rounded" style="font-size:18px;color:var(--accent)">check_circle</span>
Logged {_proposalCommittedKcal} kcal to {(mealNames.get() || ['Breakfast','Lunch','Dinner','Snacks'])[_pendingProposal.meal] || 'meal'}
{$_('coaching.plans.logged')} {_proposalCommittedKcal} {$_('extracted.assistant.kcal_to_15')} {(mealNames.get() || ['Breakfast','Lunch','Dinner','Snacks'])[_pendingProposal.meal] || 'meal'}
</div>
{/if}
</div>
Expand Down Expand Up @@ -2443,7 +2443,7 @@ Diary logging streak: ${ctx.streakText || '(unknown)'}`
{_pendingFoodProposal.name}{#if _pendingFoodProposal.brand} <span class="proposal-brand">— {_pendingFoodProposal.brand}</span>{/if}
</div>
<div class="proposal-serving">
Per {_pendingFoodProposal.portion} {_pendingFoodProposal.unit}
{$_('extracted.assistant.per_16')} {_pendingFoodProposal.portion} {_pendingFoodProposal.unit}
</div>
</div>
<NutritionFactsBox
Expand All @@ -2466,25 +2466,25 @@ Diary logging streak: ${ctx.streakText || '(unknown)'}`
</div>
<div class="proposal-actions proposal-actions-wide">
<button class="btn btn-secondary btn-sm" on:click={_discardFoodProposal}>
Discard
{$_('coaching.trace.discard')}
</button>
<button class="btn btn-secondary btn-sm" on:click={_commitFoodCatalogOnly}>
<span class="material-symbols-rounded" style="font-size:16px">bookmark_add</span>
Save to Foods
{$_('extracted.assistant.save_to_foods_17')}
</button>
<button class="btn btn-primary btn-sm" on:click={_commitFoodAndLog}
disabled={_foodProposalCommittedMealIdx == null}>
<span class="material-symbols-rounded" style="font-size:16px">add</span>
Save & Add to Diary
{$_('extracted.assistant.save_add_to_diary_18')}
</button>
</div>
{:else}
<div class="proposal-committed">
<span class="material-symbols-rounded" style="font-size:18px;color:var(--accent)">check_circle</span>
{#if _foodProposalCommittedKind === 'logged'}
Saved {_pendingFoodProposal.name} to your foods + logged to {(mealNames.get() || ['Breakfast','Lunch','Dinner','Snacks'])[_foodProposalCommittedMealIdx] || 'meal'}
{$_('food_editor.saved')} {_pendingFoodProposal.name} {$_('extracted.assistant.to_your_foods_logged_to_20')} {(mealNames.get() || ['Breakfast','Lunch','Dinner','Snacks'])[_foodProposalCommittedMealIdx] || 'meal'}
{:else}
Saved {_pendingFoodProposal.name} to your food catalog
{$_('food_editor.saved')} {_pendingFoodProposal.name} {$_('extracted.assistant.to_your_food_catalog_21')}
{/if}
</div>
{/if}
Expand Down Expand Up @@ -2518,7 +2518,7 @@ Diary logging streak: ${ctx.streakText || '(unknown)'}`
<!-- Input bar -->
{#if attachedImage}
<div class="ai-image-preview">
<img src={attachedImage.preview} alt="Attached" />
<img src={attachedImage.preview} alt={$_('extracted.assistant.attached_10')} />
<button class="ai-image-remove" on:click={_removeImage}>
<span class="material-symbols-rounded" style="font-size:16px">close</span>
</button>
Expand Down
27 changes: 14 additions & 13 deletions src/components/diary/ActivityImpactWidget.svelte
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script>
import { _ } from 'svelte-i18n';
/**
* Diary → right column → Activity Impact widget.
*
Expand Down Expand Up @@ -42,64 +43,64 @@
<section class="activity-widget card">
<header class="aw-header">
<span class="material-symbols-rounded aw-icon">directions_run</span>
<span class="aw-title">Activity impact</span>
<span class="aw-title">{$_('extracted.diary.activity_impact_23')}</span>
{#if calorieGoalMode === 'dynamic'}
<span class="aw-mode" title="Dynamic goal moves with your wearable's burn">⚡ Dynamic</span>
<span class="aw-mode" title={$_('extracted.diary.dynamic_goal_moves_with_your_wearable_s_burn_24')}>{$_('extracted.diary.dynamic_25')}</span>
{:else if calorieGoalMode === 'adaptive'}
<span class="aw-mode" title="Adaptive goal is learned from your weight trend">📈 Adaptive</span>
<span class="aw-mode" title={$_('extracted.diary.adaptive_goal_is_learned_from_your_weight_tren_26')}>{$_('extracted.diary.adaptive_27')}</span>
{/if}
</header>

{#if calorieGoalMode === 'dynamic' && dynamicCaloriesOut != null}
<div class="aw-body">
<div class="aw-row">
<span class="aw-label">Wearable burn (yesterday)</span>
<span class="aw-label">{$_('extracted.diary.wearable_burn_yesterday_28')}</span>
<span class="aw-val">{burnE.value.toLocaleString()} {burnE.unit}</span>
</div>
<div class="aw-row">
<span class="aw-label">Base goal</span>
<span class="aw-label">{$_('extracted.diary.base_goal_29')}</span>
<span class="aw-val">{baseE.value.toLocaleString()} {baseE.unit}</span>
</div>
{#if hasActivity}
<div class="aw-row">
<span class="aw-label"><span class="aw-plus">+</span> Today's active</span>
<span class="aw-label"><span class="aw-plus">+</span> {$_('extracted.diary.today_s_active_30')}</span>
<span class="aw-val aw-val-active">{activeE.value.toLocaleString()} {activeE.unit}</span>
</div>
{/if}
<div class="aw-row aw-row-total">
<span class="aw-label">Adjusted goal</span>
<span class="aw-label">{$_('extracted.diary.adjusted_goal_31')}</span>
<span class="aw-val">{adjustedE.value.toLocaleString()} {adjustedE.unit}</span>
</div>
</div>
{:else if calorieGoalMode === 'adaptive' && adaptiveTdee != null}
<div class="aw-body">
<div class="aw-row">
<span class="aw-label">Learned TDEE (35-day)</span>
<span class="aw-label">{$_('extracted.diary.learned_tdee_35_day_32')}</span>
<span class="aw-val">{tdeeE.value.toLocaleString()} {tdeeE.unit}</span>
</div>
{#if hasActivity}
<div class="aw-row">
<span class="aw-label"><span class="aw-plus">+</span> Today's active</span>
<span class="aw-label"><span class="aw-plus">+</span> {$_('extracted.diary.today_s_active_30')}</span>
<span class="aw-val aw-val-active">{activeE.value.toLocaleString()} {activeE.unit}</span>
</div>
{/if}
<div class="aw-row aw-row-total">
<span class="aw-label">Adjusted goal</span>
<span class="aw-label">{$_('extracted.diary.adjusted_goal_31')}</span>
<span class="aw-val">{adjustedE.value.toLocaleString()} {adjustedE.unit}</span>
</div>
</div>
{:else if hasActivity}
<div class="aw-body">
<div class="aw-row">
<span class="aw-label">Today's active kcal</span>
<span class="aw-label">{$_('extracted.diary.today_s_active_kcal_33')}</span>
<span class="aw-val aw-val-active">{activeE.value.toLocaleString()} {activeE.unit}</span>
</div>
<div class="aw-row">
<span class="aw-label">Base goal</span>
<span class="aw-label">{$_('extracted.diary.base_goal_29')}</span>
<span class="aw-val">{baseE.value.toLocaleString()} {baseE.unit}</span>
</div>
<div class="aw-row aw-row-total">
<span class="aw-label">Adjusted goal</span>
<span class="aw-label">{$_('extracted.diary.adjusted_goal_31')}</span>
<span class="aw-val">{adjustedE.value.toLocaleString()} {adjustedE.unit}</span>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions src/components/diary/FastingInsights.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
const hrs = f.end_at ? ((new Date(f.end_at) - new Date(f.start_at)) / 3600000).toFixed(1) : '?';
const day = new Date(f.start_at).toLocaleDateString();
const ok = await confirmDialog({
title: 'Remove this fast?',
message: `${hrs}h fast on ${day} will be deleted from your history. This can't be undone.`,
title: $_('dynamic_ui.fasting.remove_title'),
message: $_('dynamic_ui.fasting.remove_message', { values: { hours: hrs, date: day } }),
confirmText: 'Remove',
dangerous: true,
});
Expand Down Expand Up @@ -111,14 +111,14 @@
</div>
{/each}
</div>
<div class="fi-chart-caption">Last 14 days · {_stats.count} fast{_stats.count === 1 ? '' : 's'} logged</div>
<div class="fi-chart-caption">{$_('extracted.diary.last_14_days_44')} {_stats.count} {$_('extracted.diary.fast_45')}{_stats.count === 1 ? '' : 's'} {$_('extracted.diary.logged_46')}</div>

{#if $fastHistory && $fastHistory.length > 0}
<button class="fi-history-toggle" type="button"
on:click={() => _showHistory = !_showHistory}
aria-expanded={_showHistory}>
<span class="material-symbols-rounded" class:rot={_showHistory}>expand_more</span>
{_showHistory ? 'Hide' : 'Show'} Recent Fasts
{_showHistory ? 'Hide' : 'Show'} {$_('extracted.diary.recent_fasts_47')}
</button>
{#if _showHistory}
<div class="fi-history" transition:slide={{ duration: 180 }}>
Expand All @@ -129,11 +129,11 @@
<span class="fi-history-day">{_fmtDayLabel(f.start_at)}</span>
<span class="fi-history-dur">{_fmtDuration(f.start_at, f.end_at)}</span>
<span class="fi-history-goal" class:met={goalMet}>
Goal {f.goal_hours}h{goalMet ? ' ✓' : ''}
{$_('statistics_page.desktop.goal')} {f.goal_hours}h{goalMet ? ' ✓' : ''}
</span>
</div>
<button class="btn-icon fi-history-del" on:click={() => _removeFast(f)}
aria-label="Remove this fast" title="Remove this fast">
aria-label={$_('extracted.diary.remove_this_fast_49')} title={$_('extracted.diary.remove_this_fast_49')}>
<span class="material-symbols-rounded">close</span>
</button>
</div>
Expand Down
Loading