Skip to content

Commit f4a4a82

Browse files
committed
i18n: Diary + MacroRing — missed Protein/Carbs/Fat macro labels
Cleans up macro-label literals that a previous replace_all pass didn't reach because they lived in different class names (ns-macro-lbl, qce-macro-label, macro-lbl) with different surrounding markup. Adds diary_deep.fat (net-new key) and reuses existing diary_deep.protein / diary_deep.carbs across: - MacroRing (nutrition ring below diary meal): svelte-i18n import added + all 3 macro legend labels - Diary QuickCaloriesEntry inline fat pill - Diary meal-summary nutrition pills (nutrition summary sheet + per-meal totals)
1 parent 1167a2e commit f4a4a82

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

src/components/diary/MacroRing.svelte

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { tweened } from 'svelte/motion';
33
import { cubicOut } from 'svelte/easing';
44
import { slide } from 'svelte/transition';
5+
import { _ } from 'svelte-i18n';
56
import { energyUnit, macroLegendMode } from '../../stores/settings.js';
67
import { Nutrition } from '../../lib/nutrition.js';
78
@@ -169,17 +170,17 @@
169170
<div class="macro-item">
170171
<span class="dot protein"></span>
171172
<span class="macro-val">{macroPcts.protein}%</span>
172-
<span class="macro-lbl">Protein</span>
173+
<span class="macro-lbl">{$_('diary_deep.protein')}</span>
173174
</div>
174175
<div class="macro-item">
175176
<span class="dot carbs"></span>
176177
<span class="macro-val">{macroPcts.carbs}%</span>
177-
<span class="macro-lbl">Carbs</span>
178+
<span class="macro-lbl">{$_('diary_deep.carbs')}</span>
178179
</div>
179180
<div class="macro-item">
180181
<span class="dot fat"></span>
181182
<span class="macro-val">{macroPcts.fat}%</span>
182-
<span class="macro-lbl">Fat</span>
183+
<span class="macro-lbl">{$_('diary_deep.fat')}</span>
183184
</div>
184185
</div>
185186
{/if}

src/i18n/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,7 @@
10801080
"optional_macros": "Optional Macros",
10811081
"protein": "Protein",
10821082
"carbs": "Carbs",
1083+
"fat": "Fat",
10831084
"serving_size": "Serving Size",
10841085
"num_servings": "Number of Servings",
10851086
"total_amount": "Total Amount",

src/routes/Diary.svelte

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1855,7 +1855,7 @@
18551855
bind:value={editFat} />
18561856
<span class="qce-macro-unit" style="color:var(--macro-fat)">g</span>
18571857
</div>
1858-
<span class="qce-macro-label">Fat</span>
1858+
<span class="qce-macro-label">{$_('diary_deep.fat')}</span>
18591859
</div>
18601860
</div>
18611861
<button class="btn btn-primary w-full" style="margin-top:16px" on:click={saveEditItem}>{$_('diary.edit_item.save')}</button>
@@ -2190,7 +2190,7 @@
21902190
</div>
21912191
<div class="ns-macro-pill" style="background:var(--macro-fat-dim)">
21922192
<span class="ns-macro-val" style="color:var(--macro-fat)">{Math.round(totals.fat || 0)}{#if $macroLegendMode === 'grams' && fatGoal}/{fatGoal}{/if}g</span>
2193-
<span class="ns-macro-lbl">Fat</span>
2193+
<span class="ns-macro-lbl">{$_('diary_deep.fat')}</span>
21942194
</div>
21952195
</div>
21962196
<!-- All nutrients — tap a row to drill into top contributors -->
@@ -2255,15 +2255,15 @@
22552255
<div class="ns-macros">
22562256
<div class="ns-macro-pill" style="background:var(--macro-protein-dim)">
22572257
<span class="ns-macro-val" style="color:var(--macro-protein)">{Math.round(_mealTotals.proteins || 0)}g</span>
2258-
<span class="ns-macro-lbl">Protein</span>
2258+
<span class="ns-macro-lbl">{$_('diary_deep.protein')}</span>
22592259
</div>
22602260
<div class="ns-macro-pill" style="background:var(--macro-carbs-dim)">
22612261
<span class="ns-macro-val" style="color:var(--macro-carbs)">{Math.round(_mealTotals.carbohydrates || 0)}g</span>
2262-
<span class="ns-macro-lbl">Carbs</span>
2262+
<span class="ns-macro-lbl">{$_('diary_deep.carbs')}</span>
22632263
</div>
22642264
<div class="ns-macro-pill" style="background:var(--macro-fat-dim)">
22652265
<span class="ns-macro-val" style="color:var(--macro-fat)">{Math.round(_mealTotals.fat || 0)}g</span>
2266-
<span class="ns-macro-lbl">Fat</span>
2266+
<span class="ns-macro-lbl">{$_('diary_deep.fat')}</span>
22672267
</div>
22682268
<div class="ns-macro-pill" style="background:var(--macro-calories-dim)">
22692269
<span class="ns-macro-val" style="color:var(--macro-calories)">{_nsMealEnergy.value.toLocaleString()}</span>

0 commit comments

Comments
 (0)