Merge branch 'main' into moon-rabbitOFF-patch-7

Author: benbenben2

.github/workflows/pull_request.yml

@@ -89,6 +89,17 @@ jobs:
         restore-keys: taxonomies-
     - name: build
       run: make build container=backend
+    - name: Free disk space
+      run: |
+        echo "Before cleanup:"
+        df -h
+        docker system prune -f || true
+        sudo rm -rf /usr/local/lib/android || true
+        sudo rm -rf /opt/ghc || true
+        sudo rm -rf /usr/share/dotnet || true
+        sudo rm -rf /usr/local/share/boost || true
+        echo "After cleanup:"
+        df -h
     - name: push backend image as artifact
       uses: ishworkh/[email protected]
       with:

lib/ProductOpener/Food.pm

@@ -931,7 +931,8 @@ It is a list of nutrients names with eventual prefixes and suffixes:
 			'ammonium-chloride-', 'calcium-iodate-anhydrous-',
 			'cassia-gum-', 'choline-chloride-', 'copper-ii-sulphate-pentahydrate-',
 			'iron-ii-sulphate-monohydrate-', 'manganous-sulphate-monohydrate-',
-			'potassium-iodide-', 'sodium-selenite-', 'zinc-sulphate-monohydrate-'
+			'potassium-iodide-', 'sodium-selenite-', 'zinc-sulphate-monohydrate-',
+			'!energy-kj', '!energy-kcal', 'protein-value-'
 		)
 	]
 );

taxonomies/nutrients.txt

@@ -6978,6 +6978,7 @@ wikipedia:en: https://en.wikipedia.org/wiki/Glutathione
 # following nutrients are for pet food
 # https://eur-lex.europa.eu/eli/reg/2009/767/2018-12-26
 # I- analytical constituents
+# crude fat ~ similar to human food fat
 zz: crude fat
 xx: crude fat
 en: crude fat, Fat Content
@@ -7006,6 +7007,8 @@ sl: surove maščobe, Vsebnost maščob
 sv: råfett, fettinnehåll
 unit:en: %
 
+# crude protein ~ similar to human food protein
+# protein value ~ how much the animal can actually use
 zz: crude protein
 xx: crude protein
 en: crude protein
@@ -7203,3 +7206,33 @@ fr: chlorure de choline
 hr: kolin klorid
 unit:en: mg
 
+
+# crude protein ~ similar to human food protein
+# protein value ~ how much the animal can actually use
+zz: protein value
+xx: protein value
+en: protein value
+bg: Протеинова стойност
+cs: hodnota proteinu
+da: proteinværdi
+de: Eiweißwert, Proteinwert
+el: Πρωτεϊνική αξία
+es: Valor proteico
+et: valgusisaldusväärtus
+fi: proteiiniarvo
+fr: valeur protéique
+hr: proteinska vrijednost
+hu: fehérjeérték
+it: valore proteico
+lt: baltymų vertė
+lv: proteīna vērtība
+mt: valur tal-proteina
+nl: eiwitwaarde
+pl: wartość białka
+pt: valor proteico
+ro: valoare proteică
+ru: Протеиновая ценность
+sk: hodnota bielkovín
+sl: beljakovinska vrednost
+sv: proteinvärde
+unit:en: g/kg