Skip to content

Commit

Permalink
chore: week13 taxonomy changes (#10052)
Browse files Browse the repository at this point in the history
* Clemenvillas

* languages

* portugese etc

* cheese details

* organic potatos from France

* alcohol vinegar powder

* mixture of melted cheeses and powdered cheeses

* jus et purée de pomme biologiques

* added icons
  • Loading branch information
aleene authored Mar 29, 2024
1 parent 88ac0ac commit c62062b
Show file tree
Hide file tree
Showing 6 changed files with 87 additions and 22 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion lib/ProductOpener/Ingredients.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4621,6 +4621,8 @@ my %phrases_before_ingredients_list = (

mk => ['Состојки',],

md => ['(I|i)ngrediente',],

nl => ['(I|i)ngredi(e|ë)nten', 'samenstelling', 'bestanddelen'],

nb => ['Ingredienser',],
Expand Down Expand Up @@ -4651,7 +4653,7 @@ my %phrases_before_ingredients_list = (

tr => ['(İ|i)çindekiler', 'içeriği',],

uz => ['tarkib',],
uz => ['tarkib', 'Mahsulot tarkibi',],

zh => ['配料', '成份',],

Expand Down
29 changes: 26 additions & 3 deletions taxonomies/food/categories.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ stopwords:de:und,mit,von
# additional countries can be added separated by a semi colon (";"). Example for en:fruit, 35g, in EU and en:fruit, 35g in en:other-country:
# expected_minimal_amount_specific_ingredients:en: en:fruit, 35, en:eu; en:fruit, 35, en:other-country

en:Bulk
fr:Vrac
nl:Verpakkingsvrij

en:Artisan products
ca:Prouctes artesans
de:Handgefertigte Produkte, Artisanale Produkte, Handgemachte Produkte
Expand Down Expand Up @@ -4929,7 +4933,7 @@ ru:Латвийская водка


<en:Vodka
no:Norsk Vodka, Norwegian Vodka
en:Vodka from Norway, Norwegian Vodka
sv:Norsk Vodka, Norwegian Vodka
fi:Norjalainen Vodka, Norwegian Vodka
da:Norsk Vodka, Norwegian Vodka
Expand All @@ -4938,6 +4942,7 @@ de:Norwegische Vodka, Norwegian Vodka
fr:Vodka norvégienne, Norwegian Vodka
es:Vodka noruego, Norwegian Vodka
it:Vodka norvegese, Norwegian Vodka
no:Norsk Vodka, Norwegian Vodka
pl:Norweska wódka, Norwegian Vodka
ru:Норвежская водка, Norwegian Vodka
zh:挪威伏特加, Norwegian Vodka
Expand Down Expand Up @@ -42585,7 +42590,7 @@ lt:Sūriai, Sūris
lb:Kéis
nl:Kazen, Kaas
nl_be:Kazen
no:Oster
no:Oster, Ost
pl:Sery
pt:Queijos
ro:Brânzeturi, Brânză, cascaval, cașcaval
Expand Down Expand Up @@ -42671,6 +42676,19 @@ th:มึนสเตอร์ชีส
wikidata:en:Q6931973
description:en:American cheese.

<en:Cheeses
en:Cheeses from Norway, Norwegian Cheeses
fr:Fromages norvégiennes
nl:Noorse Kazen, Kazen uit Noorwegen
no:Norske Oster
origins:en: en:Norway
#wikidata:en:

<en:Cheeses from Norway
<en:Cow cheeses
en:Yellow cheeses
no:Gulost

<en:Cheeses
en:Mexican cheeses, cheeses from Mexico
de:Mexikanischer Käse
Expand Down Expand Up @@ -47532,6 +47550,7 @@ wikidata:en:Q6094554
en:Spanish hard cheeses

<en:Cheeses
en:Cheeses from Norway
en:Brunost
da:myseost
fi:mesjuusto
Expand All @@ -47540,7 +47559,7 @@ nb:Brunost, mysost
sv:mesost

<en:Cheeses
en:Swedish cheeses, cheeses from Sweden
en:Swedish cheeses, Cheeses from Sweden
de:Schwedischer Käse
fr:Fromages suédois, Fromages de Suède
lt:Švediški sūriai
Expand Down Expand Up @@ -64530,6 +64549,10 @@ lt:Švieži apelsinai
tr:Taze portakal
season_in_country_fr:en: 1,2,3,12

<en:Fresh oranges
en:Clemenvillas
xx:Clemenvillas

<en:Oranges
en:Orange pulp
fr:Pulpe d'orange
Expand Down
27 changes: 13 additions & 14 deletions taxonomies/food/ingredients.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6385,8 +6385,8 @@ ca:formatge de llet pasteuritzada
es:queso de leche pasteurizada
# fr:fromage-au-lait-pasteurisé has 55 products in 1 language @2018-10-28

#<en:cheese
#en:cheese powder
<en:cheese
en:cheese powder
#en:processing:en:powder
#bg:сирене на прах
#ca:formatge en pols
Expand Down Expand Up @@ -18264,7 +18264,7 @@ pt:vinagre de álcool
sv:ättiksprit

<en:alcohol vinegar
<en:vinegar powder
#<en:vinegar powder
en:alcohol vinegar powder
fr:poudre de vinaigre d'alcool
ro:oţet praf din alcool, otet praf din alcool
Expand Down Expand Up @@ -39376,11 +39376,10 @@ en:Granny smith apple juice

<en:apple juice
<en:apple puree
fr:Jus et purée de pomme
fr:jus et purée de pomme

<en:organic apple juice
<en:organic apple puree
fr:Jus et purée de pomme biologiques
<fr:jus et purée de pomme
fr:jus et purée de pomme biologiques


#is compound: en:apple
Expand Down Expand Up @@ -43742,11 +43741,11 @@ ciqual_food_name:fr:Kiwi, pulpe et graines, cru

#processing:en: en:juice
#processing:en: en:from concentrate
<en:kiwi juice
en:kiwi juice from concentrate
de:Kiwisaft aus Kiwisaftkonzentrat
fr:jus de kiwi à base de concentré
pl:sok z koncentratu z kiwi
#<en:kiwi juice
#en:kiwi juice from concentrate
#de:Kiwisaft aus Kiwisaftkonzentrat
#fr:jus de kiwi à base de concentré
#pl:sok z koncentratu z kiwi

# No products

Expand Down Expand Up @@ -53633,8 +53632,8 @@ sv:potatismjöl
<fr:Pommes de terre de consommation à chair ferme
fr:Pommes de terre de consommation à chair ferme bio

<en:organic potato
en:organic potato from France
<en:potato
en:organic potatos from France
fr:Pommes de terre biologiques origine France

<en:potato
Expand Down
49 changes: 45 additions & 4 deletions taxonomies/labels.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
# Supporting multiple ingredients is doable but would require code changes.

stopwords:en:ingredients, agricultural, from, with, of, by, the, verified, certified, approved, 100%, pure, guaranty, guaranteed, product guaranteed, product certified, standard, during, period, phase, label, mark, logo
stopwords:bg:съставки, земеделие, от, с, контролиран, сертифициран, 100%, натурален, гарантиран, продукт
stopwords:bg:съставки, земеделие, от, с, контролиран, сертифициран, 100%, натурален, гарантиран, продуктheart

stopwords:da:fra, kontrolleret, dyrkning, dyrket, dyrkede, råvarer, landbrug, certificeret
stopwords:de:Zutaten, von, mit, enthält, kontrolliert, zertifiziert, geprüft, 100%, rein, Produkt, Garantie, garantiert, Standard, während
stopwords:es:por, la, las, los, el, apto, para, con, de, verificado, certificado, aprovado, controlado, registrado, 100%, garantía, garantizado, garantizada, estándar, procedente
Expand Down Expand Up @@ -1348,6 +1349,11 @@ xx:FACE, Federación de Asociaciones de Celiacos de España
fr:Afdiag, Association Française des Intolérants au Gluten
xx:Afdiag, Association Française des Intolérants au Gluten

<en:No gluten
pt:Associação Portuguesa de Celíacos
label_categories:en: en:Specific diets
image:en:apc-novo-logo.178x90.png

en:Contains gluten
bg:Съдържа глутен
ca:Conté gluten
Expand Down Expand Up @@ -5091,6 +5097,9 @@ de:Nicht geeignet für Kinder unter 1 Jahr
it:Non adatto ai bambini sotto l'anno di età
pt:Não adequado para crianças menores de 1 ano

pt:Fundação Portuguesa de Cardiologia
label_categories:en: en:Specific diets

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
#
# O R G A N I C S E C T I O N
Expand Down Expand Up @@ -20314,7 +20323,9 @@ xx:Tidy man, tidyman
wikidata:en:Q3528198

en:Animal welfare
es:Bienestar animal
nl:Dierenwelzijn
pt:Bem-estar animal

<en:Animal welfare
en:Chicken welfare
Expand Down Expand Up @@ -22682,26 +22693,40 @@ xx:Eco-Score E
en:GLOBALG.A.P.
xx:GLOBALG.A.P., Global GAP

pt:Açores
country:en:Portugal
image:en:acores-certificado-pela-natureza.90x90.png

en:Portuguese protected product
pt:Produto protegido de Portugal
country:en:Portugal

pt:Carne Alentejana DOP, DOP Carne Alentejana, Carne Alentejana D.O.P., D.O.P. Carne Alentejana
country:en:Portugal

pt:Carne Arouquesa DOP, DOP Carne Arouquesa, Carne Arouquesa D.O.P., D.O.P. Carne Arouquesa
country:en:Portugal

pt:Carne Barrosã DOP, DOP Carne Barrosã, Carne Barrosã D.O.P., D.O.P. Carne Barrosã
country:en:Portugal

pt:Carne Chaneda da Peneda DOP, DOP Carne Chaneda da Peneda, Carne Chaneda da Peneda D.O.P., D.O.P. Carne Chaneda da Peneda
country:en:Portugal

pt:Carne da Charneca DOP, DOP Carne da Charneca, Carne da Charneca D.O.P., D.O.P. Carne da Charneca
country:en:Portugal

pt:Carne de Bísaro Transmontano DOP, DOP Carne de Bísaro Transmontano, Carne de Bísaro Transmontano D.O.P., D.O.P. Carne de Bísaro Transmontano
country:en:Portugal

pt:Carne de Porco Transmontano DOP, DOP Carne de Porco Transmontano, Carne de Porco Transmontano D.O.P., D.O.P. Carne de Porco Transmontano
country:en:Portugal

pt:Carne de Bravo do Ribatejo DOP, DOP Carne de Bravo do Ribatejo, Carne de Bravo do Ribatejo D.O.P., D.O.P. Carne de Bravo do Ribatejo
country:en:Portugal

pt:Carne de Bravo do Ribatejo DOP, DOP Carne de Bravo do Ribatejo, Carne de Bravo do Ribatejo D.O.P., D.O.P. Carne de Bravo do Ribatejo
country:en:Portugal

pt:Carne de Porco Alentejano DOP, DOP Carne de Porco Alentejano, Carne de Porco Alentejano D.O.P., D.O.P. Carne de Porco Alentejano

Expand All @@ -22723,7 +22748,7 @@ pt:Cabrito Transmontano DOP, DOP Cabrito Transmontano, Cabrito Transmontano D.O.

pt:Presunto do Alentejo DOP, DOP Presunto do Alentejo, Presunto do Alentejo D.O.P., D.O.P. Presunto do Alentejo, Paleta do Alentejo DOP, DOP Paleta do Alentejo, Paleta do Alentejo D.O.P., D.O.P. Paleta do Alentejo

Pt:Presunto de Barrancos DOP, DOP Presunto de Barrancos, Presunto de Barrancos D.O.P., D.O.P. Presunto de Barrancos, Paleta de Barrancos DOP, DOP Paleta de Barrancos, Paleta de Barrancos D.O.P., D.O.P. Paleta de Barrancos
pt:Presunto de Barrancos DOP, DOP Presunto de Barrancos, Presunto de Barrancos D.O.P., D.O.P. Presunto de Barrancos, Paleta de Barrancos DOP, DOP Paleta de Barrancos, Paleta de Barrancos D.O.P., D.O.P. Paleta de Barrancos

<pt:Denominação de Origem
<en:Portuguese protected product
Expand Down Expand Up @@ -22789,41 +22814,57 @@ pt:Lagoa DO, DO Lagoa, Denominação de Origem Lagoa, D.O. Lagoa
pt:Lagos DO, DO Lagos, Denominação de Origem Lagos, D.O. Lagos

pt:Portimão DO, DO Portimão, Denominação de Origem Portimão, D.O. Portimão
country:en:Portugal

pt:Tavira DO, DO Tavira, Denominação de Origem Tavira, D.O. Tavira
country:en:Portugal

pt:Algarve IG, IG Algarve, Indicação Geográfica Algarve, I.G. Algarve
country:en:Portugal

pt:Portalegre DOC, DOC Portalegre, Denominação de Origem Controlada Portalegre, D.O.C. Portalegre
country:en:Portugal

pt:Redondo DOC, DOC Redondo, Denominação de Origem Controlada Redondo, D.O.C. Redondo
country:en:Portugal

pt:DOC Beira Interior, Beira Interior DOC, Denominação de Origem Beira Interior, D.O.C. Beira Interior
country:en:Portugal

pt:IG Terras da Beira, Terras da Beira IG, Indicação Geográfica Terras da Beira, I.G. Terras da Beira
country:en:Portugal

pt:DOC Távora-Varosa, Távora-Varosa DOC, denominação de Origem Távora-Varosa, D.O.C. Távora-Varosa
country:en:Portugal

pt:DOC Borba, Borba DOC, Denominação de Origem Controlada Borba, D.O.C. Borba
country:en:Portugal

pt:DOC Reguengos, Reguengos DOC, Denominação de Origem Controlada Reguengos, D.O.C. Reguengos
country:en:Portugal

pt:DOC Setúbal, Setúbal DOC, Denominação de Origem Controlada Setúbal, D.O.C. Setúbal, Moscatel de Setúbal
country:en:Portugal

pt:DOC Vidigueira, Vidigueira DOC, Denominação de Origem Controlada Vidigueira, D.O.C. Vidigueira
country:en:Portugal

# Portuguese seal to promote Portuguese wines
pt:Wines of Portugal
country:en:Portugal

# Portuguese seal to promote Portuguese products
pt:Portugal Sou Eu
country:en:Portugal

# Portuguese seal to promote Portuguese products
pt:Compro que é Nosso, Made in Portugal Compro que é Nosso, Compro que é Nosso Made in Portugal
country:en:Portugal

<en:Animal welfare
es:Bienestar animal, Certificado Welfair, Animal Welfair
xx:Bienestar animal
en:Welfair certificate, Animal welfare Welfair certificate
es:Certificado Welfair, Certificado Welfair de Bienestar Animal
pt:Certificação Welfair, Certificação Welfair de bem-estar animal
label_categories:en: en:Animal welfare
description:en:Evaluates and monitors animal welfare quality on farms, in rearing areas and in slaughterhouses for bovine, porcine and ovine species as well as for hens, chickens, rabbits and turkeys.
image:es:bienestar-animal.62x90.png
Expand Down

0 comments on commit c62062b

Please sign in to comment.