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

fix: Nutri-Score for fresh herbs #11112

Merged
merged 11 commits into from
Jan 9, 2025
Merged

fix: Nutri-Score for fresh herbs #11112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
56192e8
fruits/vegetables/legumes: orange, dill / herbs
stephanegigandet Dec 11, 2024
55b9870
fix: nutriscore for fresh herbs
stephanegigandet Dec 11, 2024
9e7e768
test: Update tests results
Dec 11, 2024
43936ae
fix for supplements
stephanegigandet Dec 11, 2024
6c7b63c
update tests
stephanegigandet Dec 11, 2024
a7e079d
update tests
stephanegigandet Dec 11, 2024
207c8e4
update tests
stephanegigandet Dec 11, 2024
139c3f1
parlsey eurocode
stephanegigandet Dec 12, 2024
dab2e59
Merge branch 'main' into nutriscore-herbs
teolemon Dec 22, 2024
b006642
Merge branch 'main' into nutriscore-herbs
stephanegigandet Jan 8, 2025
dd6b2f8
update tests
stephanegigandet Jan 9, 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
2 changes: 1 addition & 1 deletion lib/ProductOpener/Config_off.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,11 +603,11 @@ $options{categories_considered_as_beverages_for_nutriscore_2023} = [
$options{categories_exempted_from_nutriscore} = [
qw(
en:alcoholic-beverages
en:aromatic-herbs
en:baby-foods
en:baby-milks
en:chewing-gum
en:food-additives
en:dietary-supplements
en:meal-replacements
en:salts
en:spices
Expand Down
5 changes: 3 additions & 2 deletions lib/ProductOpener/Ingredients.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8130,6 +8130,7 @@ can be taken into account, whereas crisps which are thin and completely dehydrat
=cut

my %fruits_vegetables_legumes_eurocodes = (
"7.10" => 1,
"8.10" => 1,
"8.15" => 1,
"8.20" => 1,
Expand All @@ -8149,7 +8150,7 @@ my %fruits_vegetables_legumes_eurocodes = (
"9.40" => 1,
"9.50" => 1,
"9.60" => 1,
"7.10" => 1,
"12.20" => 1, # Herbs
);

sub is_fruits_vegetables_legumes ($ingredient_id, $processing = undef) {
Expand All @@ -8170,7 +8171,7 @@ sub is_fruits_vegetables_legumes ($ingredient_id, $processing = undef) {
((defined $eurocode_2_group_1) and ($eurocode_2_group_1 eq "9"))
# Vegetables and legumes
or ((defined $eurocode_2_group_2)
and (exists $fruits_vegetables_legumes_eurocodes{$eurocode_2_group_2}))
and ($fruits_vegetables_legumes_eurocodes{$eurocode_2_group_2}))
)
and (not $is_a_further_processed_ingredient)
and (not $further_processed)
Expand Down
4 changes: 2 additions & 2 deletions taxonomies/food/categories.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116633,7 +116633,7 @@ nl: Eendterrine met morieljes
< en:Duck terrines
fr: Terrines de canard au muscat

en: Dietary supplements
en: Dietary supplements, food supplements
af: Diëet aanvulling
ar: مكمل غذائي
bs: Prehrambeni suplement
Expand All @@ -116647,7 +116647,7 @@ es: Suplementos dietéticos, Complementos alimenticios
eu: Elikadura-osagarri
fa: مکمل‌های غذایی طبیعی
fi: Ravintolisät, Lisäravintoaine
fr: Compléments alimentaires
fr: Compléments alimentaires, complément alimentaire
gl: Suplemento dietético
he: תוספי תזונה
hi: खाद्य पूरक
Expand Down
Loading
Loading