Skip to content

Commit

Permalink
taxonomy: correction coconut macaroons (#10964)
Browse files Browse the repository at this point in the history
<!-- IMPORTANT CHECKLIST
Make sure you've done all the following (You can delete the checklist
before submitting)
- [ ] PR title is prefixed by one of the following: feat, fix, docs,
style, refactor, test, build, ci, chore, revert, l10n, taxonomy
- [ ] Code is well documented
- [ ] Include unit tests for new functionality
- [ ] Code passes GitHub workflow checks in your branch
- [ ] If you have multiple commits please combine them into one commit
by squashing them.
- [ ] Read and understood the [contribution
guidelines](https://github.com/openfoodfacts/openfoodfacts-server/blob/main/CONTRIBUTING.md)
-->
### What

<!-- Describe the changes made and why they were made instead of how
they were made. -->

### Screenshot
<!-- Optional, you can delete if not relevant -->

### Related issue(s) and discussion
<!-- Please add the issue number this issue will close, that way, once
your pull request is merged, the issue will be closed as well -->
- Fixes #[ISSUE NUMBER]

---------

Co-authored-by: Open Food Facts Bot <contact@openfoodfacts.org>
  • Loading branch information
moon-rabbitOFF and Open Food Facts Bot authored Nov 6, 2024
1 parent 2f10d93 commit 2848771
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 43 deletions.
67 changes: 24 additions & 43 deletions taxonomies/food/categories.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94194,6 +94194,16 @@ ja: 餅, もち
nl: Mochi
wikidata:en: Q470519

# Pastries made of hazelnut or almond, sugar and egg white. It is generally not filled.
< en:Desserts
< en:Pastries
en: Nut macarons
fr: Macarons aux fruits à coques
agribalyse_food_code:en: 23027
ciqual_food_code:en: 23027
ciqual_food_name:en: Macaroon

# filled macarons
< en:Desserts
< en:Pastries
en: Macarons, Macaroon, Macaroons, Macaron
Expand All @@ -94205,9 +94215,9 @@ it: Macaron
ja: マカロン
nl: Macarons
pl: Słodkie makaroniki
agribalyse_food_code:en: 23027
ciqual_food_code:en: 23027
ciqual_food_name:en: Macaroon
agribalyse_food_code:en: 23024
ciqual_food_code:en: 23024
ciqual_food_name:en: Macaron filled with jam or cream

< en:Macarons
fr: Assortiments de macarons
Expand All @@ -94216,43 +94226,11 @@ es: Assortment de macarons
it: Assortimento di macaron
ja: マカロンのアソートメント
nl: Macaron assortiment
agribalyse_food_code:en: 23027
ciqual_food_code:en: 23027
ciqual_food_name:en: Macaroon

< en:Macarons
en: Macaron filled with jam
de: Macaron mit Marmelade gefüllt
es: Macaron relleno de mermelada
fr: Macaron moelleux fourré à la confiture
hr: Makarone punjene džemom
it: Macaron ripieno di marmellata
ja: ジャム入りマカロン
nl_be: Macaron gevuld met confituur
agribalyse_food_code:en: 23024
ciqual_food_code:en: 23024
ciqual_food_name:en: Macaron filled with jam or cream

< en:Macarons
en: Macaron filled with cream
de: Macaron mit Cremefüllung
es: Macaron relleno de crema
fr: Macaron moelleux fourré à la crème
hr: Makarone punjene kremom
it: Macaron ripieno di crema
ja: クリーム入りマカロン
nl_be: Macaron gevuld met crème
agribalyse_food_code:en: 23024
ciqual_food_code:en: 23024
ciqual_food_name:en: Macaron filled with jam or cream

< en:Macarons
fr: Macarons à la noix de coco
de: Kokosmakronen
es: Macarons de coco
it: Macarons al cocco
ja: ココナッツマカロン
nl: Kokosmacarons
# pastries made of a dairy mousse and entire raspberries between two layers of almond macaron
< en:Desserts
< en:Pastries
fr: Entremets macaron framboise

< en:Desserts
< en:Pastries
Expand Down Expand Up @@ -94412,12 +94390,15 @@ ciqual_food_code:en: 23474
ciqual_food_name:en: Profiteroles (chou pastry), with custard and chocolate sauce, refrigerated

< en:Pastries
en: Coconut Macaroons, Coconut macaroon, Rock-shaped coconut cak
en: Coconut macaroons, Coconut macaroon, Rock-shaped coconut cake
de: Kokosmakronen
es: Macarons de coco
fi: Kookosmakronit, Kookosmacaronit
fr: Rochers à la noix de coco, Congolais, Rochers coco, rocher à la noix de coco, rocher coco, Petit gâteau à la noix de coco
fr: Rochers à la noix de coco, Congolais, Rochers coco, rocher à la noix de coco, rocher coco, Petit gâteau à la noix de coco, Macarons à la noix de coco
hr: Kokos makaroni
it: Biscotti al cocco
nl: Kokosmacaron
it: Macarons al cocco
ja: ココナッツマカロン
nl: Kokosmacarons, Kokosmacaron
agribalyse_food_code:en: 23033
ciqual_food_code:en: 23033
ciqual_food_name:en: Rock-shaped coconut cake
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ <h1 itemprop="name">Desserts</h1>
<li><a href="/categorie/en:meringue-roulades" class="tag well_known" lang="en">en:Meringue roulades</a></li>
<li><a href="/categorie/mochi" class="tag well_known">Mochi</a></li>
<li><a href="/categorie/desserts-vegetaliens" class="tag well_known">Desserts végétaliens</a></li>
<li><a href="/categorie/macarons-aux-fruits-a-coques" class="tag well_known">Macarons aux fruits à coques</a></li>
<li><a href="/categorie/panforte" class="tag well_known">Panforte</a></li>
<li><a href="/categorie/peche-melba" class="tag well_known">Pêche melba</a></li>
<li><a href="/categorie/puddings" class="tag well_known">Puddings</a></li>
Expand All @@ -424,6 +425,7 @@ <h1 itemprop="name">Desserts</h1>
<li><a href="/categorie/gateaux-des-rois" class="tag well_known">Gâteaux des rois</a></li>
<li><a href="/categorie/fi:m%C3%A4mmi" class="tag user_defined" lang="fi">fi:Mämmi</a></li>
<li><a href="/categorie/buches-patissieres" class="tag well_known">Bûches pâtissières</a></li>
<li><a href="/categorie/entremets-macaron-framboise" class="tag well_known">Entremets macaron framboise</a></li>
<li><a href="/categorie/pastel-de-nata" class="tag well_known">Pastel de nata</a></li>
</ul>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ <h1 itemprop="name">Desserts</h1>
<li><a href="/category/meringue-roulades" class="tag well_known">Meringue roulades</a></li>
<li><a href="/category/mochi" class="tag well_known">Mochi</a></li>
<li><a href="/category/non-dairy-desserts" class="tag well_known">Non-dairy desserts</a></li>
<li><a href="/category/nut-macarons" class="tag well_known">Nut macarons</a></li>
<li><a href="/category/panforte" class="tag well_known">Panforte</a></li>
<li><a href="/category/peach-melba-with-vanilla-ice-cream-and-raspberry-sauce" class="tag well_known">Peach melba with vanilla ice cream and raspberry sauce</a></li>
<li><a href="/category/puddings" class="tag well_known">Puddings</a></li>
Expand All @@ -424,6 +425,7 @@ <h1 itemprop="name">Desserts</h1>
<li><a href="/category/es:roscon" class="tag user_defined" lang="es">es:Roscón</a></li>
<li><a href="/category/fi:m%C3%A4mmi" class="tag user_defined" lang="fi">fi:Mämmi</a></li>
<li><a href="/category/fr:buches-patissieres" class="tag user_defined" lang="fr">fr:Bûches pâtissières</a></li>
<li><a href="/category/fr:entremets-macaron-framboise" class="tag user_defined" lang="fr">fr:Entremets macaron framboise</a></li>
<li><a href="/category/fr:pastel-de-nata" class="tag user_defined" lang="fr">fr:Pastel de nata</a></li>
</ul>

Expand Down

0 comments on commit 2848771

Please sign in to comment.