raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3080 from Matt-Yorkley/pi/french_issue

Browse Source 
Pi/french issue
This commit is contained in:
Pau Pérez Fabregat
2018-11-28 13:39:04 +01:00
committed by GitHub
parent 5c8a638320 b3a9b502fa
commit 438cff6e6d
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/product_import/product_importer.rb
View File

@@ -100,7 +100,8 @@ module ProductImport
entries[entry.line_number] = {
attributes: entry.displayable_attributes,
validates_as: entry.validates_as,
errors: entry.invalid_attributes
errors: entry.invalid_attributes,
product_validations: entry.product_validations
}
end
entries.to_json

2
app/views/admin/product_import/_errors_list.html.haml
View File

@@ -7,3 +7,5 @@
( {{entry.attributes.display_name}} )
%p.error{ng: {repeat: "(attribute, error) in entry.errors", show: "ignore_fields.indexOf(attribute) < 0" }}
&nbsp;-&nbsp; {{error}}
%p.error{ng: {repeat: "(attribute, error) in entry.product_validations"}}
&nbsp;-&nbsp; {{error}}

1
config/locales/en.yml
View File

@@ -2395,6 +2395,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
validation_msg_relationship_already_established: "^That relationship is already established."
validation_msg_at_least_one_hub: "^At least one hub must be selected"
validation_msg_product_category_cant_be_blank: "^Product Category cant be blank"
validation_msg_tax: "^Tax Category is required"
validation_msg_tax_category_cant_be_blank: "^Tax Category can't be blank"
validation_msg_is_associated_with_an_exising_customer: "is associated with an existing customer"
content_configuration_pricing_table: "(TODO: Pricing table)"