diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-11 18:56:05 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-11 18:56:05 +0200 |
| commit | dfd6fd2551a9cc54e6b69d4f5d4d4aa328b9cc7a (patch) | |
| tree | 916cf36d9cd6d58e0c10e8711ee0c3f96c7bb221 /archaeological_operations/fixtures | |
| parent | 987f84ca3aec153a6a9179e2b51083d7afaa9337 (diff) | |
| parent | e3bdd4b6d2a32c010138e8f4581234d18cf51519 (diff) | |
| download | Ishtar-dfd6fd2551a9cc54e6b69d4f5d4d4aa328b9cc7a.tar.bz2 Ishtar-dfd6fd2551a9cc54e6b69d4f5d4d4aa328b9cc7a.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations/fixtures')
| -rw-r--r-- | archaeological_operations/fixtures/initial_data-fr.json | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/archaeological_operations/fixtures/initial_data-fr.json b/archaeological_operations/fixtures/initial_data-fr.json index 9f514a097..304f07a38 100644 --- a/archaeological_operations/fixtures/initial_data-fr.json +++ b/archaeological_operations/fixtures/initial_data-fr.json @@ -1970,22 +1970,22 @@ } }, { - "pk": 2, + "pk": 221, "model": "archaeological_operations.remaintype", "fields": { - "comment": "", + "comment": null, "available": true, - "txt_idx": "enclosure", + "txt_idx": "enclos", "label": "enclos" } }, { - "pk": 221, + "pk": 2, "model": "archaeological_operations.remaintype", "fields": { - "comment": null, + "comment": "", "available": true, - "txt_idx": "enclos", + "txt_idx": "enclosure", "label": "enclos" } }, @@ -2914,31 +2914,31 @@ } }, { - "pk": 3, + "pk": 2, "model": "archaeological_operations.relationtype", "fields": { "comment": "", "available": true, "tiny_label": "", - "label": "En relation diffuse avec", - "symmetrical": true, - "inverse_relation": null, + "label": "Comprise dans", + "symmetrical": false, + "inverse_relation": 1, "order": 1, - "txt_idx": "fuzzy_relation" + "txt_idx": "is_in" } }, { - "pk": 2, + "pk": 3, "model": "archaeological_operations.relationtype", "fields": { "comment": "", "available": true, - "tiny_label": null, - "label": "Est compris dans", - "symmetrical": false, - "inverse_relation": 1, + "tiny_label": "", + "label": "Relation diffuse", + "symmetrical": true, + "inverse_relation": null, "order": 1, - "txt_idx": "is_in" + "txt_idx": "fuzzy_relation" } }, { @@ -2992,7 +2992,7 @@ "comment": "Le rapport (unique) a \u00e9t\u00e9 re\u00e7u et d\u00e9pouill\u00e9.", "available": true, "txt_idx": "one_report_received_and_processed", - "order": 4, + "order": 5, "label": "Re\u00e7u et d\u00e9pouill\u00e9" } }, @@ -3003,7 +3003,7 @@ "comment": "Tous les rapports ont \u00e9t\u00e9 re\u00e7us mais n'ont pas \u00e9t\u00e9 encore d\u00e9pouill\u00e9s.", "available": true, "txt_idx": "received_and_processed", - "order": 4, + "order": 6, "label": "Re\u00e7us et d\u00e9pouill\u00e9s" } }, @@ -3014,8 +3014,8 @@ "comment": "Il n'existe pas de rapport pour cette op\u00e9ration.", "available": true, "txt_idx": "no-report", - "order": 4, + "order": 7, "label": "Rapport inexistant" } } -]
\ No newline at end of file +] |