From 23e905f37f6e9a111541e773581bd6e360f59b5f Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Thu, 11 Jan 2018 16:30:16 +0100
Subject: Change "ZDEp" label in StopArea drop-down to "ZDE"

The term ZDEp is STIF-specific. For the socle commun, we instead want to
use the generic term, which is ZDE.

This appears on the `Routes#new` page
(http://stif-boiv.dev:3000/referentials/4/lines/1857/routes/new).

Refs #5511
---
 app/views/autocomplete_stop_areas/around.rabl | 2 +-
 app/views/autocomplete_stop_areas/index.rabl  | 2 +-
 config/locales/area_types.en.yml              | 2 +-
 config/locales/area_types.fr.yml              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/autocomplete_stop_areas/around.rabl b/app/views/autocomplete_stop_areas/around.rabl
index bc8f06054..d067dc4d0 100644
--- a/app/views/autocomplete_stop_areas/around.rabl
+++ b/app/views/autocomplete_stop_areas/around.rabl
@@ -12,7 +12,7 @@ child @stop_areas, root: :features, object_root: false do
       name: s.name,
       short_name: truncate(s.name, :length => 30) || "",
       city_name: s.city_name,
-      area_type: s.area_type,
+      area_type: Chouette::AreaType.find(s.area_type).label,
       registration_number: s.registration_number,
       stoparea_id: s.id,
       text: "#{s.name}, #{s.zip_code} #{s.city_name}",
diff --git a/app/views/autocomplete_stop_areas/index.rabl b/app/views/autocomplete_stop_areas/index.rabl
index d20051ad5..c92b708f4 100644
--- a/app/views/autocomplete_stop_areas/index.rabl
+++ b/app/views/autocomplete_stop_areas/index.rabl
@@ -13,7 +13,7 @@ node do |stop_area|
   :user_objectid => stop_area.user_objectid,
   :longitude => stop_area.longitude,
   :latitude => stop_area.latitude,
-  :area_type => stop_area.area_type,
+  :area_type => Chouette::AreaType.find(stop_area.area_type).label,
   :comment => stop_area.comment,
   :text => stop_area.full_name
   }
diff --git a/config/locales/area_types.en.yml b/config/locales/area_types.en.yml
index 9f505c5e6..4b3915b84 100644
--- a/config/locales/area_types.en.yml
+++ b/config/locales/area_types.en.yml
@@ -1,7 +1,7 @@
 en:
   area_types:
     label:
-      zdep: ZDEp
+      zdep: ZDE
       zder: ZDEr
       zdlp: ZDLp
       zdlr: ZDLr
diff --git a/config/locales/area_types.fr.yml b/config/locales/area_types.fr.yml
index fd4e1e741..a2d46cb94 100644
--- a/config/locales/area_types.fr.yml
+++ b/config/locales/area_types.fr.yml
@@ -1,7 +1,7 @@
 fr:
   area_types:
     label:
-      zdep: ZDEp
+      zdep: ZDE
       zder: ZDEr
       zdlp: ZDLp
       zdlr: ZDLr
-- 
cgit v1.2.3


From 62a00fa48bac0686e80af5f3409a14a4c4877812 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Thu, 11 Jan 2018 17:31:33 +0100
Subject: Change "ZDLp" label in StopArea drop-down to "ZDL"

The term ZDLp is STIF-specific. For the socle commun, we instead want to
use the generic term, which is ZDL.

This appears on the `Routes#new` page
(http://stif-boiv.dev:3000/referentials/4/lines/1857/routes/new).

Refs #5512
---
 config/locales/area_types.en.yml | 2 +-
 config/locales/area_types.fr.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/area_types.en.yml b/config/locales/area_types.en.yml
index 4b3915b84..bd22313d4 100644
--- a/config/locales/area_types.en.yml
+++ b/config/locales/area_types.en.yml
@@ -3,7 +3,7 @@ en:
     label:
       zdep: ZDE
       zder: ZDEr
-      zdlp: ZDLp
+      zdlp: ZDL
       zdlr: ZDLr
       lda: LDA
 
diff --git a/config/locales/area_types.fr.yml b/config/locales/area_types.fr.yml
index a2d46cb94..25f27ab90 100644
--- a/config/locales/area_types.fr.yml
+++ b/config/locales/area_types.fr.yml
@@ -3,6 +3,6 @@ fr:
     label:
       zdep: ZDE
       zder: ZDEr
-      zdlp: ZDLp
+      zdlp: ZDL
       zdlr: ZDLr
       lda: LDA
-- 
cgit v1.2.3


From d981dcf30892a6c4f85d5c5f82b2f943a0f2577e Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Thu, 11 Jan 2018 22:14:46 +0100
Subject: Revert "Change "ZDLp" label in StopArea drop-down to "ZDL""

This reverts commit 62a00fa48bac0686e80af5f3409a14a4c4877812.
---
 config/locales/area_types.en.yml | 2 +-
 config/locales/area_types.fr.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/area_types.en.yml b/config/locales/area_types.en.yml
index bd22313d4..4b3915b84 100644
--- a/config/locales/area_types.en.yml
+++ b/config/locales/area_types.en.yml
@@ -3,7 +3,7 @@ en:
     label:
       zdep: ZDE
       zder: ZDEr
-      zdlp: ZDL
+      zdlp: ZDLp
       zdlr: ZDLr
       lda: LDA
 
diff --git a/config/locales/area_types.fr.yml b/config/locales/area_types.fr.yml
index 25f27ab90..a2d46cb94 100644
--- a/config/locales/area_types.fr.yml
+++ b/config/locales/area_types.fr.yml
@@ -3,6 +3,6 @@ fr:
     label:
       zdep: ZDE
       zder: ZDEr
-      zdlp: ZDL
+      zdlp: ZDLp
       zdlr: ZDLr
       lda: LDA
-- 
cgit v1.2.3


From fe1fab5778bb93295e86ab96f89a2ea186ffc7cd Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Thu, 11 Jan 2018 22:15:56 +0100
Subject: Keep ZDEp for stif i18n. Refs #5511

---
 config/locales/area_types.en.yml | 3 +--
 config/locales/area_types.fr.yml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/locales/area_types.en.yml b/config/locales/area_types.en.yml
index 4b3915b84..34ec3243d 100644
--- a/config/locales/area_types.en.yml
+++ b/config/locales/area_types.en.yml
@@ -1,9 +1,8 @@
 en:
   area_types:
     label:
-      zdep: ZDE
+      zdep: ZDEp
       zder: ZDEr
       zdlp: ZDLp
       zdlr: ZDLr
       lda: LDA
-
diff --git a/config/locales/area_types.fr.yml b/config/locales/area_types.fr.yml
index a2d46cb94..fd4e1e741 100644
--- a/config/locales/area_types.fr.yml
+++ b/config/locales/area_types.fr.yml
@@ -1,7 +1,7 @@
 fr:
   area_types:
     label:
-      zdep: ZDE
+      zdep: ZDEp
       zder: ZDEr
       zdlp: ZDLp
       zdlr: ZDLr
-- 
cgit v1.2.3