fix: add ingredients-original facet, start to split tagtype and taxon…

…omy (#9127)
openfoodfacts · Oct 10, 2023 · e081ec9 · e081ec9
1 parent d3754e2
commit e081ec9
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 97 deletions.
diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm
@@ -1520,6 +1520,7 @@ sub query_list_of_tags ($request_ref, $query_ref) {
 	add_country_and_owner_filters_to_query($request_ref, $query_ref);
 
 	my $groupby_tagtype = $request_ref->{groupby_tagtype};
+
 	my $page = $request_ref->{page};
 	# Flag that indicates whether we cache MongoDB results in Memcached
 	# Caching is disabled for crawling bots, as they tend to explore

diff --git a/lib/ProductOpener/Tags.pm b/lib/ProductOpener/Tags.pm
diff --git a/po/tags/en.po b/po/tags/en.po
@@ -134,6 +134,14 @@ msgctxt "ingredients:singular"
 msgid "ingredient"
 msgstr "ingredient"
 
+msgctxt "ingredients_original:plural"
+msgid "ingredients-original"
+msgstr "ingredients-original"
+
+msgctxt "ingredients_original:singular"
+msgid "ingredient-original"
+msgstr "ingredient-original"
+
 msgctxt "ingredients_from_palm_oil:plural"
 msgid "ingredients-from-palm-oil"
 msgstr "ingredients-from-palm-oil"
@@ -618,4 +626,4 @@ msgstr "nutri-score-2023"
 # Please do not translate nutri-score
 msgctxt "nutriscore_2023:singular"
 msgid "nutri-score-2023"
-msgstr "nutri-score-2023"
+msgstr "nutri-score-2023"
diff --git a/po/tags/tags.pot b/po/tags/tags.pot
@@ -159,6 +159,16 @@ msgctxt "ingredients:singular"
 msgid   "ingredient"
 msgstr  ""
 
+#. part of an url, put here the singular in your language, without caps, and by using hyphens instead of spaces
+msgctxt "ingredients_original:plural"
+msgid "ingredients-original"
+msgstr "ingredients-original"
+
+#. part of an url, put here the singular in your language, without caps, and by using hyphens instead of spaces
+msgctxt "ingredients_original:singular"
+msgid "ingredient-original"
+msgstr "ingredient-original"
+
 #. part of an url, put here the plural in your language, without caps, and by using hyphens instead of spaces
 msgctxt "ingredients_from_palm_oil:plural"
 msgid   "ingredients-from-palm-oil"
@@ -722,4 +732,4 @@ msgstr "nutri-score-2023"
 # Please do not translate nutri-score
 msgctxt "nutriscore_2023:singular"
 msgid "nutri-score-2023"
-msgstr "nutri-score-2023"
+msgstr "nutri-score-2023"
diff --git a/tests/integration/expected_test_results/page_crawler/get-robots-txt-ch-it.txt b/tests/integration/expected_test_results/page_crawler/get-robots-txt-ch-it.txt
@@ -63,6 +63,8 @@ Disallow: /ingredients-analysis
 Disallow: /ingredients-from-palm-oil
 Disallow: /number-of-ingredients
 Disallow: /numbers-of-ingredients
+Disallow: /ingredient-original
+Disallow: /ingredients-original
 Disallow: /ingredients-that-may-be-from-palm-oil
 Disallow: /known-nutrient
 Disallow: /known-nutrients

diff --git a/tests/integration/expected_test_results/page_crawler/get-robots-txt-fr-pro-platform.txt b/tests/integration/expected_test_results/page_crawler/get-robots-txt-fr-pro-platform.txt
@@ -107,6 +107,8 @@ Disallow: /number-of-ingredients
 Disallow: /numbers-of-ingredients
 Disallow: /nombre-d-ingredients
 Disallow: /nombres-d-ingredients
+Disallow: /ingredient-original
+Disallow: /ingredients-original
 Disallow: /ingredients-that-may-be-from-palm-oil
 Disallow: /ingredients-pouvant-etre-issus-de-l-huile-de-palme
 Disallow: /known-nutrient

diff --git a/tests/integration/expected_test_results/page_crawler/get-robots-txt-fr.txt b/tests/integration/expected_test_results/page_crawler/get-robots-txt-fr.txt
@@ -107,6 +107,8 @@ Disallow: /number-of-ingredients
 Disallow: /numbers-of-ingredients
 Disallow: /nombre-d-ingredients
 Disallow: /nombres-d-ingredients
+Disallow: /ingredient-original
+Disallow: /ingredients-original
 Disallow: /ingredients-that-may-be-from-palm-oil
 Disallow: /ingredients-pouvant-etre-issus-de-l-huile-de-palme
 Disallow: /known-nutrient

diff --git a/tests/integration/expected_test_results/page_crawler/get-robots-txt-world-pro-platform.txt b/tests/integration/expected_test_results/page_crawler/get-robots-txt-world-pro-platform.txt
@@ -63,6 +63,8 @@ Disallow: /ingredients-analysis
 Disallow: /ingredients-from-palm-oil
 Disallow: /number-of-ingredients
 Disallow: /numbers-of-ingredients
+Disallow: /ingredient-original
+Disallow: /ingredients-original
 Disallow: /ingredients-that-may-be-from-palm-oil
 Disallow: /known-nutrient
 Disallow: /known-nutrients

diff --git a/tests/integration/expected_test_results/page_crawler/get-robots-txt-world.txt b/tests/integration/expected_test_results/page_crawler/get-robots-txt-world.txt
@@ -63,6 +63,8 @@ Disallow: /ingredients-analysis
 Disallow: /ingredients-from-palm-oil
 Disallow: /number-of-ingredients
 Disallow: /numbers-of-ingredients
+Disallow: /ingredient-original
+Disallow: /ingredients-original
 Disallow: /ingredients-that-may-be-from-palm-oil
 Disallow: /known-nutrient
 Disallow: /known-nutrients