aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAlban Peignier2018-03-15 10:17:57 +0100
committerGitHub2018-03-15 10:17:57 +0100
commitec7b83ebc22ea7355d49c4b4fac32ef3104a9622 (patch)
tree5fb93f87993eacdbac52ac57325a79066ae7b171 /config
parent9e1ad7402881a0ef47b949a3ad95ba39e6e65008 (diff)
parent3036b52aea082c12dec82d463936dae29643cb22 (diff)
downloadchouette-core-ec7b83ebc22ea7355d49c4b4fac32ef3104a9622.tar.bz2
Merge pull request #365 from af83/6033-stop-area-states
Enable stop area states. Refs #6033
Diffstat (limited to 'config')
-rw-r--r--config/locales/stop_areas.en.yml9
-rw-r--r--config/locales/stop_areas.fr.yml10
2 files changed, 11 insertions, 8 deletions
diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml
index 33722b60b..389f70c0c 100644
--- a/config/locales/stop_areas.en.yml
+++ b/config/locales/stop_areas.en.yml
@@ -110,8 +110,11 @@ en:
name: "Name"
registration_number: "Registration number"
published_name: "Published name"
- deleted: "Deleted"
- deleted_at: "Deleted at"
+ in_creation: "In creation"
+ confirmed: "Activated"
+ confirmed_at: "Activated at"
+ deleted: "Deactivated"
+ deleted_at: "Deactivated at"
comment: "Description"
stop_area_type: "Area type"
area_type: "Area type"
@@ -143,8 +146,6 @@ en:
coordinates: "Coordinates (lat,lng) WGS84"
zip_code: "Zip code"
city_name: "City"
- created_at: Created at
- updated_at: Updated at
waiting_time: Waiting time (minutes)
state: State
formtastic:
diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml
index 605e6158e..aee112be7 100644
--- a/config/locales/stop_areas.fr.yml
+++ b/config/locales/stop_areas.fr.yml
@@ -112,8 +112,12 @@ fr:
kind: "Catégorie"
registration_number: "Numéro d'enregistrement"
published_name: "Nom public"
- deleted: "Supprimé"
- deleted_at: "Activé"
+ in_creation: "En création"
+ confirmed: "Actif"
+ confirmed_at: "Activé le"
+ deleted: "Désactivé"
+ deactivated: "Désactivé"
+ deleted_at: "Désactivé le"
comment: "Commentaire"
stop_area_type: "Type d'arrêt"
area_type: "Type d'arrêt"
@@ -145,8 +149,6 @@ fr:
coordinates: "Coordonnées (lat,lng) WGS84"
zip_code: "Code postal"
city_name: "Commune"
- created_at: "Créé le"
- updated_at: "Edité le"
waiting_time: Temps de desserte (minutes)
state: État
formtastic: