fix: set language of fields during init, fixes #6310 (#6311)

openfoodfacts · Jan 18, 2022 · 8c2886f · 8c2886f
1 parent 088c7bc
commit 8c2886f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/cgi/import_file_process.pl b/cgi/import_file_process.pl
@@ -110,7 +110,11 @@
 	delete $columns_fields_ref->{$field}{max};
 	delete $columns_fields_ref->{$field}{n};
 
-	$all_columns_fields_ref->{get_string_id_for_lang("no_language", normalize_column_name($field))} = $columns_fields_ref->{$field};
+	my $column_id = get_string_id_for_lang("no_language", normalize_column_name($field));
+
+	$all_columns_fields_ref->{$column_id} = $columns_fields_ref->{$field};
+
+	$log->debug("Field in columns_field_json", { field => $field, column_id => $column_id, value =>  $columns_fields_ref->{$field}}) if $log->is_debug();
 }
 
 defined $import_files_ref->{$file_id}{imports} or $import_files_ref->{$file_id}{imports} = {};

diff --git a/t/producers.t b/t/producers.t
@@ -18,7 +18,9 @@ init_fields_columns_names_for_lang("es");
 my @tests = (
 ["fr", "glucides", { field=>"carbohydrates_100g_value_unit"}],
 ["fr", "nom-produit", { field=>"product_name", lc=>"fr"}],
+["fr", "Nom du produit", {field => 'product_name', lc => 'fr'}],
 ["fr", "marque", { field=>"brands"}],
+["fr", "Liste des ingrédients", {field => 'ingredients_text', lc => 'fr'}],
 ["fr", "liste-ingredients", { field=>"ingredients_text", lc =>"fr"}],
 ["fr", "bio", { field=>"labels_specific", tag=>"Bio"}],
 
@@ -32,6 +34,10 @@ my @tests = (
 ["fr", "glucides-prepare-par-portion", { field=>"carbohydrates_prepared_serving_value_unit"}],
 ["fr", "fer-mg-par-portion", { field=>"iron_serving_value_unit", value_unit=>'value_in_mg'}],
 ["fr", "Fer (portion) mg", { field=>"iron_serving_value_unit", value_unit=>'value_in_mg'}],
+
+# Did not work following change to the nutrients taxonomy
+["fr", "Matières grasses / Lipides pour 100 g / 100 ml", {}],
+
 ["en", "energy-kj_prepared", { field=>"energy-kj_prepared_100g_value_unit", value_unit=>'value_in_kj'}],
 ["en", "energy-kcal_prepared", { field=>"energy-kcal_prepared_100g_value_unit", value_unit=>'value_in_kcal'}],
 ["en", "energy-kcal_prepared_value", { field=>"energy-kcal_prepared_100g_value_unit", value_unit=>'value'}],

diff --git a/templates/web/pages/import_file_select_format/import_file_select_format.tt.js b/templates/web/pages/import_file_select_format/import_file_select_format.tt.js
@@ -73,6 +73,9 @@ function init_select_field_option(col) {
 			if (columns_fields[column]["lc"]) {
 				selected_lc = columns_fields[column]["lc"];
 			}
+			else {
+				columns_fields[column]["lc"] = selected_lc;
+			}
 			\$('#select_field_option_lc_' + col).val(selected_lc);
 
 			// setup a select2 widget