Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

taxonomy: various insertions #11198

Merged
merged 9 commits into from
Jan 20, 2025
Merged

taxonomy: various insertions #11198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6beb873
taxonomy: various insertions
OpenChris Jan 6, 2025
e7c92b1
Merge branch 'main' into openchris-taxonomies
OpenChris Jan 17, 2025
5321290
taxonomies: changes suggested by Steph. & MoonR
OpenChris Jan 17, 2025
cba8c8d
greenscore: external taxonomies: Code for beetroot juice is "0001" in…
OpenChris Jan 17, 2025
845b242
taxonomies: add beetroot juice ciqual
OpenChris Jan 17, 2025
49be8aa
taxonomies: fix strange lint alert?
OpenChris Jan 17, 2025
72e0693
chore: Linting changes
Jan 20, 2025
9af6e1a
test: Update tests results
Jan 20, 2025
7b51a3f
Merge branch 'main' into openchris-taxonomies
OpenChris Jan 20, 2025
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
49 changes: 48 additions & 1 deletion taxonomies/food/categories.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6286,6 +6286,12 @@ ciqual_food_code:en: 18345
ciqual_food_name:en: Fruit soft drink, carbonated (less than 10% of fruit juice), without sugar and artificial sweetener(s)
ciqual_food_name:fr: Boisson gazeuse aux fruits (à moins de 10% de jus), non sucrée, sans édulcorant

< en:Carbonated drinks
en: Carbonated soft drinks with tea extract
fr: Boissons gazeuses au thé aromatisées, Boisson gazeuse au thé aromatisée
OpenChris marked this conversation as resolved.
Show resolved Hide resolved
agribalyse_proxy_food_code:en: 18015
agribalyse_proxy_food_name:en: Still soft drink with tea extract, with sugar and artificial sweetener(s)

< en:Sodas
en: Tonic water
bg: Тоник
Expand Down Expand Up @@ -6663,6 +6669,11 @@ ciqual_food_code:en: 18039
ciqual_food_name:en: Lemonade with a flavoured syrup
ciqual_food_name:fr: Diabolo (limonade et sirop)

< en: Lemonades
en: Chinotto
fr: Chinotto
it: Chinotto

OpenChris marked this conversation as resolved.
Show resolved Hide resolved
< en:Sodas
en: Colas, Cola, Cola sodas
bg: Кола
Expand Down Expand Up @@ -8580,7 +8591,10 @@ it: Succo di barbabietola
ja: ビートルートジュース, ビーツジュース
lt: Burokėlių sultys
nl: Rode bietensappen, Rode bietensap
agribalyse_food_code:en: 1
agribalyse_food_code:en: 0001
ciqual_food_code:en: 1
ciqual_food_name:en: Beetroot juice, pure juice
ciqual_food_name:fr: Jus de betterave

< en:Tomatoes and their products
< en:Vegetable juices
Expand Down Expand Up @@ -13060,6 +13074,15 @@ fr: Alsace Pinot gris
< fr:Vin d'Alsace
fr: Alsace Riesling, Riesling d'Alsace

< fr:Vin d'Alsace
fr: Edelzwicker, Alsace edelzwicker
origins:en: en:france
wikidata:en: Q1283481

< fr:Vin d'Alsace
fr: Sylvaner d'Alsace, Alsace sylvaner, Sylvaner
origins:en: en:france

< en:Wines from France
fr: Anjou, Anjou Val de Loire
origins:en: en:france, en:loire-valley
Expand Down Expand Up @@ -32994,6 +33017,16 @@ ciqual_food_code:en: 5201
ciqual_food_name:en: Wine, white, sparkling
ciqual_food_name:fr: Vin blanc mousseux

< en:Red wines
< en:Sparkling wines
en: Sparkling red wine
fr: Vin rouge pétillant

< en:Rosé wines
< en:Sparkling wines
en: Sparkling Rosé wine
fr: Vin rosé pétillant

< en:Flavoured wines
< en:Sparkling wines
< en:White wines
Expand Down Expand Up @@ -64342,6 +64375,10 @@ zh: 香精
fr: Arômes pâtisserie, Arôme pâtisserie
nl: Gebaksaromas

< en:Food additives
OpenChris marked this conversation as resolved.
Show resolved Hide resolved
en: Citric acid
fr: Acide citrique

< en:Food additives
en: Food colorings, Food dyes, Color additives, Food colourings, Food coloring, Food colouring
de: Lebensmittelfarbe, Lebensmittelfarbstoffe
Expand Down Expand Up @@ -95425,6 +95462,10 @@ hr: Tartlete od krušaka
it: Tortini di pera
nl: Peertaartjes

< en:Fruit tartlets
en: Frozen fruit tartlets
fr: Tartelettes aux fruits surgelées

< en:Specific products
en: Products sold before year 2000, products sold before 2000
de: Produkte die vor dem Jahr 2000 verkauft wurden, Produkte die vor 2000 verkauft wurden
Expand Down Expand Up @@ -100487,6 +100528,11 @@ agribalyse_food_code:en: 26111
ciqual_food_code:en: 26111
ciqual_food_name:en: Salema, raw

< en:Fishes
en: Bleak
fr: Ablette
wikidata:en: Q200473

< en:Cooked cods
en: Roasted cods, Baked cods
fr: Cabillauds rôtis, Cabillauds cuits au four
Expand Down Expand Up @@ -118464,3 +118510,4 @@ fr: Spirales de blé dur complet

en: Semi whole durum wheat spirals
fr: Spirales de blé dur semi-complet

8 changes: 4 additions & 4 deletions ...cted_test_results/api_v3_taxonomy_suggestions/categories-string-fr-tart-get-synonyms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"Tartelettes au chocolat" : "Tartelettes au chocolat",
"Tartelettes au citron" : "Tartelettes au citron",
"Tartelettes aux fruits entiers ou coupés" : "Tartelettes aux fruits entiers ou coupés",
"Tartelettes à l'abricot" : "Tartelettes à l'abricot",
"Tartelettes à la fraise" : "Tartelettes à la fraise"
"Tartelettes aux fruits surgelées" : "Tartelettes aux fruits surgelées",
"Tartelettes à l'abricot" : "Tartelettes à l'abricot"
},
"status" : "success",
"suggestions" : [
Expand All @@ -52,8 +52,8 @@
"Tartelettes au chocolat",
"Tartelettes au citron",
"Tartelettes aux fruits entiers ou coupés",
"Tartelettes à l'abricot",
"Tartelettes à la fraise"
"Tartelettes aux fruits surgelées",
"Tartelettes à l'abricot"
],
"warnings" : []
}
Loading