Merge branch 'main' into feat_add_quality_facet_nutrition_3_or_more_v…

…alues_are_identical
openfoodfacts · Feb 20, 2023 · cb9497f · cb9497f
2 parents f6c7505 + 95be960
commit cb9497f
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 107 deletions.
diff --git a/conf/nginx/sites-available/labelme b/conf/nginx/sites-available/labelme
diff --git a/lib/ProductOpener/DataQualityFood.pm b/lib/ProductOpener/DataQualityFood.pm
@@ -1001,7 +1001,7 @@ sub check_ingredients ($product_ref) {
 		($product_ref->{ingredients_text} =~ /\b(ingrédients|sucre|eau|sel|farine)\b/i) and $nb_languages++;
 		($product_ref->{ingredients_text} =~ /\b(sugar|salt|flour|milk)\b/i) and $nb_languages++;
 		($product_ref->{ingredients_text} =~ /\b(ingrediënten|suiker|zout|bloem)\b/i) and $nb_languages++;
-		($product_ref->{ingredients_text} =~ /\b(ingredientes|azucar|agua|sal|harina)\b/i) and $nb_languages++;
+		($product_ref->{ingredients_text} =~ /\b(azucar|agua|harina)\b/i) and $nb_languages++;
 		($product_ref->{ingredients_text} =~ /\b(zutaten|Zucker|Salz|Wasser|Mehl)\b/i) and $nb_languages++;
 		($product_ref->{ingredients_text} =~ /\b(açúcar|farinha|água)\b/i) and $nb_languages++;
 		($product_ref->{ingredients_text} =~ /\b(ingredienti|zucchero|farina|acqua)\b/i) and $nb_languages++;
@@ -1088,7 +1088,7 @@ sub check_ingredients ($product_ref) {
 				}
 
 				# Dutch and other languages can have 4 consecutive consonants
-				if ($display_lc !~ /de|nl/) {
+				if ($display_lc !~ /de|hr|nl/) {
 					if ($product_ref->{$ingredients_text_lc} =~ /[bcdfghjklmnpqrstvwxz]{5}/is) {
 
 						push @{$product_ref->{data_quality_warnings_tags}},

diff --git a/po/common/en.po b/po/common/en.po
@@ -2838,8 +2838,8 @@ msgid "Some of the data and/or photos for this product come from those sources:"
 msgstr "Some of the data and/or photos for this product come from those sources:"
 
 msgctxt "warning_not_complete"
-msgid "This product page is not complete. You can help to complete it by editing it and adding more data from the photos we have, or by taking more photos using the app for <a href=\"https://android.openfoodfacts.org\">Android</a> or <a href=\"https://ios.openfoodfacts.org\">iPhone/iPad</a>. Thank you!"
-msgstr "This product page is not complete. You can help to complete it by editing it and adding more data from the photos we have, or by taking more photos using the app for <a href=\"https://android.openfoodfacts.org\">Android</a> or <a href=\"https://ios.openfoodfacts.org\">iPhone/iPad</a>. Thank you!"
+msgid "This product page is not complete. You can help by editing it based on the photos we have, by taking more photos <a href=\"https://world.openfoodfacts.org/open-food-facts-mobile-app\">using the Android or iPhone/iPad app</a> or by <a href=\"https://world.pro.openfoodfacts.org\">signing up to our Platform for Producers</a> if relevant. Thank you!"
+msgstr "This product page is not complete. You can help by editing it based on the photos we have, by taking more photos <a href=\"https://world.openfoodfacts.org/open-food-facts-mobile-app\">using the Android or iPhone/iPad app</a> or, if you are the producer of this product, by <a href=\"https://world.pro.openfoodfacts.org\">signing up to our Platform for Producers</a>. Thank you!"
 
 msgctxt "title_separator"
 msgid " - "

diff --git a/scripts/gen_feeds_daily_obf.sh b/scripts/gen_feeds_daily_obf.sh
@@ -6,7 +6,7 @@ export PERL5LIB="../lib:${PERL5LIB}"
 ./remove_empty_products.pl
 ./compute_missions.pl
 ./export_database.pl
-./mongodb_dump.sh /srv/obf/html openbeautyfacts 10.0.0.2 obf
+./mongodb_dump.sh /srv/obf/html openbeautyfacts 10.0.0.3 obf
 
 cd /srv/obf/html/data
 gzip < en.openbeautyfacts.org.products.rdf > en.openbeautyfacts.org.products.rdf.gz

diff --git a/scripts/gen_feeds_daily_off.sh b/scripts/gen_feeds_daily_off.sh
@@ -10,7 +10,7 @@ export PERL5LIB="../lib:${PERL5LIB}"
 ./remove_empty_products.pl
 #./compute_missions.pl
 ./export_database.pl
-./mongodb_dump.sh /srv2/off/html openfoodfacts 10.0.0.2 off
+./mongodb_dump.sh /srv2/off/html openfoodfacts 10.0.0.3 off
 
 cd /srv2/off/html/data
 gzip < en.openfoodfacts.org.products.rdf > en.openfoodfacts.org.products.rdf.gz

diff --git a/scripts/gen_feeds_daily_opf.sh b/scripts/gen_feeds_daily_opf.sh
@@ -6,7 +6,7 @@ export PERL5LIB="../lib:${PERL5LIB}"
 ./remove_empty_products.pl
 ./compute_missions.pl
 ./export_database.pl
-./mongodb_dump.sh /srv/opf/html openproductsfacts 10.0.0.2 opf
+./mongodb_dump.sh /srv/opf/html openproductsfacts 10.0.0.3 opf
 
 cd /srv/opf/html/data
 gzip < en.openproductsfacts.org.products.rdf > en.openproductsfacts.org.products.rdf.gz

diff --git a/scripts/gen_feeds_daily_opff.sh b/scripts/gen_feeds_daily_opff.sh
@@ -6,7 +6,7 @@ export PERL5LIB="../lib:${PERL5LIB}"
 ./remove_empty_products.pl
 ./compute_missions.pl
 ./export_database.pl
-./mongodb_dump.sh /srv/opff/html openpetfoodfacts 10.0.0.2 opff
+./mongodb_dump.sh /srv/opff/html openpetfoodfacts 10.0.0.3 opff
 
 cd /srv/opff/html/data
 gzip < en.openpetfoodfacts.org.products.rdf > en.openpetfoodfacts.org.products.rdf.gz

diff --git a/taxonomies/categories.txt b/taxonomies/categories.txt
@@ -5449,6 +5449,11 @@ agribalyse_proxy_food_code:en:2074
 agribalyse_proxy_food_name:en:Apple juice, pure juice
 agribalyse_proxy_food_name:fr:Jus de pomme, pur jus
 
+<en:Apple juices
+en:Apple juices with less sugar
+fr:Jus de pomme avec moins de sucre
+nl:Appelsappen met minder suiker
+
 <en:Fruit juices
 en:Clementine juices
 bg:Сок от клементина
@@ -45877,6 +45882,22 @@ ciqual_food_name:en:Oat-based drink, plain
 ciqual_food_name:fr:Boisson à base d'avoine, nature
 wikidata:en:Q20972637
 
+<en:Oat milks
+en:Unsweetened natural oat milks
+fr:Boissons végétales d'avoine nature non sucrées
+
+<en:Oat milks
+en:Sweetened natural oat milks
+fr:Boissons végétales d'avoine nature sucrées
+
+<en:Oat milks
+en:Cocoa oat milks
+fr:Boissons végétales d'avoine au cacao
+
+<en:Oat milks
+en:Vanilla oat milks
+fr:Boissons végétales d'avoine à la vanille
+
 <en:Cereal milks
 en:Quinoa milks, Quinoa drinks
 de:Quinoamilch, Quinoamilche, Quinoamilchen, Quinoa-Drinks, Quinoa-Drink, Quinoadrink, Quinoadrinks
@@ -46627,7 +46648,7 @@ he:יוגורטים לשתייה
 hu:Ivójoghurtok, Iható joghurtok
 it:Yogurt da bere
 lt:Geriami jogurtai, Jogurto gėrimai
-nl:Drinkyoghurts
+nl:Drinkyoghurts, Yoghurtdranken
 pl:Jogurty pitne, Jogurt pitny, Jogurt do picia
 ru:Питьевые йогурты
 agribalyse_proxy_food_code:en:19508
@@ -50546,6 +50567,7 @@ es:Huevos
 fi:munat
 fr:Œufs, Oeufs, Œufs d'oiseau
 he:ביצים
+hr:jaja
 hu:Tojások
 it:Uova
 lt:Kiaušiniai, Paukščių kiaušiniai
@@ -50569,6 +50591,7 @@ de:Frische Eier, frische Hühnereier
 es:Huevos frescos
 fi:tuoreet munat
 fr:Œufs frais, Oeufs frais
+hr:svježih jaja
 it:Uova fresche
 lt:Švieži kiaušiniai
 nl:Verse eieren
@@ -72095,13 +72118,6 @@ lt:Salotos su daržovėmis
 nl:Groentesalade
 pl:Sałatki z warzywami
 
-<en:Plant-based foods
-en:Vegetable pasta
-es:Pasta de verduras
-fr:Pâtes de légumes
-lt:Daržovių makaronai
-nl:Groentenpasta, Groentenpaté
-
 <en:Vegetable paste
 en:Squash caviar, squash paste, zucchini caviar
 ru:Икра из кабачков, кабачковая икра
@@ -81635,7 +81651,7 @@ de:Eierspaghettis, Eierspaghetti
 es:Espaguetis de huevo
 fi:Munaspagetti
 fr:Spaghettis aux œufs, Spaghettis aux œufs frais
-nl:Eierspghettis
+nl:Eierspaghettis
 
 <en:Noodles
 en:Rice vermicelli

diff --git a/taxonomies/ingredients.txt b/taxonomies/ingredients.txt
@@ -19,7 +19,7 @@ stopwords:el:περιέχει
 stopwords:en:contains, contain, from, with, produced with, with added, minimum,including, inter alia, edible
 stopwords:es:contiene,de,del,la,el,las,los,con,y,e,en,minimo,maximo,puede,contener,por,categoria,calibre,minimo,min,vereidad,de cultivo,origen,nota,produccion,controlada
 stopwords:fi:sisältää,muun muassa,valio, koskenlaskija, snellmanin, jossa, noin, käymisen aikana muodostuva
-stopwords:fr:aux,au,de,le,du,la,a,et,avec,ou,en,proportion,variable, contient, élaboré avec, papier traité, minimum, filets tournants et filets, pour souleves,dont,avec,autres,d'autres,d', avec ajout, sachet
+stopwords:fr:aux,au,de,le,du,la,a,et,avec,ou,en,proportion,variable, contient, élaboré avec, papier traité, minimum, filets tournants et filets, pour souleves,dont,avec,autres,d'autres,d', avec ajout, sachet, marquants
 stopwords:hr:i, iz, min, od, sadrže, sastojci, sastav, u promjenjivim omjerima, u promjenjivim udjelima, u različitim omjerima
 stopwords:hu:tartalmaz, változó arányban, min, zsírtartalom, összetevő, összetétel, amelyből, amiből
 stopwords:id:mengandung
@@ -6648,7 +6648,7 @@ lv:biezpiens
 nb:kvarg
 nl:kwark, plattekaas
 nn:kvarg
-pl:Twaróg, twarogu, twarogowy, twarogowe, twarogowa
+pl:Twaróg, twarogu, twarogowy, twarogowe, twarogowa, ser twarogowy, serek twarogowy
 pt:quark
 ru:творог, творожный продукт
 sh:quark
@@ -6688,6 +6688,7 @@ de:Magerquark, Speisequark Magerstufe
 fr:séré maigre
 it:quark magro
 nl:magere kwark
+pl:twaróg odtłuszczony, ser twarogowy odtłuszczony, twarożek odtłuszczony, twaróg chudy, ser twarogowy chudy
 # ingredient/fr:séré-maigre has 33 products in 4 languages @2019-03-01
 
 <en:Quark
@@ -24450,7 +24451,7 @@ bg:бяло пшенично брашно тип 500, брашно тип 500,
 en:wheat flour type 550, flour type 550
 bg:бяло пшенично брашно тип 550
 de:Weizenmehl Type 550
-hr:pšenično brašno tip 550, pšenično brašno T-550, pšenično brašno T 550, pšenično brašno tip 550 glatko bijelo
+hr:pšenično brašno tip 550, pšenično brašno T-550, pšenično brašno T 550, pšenično brašno tip 550 glatko bijelo, brašno T-550
 
 <en:wheat flour
 en:wheat flour type 850 semi-white
@@ -25151,7 +25152,7 @@ ff:masarji
 fi:maissi
 fj:sila
 fo:mais
-fr:maïs, mais
+fr:maïs, mais, mais à pop-corn, mais à pop corn
 fy:stynske weet
 ga:arbhar indiach
 gd:cruithneachd-innseanach
@@ -27252,7 +27253,7 @@ de:Zucker mittelgross
 es:Azúcar cristalizado
 fi:kidesokeri
 fr:Sucre cristal
-hr:šećer bijeli kristal
+hr:šećer bijeli kristal, šećer kristal
 hu:kristálycukor
 it:Zucchero semolato
 nl:Kristalsuiker
@@ -39053,7 +39054,7 @@ fr:lait de noix de coco, lait de coco
 hr:kokosovo mlijeko
 it:latte di noce di cocco
 nb:kokosmelk
-nl:kokosmelk, kokosnootmelk
+nl:kokosmelk, kokosnootmelk, kokosroom
 pl:mleko kokosowe, mleczko kokosowe, mleka kokosowego, mleczka kokosowego
 pt:Leite de cocô
 ru:Кокосовое молоко
@@ -45087,6 +45088,7 @@ fi:Aloe vera -mehu
 fr:jus d’aloe vera
 it:succo di aloe vera
 nl:aloe vera sap
+pl:sok aloesowy, sok z aloesu
 # ingredient/aloe-vera-juice has 62 products in 5 languages @2019-02-03
 
 # no products @2019-02-03
@@ -52159,7 +52161,7 @@ da:hvide bønner
 de:weiße Bohnen
 es:Alubias blancas, judia blanca
 fi:valkoinen papu, valkoiset pavut
-fr:haricots blancs, lingots blancs, haricots lingots, cocos blancs, haricots blancs lingots, haricots coco blancs, haricots cocos blancs, haricots coco, haricots cocos, lingots
+fr:haricots blancs, lingots blancs, haricots lingots, cocos blancs, haricots blancs lingots, haricots coco blancs, haricots cocos blancs, haricots coco, haricots cocos, lingots, haricots blancs dits mogette
 it:Fagioli bianchi
 nb:hvite bønner
 nl:witte bonen
@@ -54834,6 +54836,7 @@ de:Walnusskerne
 es:nuez mondada
 fi:kuoreton saksanpähkinä, kuorettomat saksanpähkinät
 fr:cerneaux de noix
+hr:orah jezgra
 it:gherigli di noci, noci comuni
 nb:Valnøttkjerner
 nl:Gepelde walnoot, walnootpitten
@@ -55147,6 +55150,7 @@ ciqual_food_name:fr:Fenouil, graine
 en:chia
 es:chía negra
 la:Salvia hispanica
+pl:szałwia hiszpańska
 xx:chia
 wikidata:en:Q27688832
 # ingredient/chia has 430 products @2021-08-20
@@ -74791,6 +74795,7 @@ de:Röstkaffee gemahlen
 es:café tostado y molido
 fi:paahdettu kahvijauhe
 fr:café torréfié moulu, Café torréfié et moulu
+hr:pržene mljevene kave
 it:caffè torrefatto macinato
 nl:gemalen gebrande koffie, gebrande koffie gemalen, gebrande en gemalen koffie
 pt:café torrado moído
@@ -78912,6 +78917,11 @@ pt:Jodenkoek
 sv:Judebröd
 th:โยเดิงกุก
 
+#category:en: en:Pretzel
+en:bretzel
+fr:bretzel
+nl:pretzel
+
 #comment:en:not sure about the translations. Some prefer the pepper part, other the ginger-part. Need to split?
 #<en:compound
 en:gingerbread
@@ -82612,7 +82622,7 @@ et:tomatikaste
 eu:tomate saltsa
 fa:سس گوجه فرنگی
 fi:tomaattikastike
-fr:sauce tomate, préparation à base de tomates, préparation aux tomates
+fr:sauce tomate, préparation à base de tomates, préparation aux tomates, preparation a base de tomates cerise
 gl:Salsa de tomate
 gv:soolagh traase
 he:רוטב עגבניות

diff --git a/taxonomies/ingredients_processing.txt b/taxonomies/ingredients_processing.txt
@@ -46,7 +46,7 @@ ca:fresc, fresca, frescos, fresques
 de:frisch, frische, frischer, frisches
 es:fresco, fresca, frescos, frescas
 fr:frais, fraîche, fraiche, fraîches, fraiches
-hr:svježi
+hr:sviježi, svježi
 hu:friss
 it:fresco, fresca, fresche, freschi
 # de:frisch is found in front and in the ingredients
@@ -935,7 +935,7 @@ uk:сушена
 en:semi-dried
 de:halbgetrocknet, halbgetrocknete, halbgetrockneter, halbgetrocknetes, halb getrocknet
 es:semiseco
-fr:semi séché, semi-séchée, semi-séchés, semi-séchées
+fr:semi séché, semi-séchée, semi-séchés, semi-séchées, mi-séché, mi-séchée, mi-séchés, mi-séchées
 nl:halfgedroogd, halfgedroogde
 pt:semi-seco, semi-seca, semi-secos, semi-secas
 

diff --git a/taxonomies/nutrients.txt b/taxonomies/nutrients.txt
@@ -4599,7 +4599,7 @@ gu:લોખંડ
 gv:Yiarn
 he:ברזל
 hi:लोहा
-hr:Vas
+hr:vas, željezo
 ht:Fè
 hu:Vas
 hy:երկաթ