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.

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: Label parenting #7321

Merged
merged 10 commits into from
Oct 6, 2022
Merged
Changes from 7 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
43 changes: 22 additions & 21 deletions taxonomies/labels.txt
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ bg:Без пшеница
de:Ohne Weizen
nl:Zonder graan

en:No gluten, Gluten-free, Without gluten, Gluten-free-food, free of gluten, Naturally gluten free, Gluten free, ni gluten
Copy link
Contributor

@stephanegigandet stephanegigandet Sep 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For allergens, antibiotics etc. the ingredients parsing code expects the "No something" to be the canonical entry.

There's a comment about that at the top of the file:

# For labels that indicate the absence of something, in English, always make "No something" the first entry, and make "Something-free", "Without something" synonyms

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can add that it's required by the ingredients parsing code.

en:Gluten free, No gluten, Without gluten, Gluten-free-food, free of gluten, Naturally gluten-free, Gluten free, ni gluten
bg:Без глутен
ca:Lliure de gluten, Sense gluten, No gluten, Aliment sense gluten, Lliure de gluten, Sense gluten d'orígen
cs:Bez lepku
Expand Down Expand Up @@ -1494,7 +1494,7 @@ nl:Distributeur-labels
ru:Этикетки дистрибьюторов
zh:分销商标签

<en:Labels of distributors
<en:distributor labels
en:Carrefour Quality, Quality Carrefour
ca:Qualitat Carrefour
de:Carrefour-Qualität
Expand All @@ -1504,15 +1504,16 @@ fr:Qualité Carrefour, Carrefour Qualité, Engagement Qualité Carrefour
it:Qualità Carrefour
nl:Carrefour kwaliteit

<en:Labels of distributors
<en:distributor labels
fr:Label Carrefour

<en:Labels of distributors
<en:distributor labels
fr:Sélection Intermarché

<en:Labels of distributors
<en:distributor labels
fr:Testé par le panel test Carrefour, Panel test Carrefour, Inspiré testé et approuvé par le panel Test Carrefour, approuvé par le panel Test Carrefour, testé et approuvé par le panel Test Carrefour, panel Carrefour

<en:distributor labels
en:Charte LU Harmony, Charte Harmony, LU Harmony, Charte LU
it:Progetto Harmony di Charte LU
nl:Charte LU Harmony
Expand Down Expand Up @@ -3161,8 +3162,8 @@ sv:Utan konserveringsmedel
th:ไม่ใช้วัตถุกันเสีย
zh:无防腐剂

<en: No colorings
<en: No preservatives
<en:No colorings
<en:No preservatives
en:Without dyes or preservatives
bg:Без оцветители и консерванти
ca:Sense colorants ni conservants
Expand Down Expand Up @@ -17138,7 +17139,7 @@ en:Sustainable
nl:Duurzaam

<en:Sustainable
en:Sustainable fishing, Sustainable Seafood, Sustainable fishery
en:Sustainable fishery, Sustainable fishing, Sustainable Seafood
bg:Устойчив риболов
ca:Piscifactoria sostenible, Pesca sostenible, Marisc sostenible
de:Nachhaltige Fischerei
Expand Down Expand Up @@ -17915,25 +17916,25 @@ ingredients:en: en:meat
origins:en: en:france
# Note: putting

<fr:Viande Française
<en:French meat
fr:Viande d'agneau français, VAF, Viande d'agneau Origine France, Agneau 100% Français, Viande d'agneau Française, Agneau 100% France, Agneau Origine France
ingredients:en: en:lamb
origins:en: en:france

<fr:Viande Française
<en:French meat
fr:Viande de chèvre française, Viande de chèvre Origine France, Chèvre 100% Française, Viande de chèvre Française, Chèvre 100% France, Chèvre Origine France
origins:en: en:france

<fr:Viande Française
<en:French meat
fr:Viande de chevreau français, Viande de chevreau Origine France, Chevreau 100% Français, Viande de chevreau Française, Chevreau 100% France, Chevreau Origine France
origins:en: en:france

<fr:Viande Française
<en:French meat
fr:Lapin Français, Lapin de France, Lapin Origine France, Viande de lapin français, Viande de lapin française, Viande de Lapin origine France
ingredients:en: en:rabbit
origins:en: en:france

<fr:Viande Française
<en:French meat
en:French duck
de:Französische Ente
es:Pato francés
Expand All @@ -17945,7 +17946,7 @@ pt:Pato francês
ingredients:en: en:duck
origins:en: en:france

<fr:Viande Française
<en:French meat
en:French pork
ca:Porc francès
de:Schweinefleisch aus Frankreich
Expand All @@ -17960,34 +17961,34 @@ pt:Porco francês
origins:en: en:france
ingredients:en: en:pork

<fr:Viande Française
<en:French meat
en:French beef
fr:Viande Bovine Française, VBF, Viande bovine Origine France, Bœuf 100% Français, Viande de bœuf Française, Bœuf 100% France, Bœuf Origine France
origins:en: en:france
ingredients:en: en:beef

<fr:Viande Française
<en:French meat
fr:Viande Ovine Française, Viande ovine Origine France, Ovin 100% Français, Viande d'ovin Française, Ovin 100% France, ovin Origine France
origins:en: en:france
ingredients:en: en:sheep

<fr:Viande Française
<en:French meat
fr:Viande de veau français, Viande de veau Origine France, Veau 100% Français, Viande de veau Française, Veau 100% France, Veau Origine France
origins:en: en:france
ingredients:en: en:veal

<fr:Viande Française
<en:French meat
en:French poultry
fr:Volaille Française, volaille Origine France
origins:en: en:france
ingredients:en: en:poultry

<fr:Viande Française
<en:French meat
fr:Poulet Français, Viande de poulet origine France, Poulet 100% Français, Viande de poulet français, Viande de poulet française, Poulet Origine France, Poulet 100% France
origins:en: en:france
ingredients:en: en:chicken

<fr:Viande Française
<en:French meat
fr:Viande Chevaline Française, Viande chevaline origine France, Cheval 100% Français, Viande de cheval française, Viande de cheval français, Cheval Origine France, Cheval 100% France
origins:en: en:france
ingredients:en: en:horse
Expand Down Expand Up @@ -19159,7 +19160,7 @@ fi:E-kooditon, ei E-koodeja
hu:E-szám mentes
label_categories:en: en:Health

en:No antibiotics, Without antibiotics, antibiotic-free, antibiotics-free,no antibiotic, raised without antibiotics, no Antibiotics Administered
en:Without antibiotics, No antibiotics, antibiotic-free, antibiotics-free,no antibiotic, raised without antibiotics, no Antibiotics Administered
bg:Без антибиотици
ca:Sense antibiòtics, Lliure d'antibiòtics, No s'han administrat antibiòtics, Engreixat sense antibiòtics
de:Ohne Antibiotika, Frei von Antibiotika, Enthält kein Antibiotika, antibiotika-frei, antibiotikafrei
Expand Down