Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Move file import logic to model

Browse source
This commit is contained in:
wvengen 2015-03-27 19:03:21 +01:00
parent 0d92007274
commit d5a7f6a074
3 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/locales/en.yml
View file

@ -355,12 +355,11 @@ en:
notice: "%{count} new articles were saved."
error_invalid: There are errors in articles
error_nosel: No articles selected
error_parse: "%{msg} ... in line %{line}"
error_update: 'An error occured when updating article ''%{article}'': %{msg}'
parse_upload:
notice: "%{count} articles were succesfully analysed."
notice: Articles are already up to date.
sync:
notice: Catalog is up to date
notice: Articles are already up to date.
shared_alert: "%{supplier} is not linked to an external database"
update_all:
notice: All articles and prices were updated.
@ -405,6 +404,7 @@ en:
model:
error_in_use: "%{article} can not be deleted because the article is part of a current order!"
error_nosel: You have selected no articles
error_parse: "%{msg} ... in line %{line}"
parse_upload:
body: "<p><i>Please verify the articles.</i></p> <p><i>Warning, at the moment there is no check for duplicate articles.</i></p>"
submit: Process upload