diff options
| author | Alban Peignier | 2018-01-11 22:16:39 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-11 22:16:39 +0100 |
| commit | d01f7668bf8dca08fc34c7e27e87e6284070fbd7 (patch) | |
| tree | fb91cbfd19309b1d29e57a5b2a7d77de10dc39c8 | |
| parent | b488ef473da5d7bcc68e31c0a8ef6c7b318b70d1 (diff) | |
| parent | fe1fab5778bb93295e86ab96f89a2ea186ffc7cd (diff) | |
| download | chouette-core-d01f7668bf8dca08fc34c7e27e87e6284070fbd7.tar.bz2 | |
Merge pull request #232 from af83/5511-5512-stop-area-selector--change-area-type-labels-ZDEp-t
| -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 | 1 |
3 files changed, 2 insertions, 3 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..34ec3243d 100644 --- a/config/locales/area_types.en.yml +++ b/config/locales/area_types.en.yml @@ -6,4 +6,3 @@ en: zdlp: ZDLp zdlr: ZDLr lda: LDA - |