added nitrate sulfate as suggestions in table

openfoodfacts · May 12, 2023 · e5a1ba2 · e5a1ba2
1 parent c78a458
commit e5a1ba2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/lib/ProductOpener/Food.pm b/lib/ProductOpener/Food.pm
@@ -396,7 +396,8 @@ sub assign_nid_modifier_value_and_unit ($product_ref, $nid, $modifier, $value, $
 			'glycemic-index-', 'water-hardness-',
 			'choline-', 'phylloquinone-',
 			'beta-glucan-', 'inositol-',
-			'carnitine-',
+			'carnitine-', 'sulphate-',
+			'nitrate-',
 		)
 	],
 	ca => [
@@ -457,7 +458,8 @@ sub assign_nid_modifier_value_and_unit ($product_ref, $nid, $modifier, $value, $
 			'nutrition-score-uk-', 'glycemic-index-',
 			'water-hardness-', 'choline-',
 			'phylloquinone-', 'beta-glucan-',
-			'inositol-', 'carnitine-',
+			'inositol-', 'carnitine-', 
+			'sulphate-', 'nitrate-',
 		)
 	],
 	ru => [
@@ -518,7 +520,8 @@ sub assign_nid_modifier_value_and_unit ($product_ref, $nid, $modifier, $value, $
 			'nutrition-score-uk-', 'glycemic-index-',
 			'water-hardness-', 'choline-',
 			'phylloquinone-', 'beta-glucan-',
-			'inositol-', 'carnitine-',
+			'inositol-', 'carnitine-', 
+			'sulphate-', 'nitrate-',
 		)
 	],
 	us => [
@@ -577,7 +580,8 @@ sub assign_nid_modifier_value_and_unit ($product_ref, $nid, $modifier, $value, $
 			'cocoa-', 'chlorophyl-',
 			'carbon-footprint-', 'carbon-footprint-from-meat-or-fish-',
 			'nutrition-score-fr-', 'nutrition-score-uk-',
-			'glycemic-index-', 'water-hardness-',
+			'glycemic-index-', 'water-hardness-', 
+			'sulfate-', 'nitrate-',
 		)
 	],
 	us_before_2017 => [
@@ -637,7 +641,8 @@ sub assign_nid_modifier_value_and_unit ($product_ref, $nid, $modifier, $value, $
 			'nutrition-score-uk-', 'glycemic-index-',
 			'water-hardness-', 'choline-',
 			'phylloquinone-', 'beta-glucan-',
-			'inositol-', 'carnitine-',
+			'inositol-', 'carnitine-', 
+			'sulfate-', 'nitrate-',
 		)
 	],
 	hk => [
@@ -650,6 +655,7 @@ sub assign_nid_modifier_value_and_unit ($product_ref, $nid, $modifier, $value, $
 			'vitamin-pp-', 'vitamin-b6-', 'vitamin-b9-', 'folates-',
 			'vitamin-b12-', '#minerals', 'calcium', 'potassium-',
 			'phosphorus-', 'iron', 'alcohol', 'nutrition-score-fr-',
+			'sulphate-', 'nitrate-',
 		)
 	],
 );

diff --git a/taxonomies/nutrients.txt b/taxonomies/nutrients.txt
@@ -4165,7 +4165,7 @@ wikipedia:en: https://en.wikipedia.org/wiki/Bicarbonate
 
 # SO4--
 zz:Sulphate
-en:Sulphate,Sulfate
+en:Sulphate, Sulfate
 xx:Sulphate
 af:Sulfaat
 ar:كبريتات
@@ -4242,12 +4242,12 @@ cv:Нитратсем
 da:Nitrat
 de:Nitrate
 eo:Nitrato
-# es:Nitrato # uncomment need to recreate expected_test_results for unit tests
+es:Nitrato
 et:Nitraadid
 eu:Nitrato
 fa:نیترات
 fi:Nitraatti
-# fr:Nitrate # uncomment need to recreate expected_test_results for unit tests
+fr:Nitrate
 fy:Nitraat
 ga:Níotráit
 gl:Nitrato