diff options
| author | Alban Peignier | 2018-01-11 21:43:22 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-01-11 22:03:34 +0100 |
| commit | 13de613c6db20e32f58ca16b5b3c58e79b5e8d70 (patch) | |
| tree | 99334c94543e6d7f13301b175dd3de48352a47fc /config | |
| parent | 1fd6d7d0cfb63b024860d1c29fca089432fce2e1 (diff) | |
| download | chouette-core-13de613c6db20e32f58ca16b5b3c58e79b5e8d70.tar.bz2 | |
Add Referential#merged_at and make Referentials archived and merged. Refs #5559
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/referentials.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/referentials.fr.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml index f41e35446..eb8eae98d 100644 --- a/config/locales/referentials.en.yml +++ b/config/locales/referentials.en.yml @@ -91,7 +91,7 @@ en: routing_constraint_zone: Routing constraint zone validity_period: "Inclusive validity period" updated_at: "Updated" - published_at: "Integrated" + merged_at: "Finalized" archived_at: "Archived" archived_at_null: "Unarchived" created_from: 'Created from' diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml index 0f6e71520..37af8a4eb 100644 --- a/config/locales/referentials.fr.yml +++ b/config/locales/referentials.fr.yml @@ -92,7 +92,7 @@ fr: validity_period: "Période de validité englobante" updated_at: "Edité le" created_at: "Créé le" - published_at: "Intégré le" + merged_at: "Finalisé le" archived_at: "Conservé" archived_at_null: "En préparation" created_from: 'Créé à partir de' |