diff options
| author | Teddy Wing | 2018-01-11 16:30:16 +0100 |
|---|---|---|
| committer | Teddy Wing | 2018-01-11 18:05:35 +0100 |
| commit | 23e905f37f6e9a111541e773581bd6e360f59b5f (patch) | |
| tree | 6573aca4364e6fd1ae6222eaa9958d1fbe0ef98a | |
| parent | 6d89d20934e18fb5e39587dc1d9f7d3911648b46 (diff) | |
| download | chouette-core-23e905f37f6e9a111541e773581bd6e360f59b5f.tar.bz2 | |
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
| -rw-r--r-- | app/views/autocomplete_stop_areas/around.rabl | 2 | ||||
| -rw-r--r-- | app/views/autocomplete_stop_areas/index.rabl | 2 | ||||
| -rw-r--r-- | config/locales/area_types.en.yml | 2 | ||||
| -rw-r--r-- | 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 |