diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-26 20:52:11 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-26 20:52:11 +0100 |
| commit | f72f7d90893b4f4ae0e000563b7c20faeefc8f18 (patch) | |
| tree | 8c8f06c9fb974edde62e82875f7a1b8aad49d7c3 /archaeological_operations/import_from_csv.py | |
| parent | 90b20a15bd6bf4f7808957bb8820f10f0d66d5e8 (diff) | |
| parent | 0cd8904defe334ad5307e6ab3ce13638479815a8 (diff) | |
| download | Ishtar-f72f7d90893b4f4ae0e000563b7c20faeefc8f18.tar.bz2 Ishtar-f72f7d90893b4f4ae0e000563b7c20faeefc8f18.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations/import_from_csv.py')
| -rw-r--r-- | archaeological_operations/import_from_csv.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py index 714825ff4..45faae632 100644 --- a/archaeological_operations/import_from_csv.py +++ b/archaeological_operations/import_from_csv.py @@ -403,18 +403,18 @@ def import_operations_csv(values, col_defs=OPE_COLS, update=True, person=None, errors = [] if error_ope: - error = "Error while recording theses operations:\n" + error = "Error while recording these operations:\n" for line_idx, args in error_ope: error += "line: " + str(line_idx) + " args: " + str(args) + '\n' errors.append(error) if error_multis: - error = "Error while recording theses multiples items attached to "\ + error = "Error while recording these multiples items attached to "\ "operation:" for line_idx, args in error_multis: error += "line: " + str(line_idx) + " args: " + str(args) + '\n' errors.append(error) if error_reversed: - error = "Error while recording theses items that depend to operation:" + error = "Error while recording these items that depend to operation:" for line_idx, args in error_reversed: error += "line: " + str(line_idx) + " args: " + str(args) + '\n' errors.append(error) |