diff options
| author | Michel Etienne | 2013-07-01 11:36:39 +0200 |
|---|---|---|
| committer | Michel Etienne | 2013-07-01 11:37:50 +0200 |
| commit | 6e4a709fd4ae7eb5aac1729b66da81a940caed46 (patch) | |
| tree | 91952fdc5cf46470d683eb35df60ea358c2ccaba | |
| parent | b7b58ecaa5589ed7c09868d81d33c4c282bac268 (diff) | |
| download | chouette-core-6e4a709fd4ae7eb5aac1729b66da81a940caed46.tar.bz2 | |
finalize removing projection from database
| -rw-r--r-- | app/helpers/stop_areas_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/access_points/show.html.erb | 4 | ||||
| -rw-r--r-- | app/views/stop_areas/show.html.erb | 2 | ||||
| -rw-r--r-- | config/locales/organisations.yml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/stop_areas_helper.rb b/app/helpers/stop_areas_helper.rb index 4a2f3f9a4..da29b2ec6 100644 --- a/app/helpers/stop_areas_helper.rb +++ b/app/helpers/stop_areas_helper.rb @@ -5,7 +5,7 @@ module StopAreasHelper end def show_map? - manage_itl || @stop_area.projection_type != nil || @stop_area.long_lat_type != nil + manage_itl || @stop_area.long_lat_type != nil end def manage_access_points diff --git a/app/views/access_points/show.html.erb b/app/views/access_points/show.html.erb index 7f34ed0e0..b7c8ba391 100644 --- a/app/views/access_points/show.html.erb +++ b/app/views/access_points/show.html.erb @@ -1,6 +1,6 @@ <%= title_tag t('access_points.show.title', :access_point => @access_point.name) %> <div class="access_point_show"> - <% if @access_point.projection_type != nil || @access_point.long_lat_type != nil %> + <% if @access_point.long_lat_type != nil %> <%= @map.to_html %> <% end %> <div class="summary"> @@ -53,7 +53,7 @@ <%= t((@access_point.lift_availability == true).to_s) %> </p> <p> <label><%= t('access_points.show.geographic_data') %> </label></p> - <% if @access_point.projection_type == nil && @access_point.long_lat_type == nil %> + <% if @access_point.long_lat_type == nil %> <span class='geo_data'><%= t('access_points.show.no_geographic_data') %></span> <% else %> <% if !@access_point.projection.nil? %> diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb index b98378d71..632036959 100644 --- a/app/views/stop_areas/show.html.erb +++ b/app/views/stop_areas/show.html.erb @@ -39,7 +39,7 @@ </p> <% if !manage_itl %> <p> <label><%= t('stop_areas.show.geographic_data') %> </label></p> - <% if @stop_area.projection_type == nil && @stop_area.long_lat_type == nil %> + <% if @stop_area.long_lat_type == nil %> <span class='geo_data'><%= t('stop_areas.show.no_geographic_data') %></span> <% else %> <% if !@stop_area.projection.nil? %> diff --git a/config/locales/organisations.yml b/config/locales/organisations.yml index 011e87966..e6b86d29d 100644 --- a/config/locales/organisations.yml +++ b/config/locales/organisations.yml @@ -15,7 +15,7 @@ en: fr: organisations: actions: - edit: "Mofifier votre organisation" + edit: "Modifier votre organisation" edit: title: "Modifier votre organisation" key_registered: "Clé enregistrée" |