diff options
| author | Michel Etienne | 2012-05-09 15:50:57 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-05-09 15:50:57 +0200 |
| commit | aaf10a59670accb247143e23fa8db01d4be99cd4 (patch) | |
| tree | 80e5c713de3e7bf33d3cf8bb8ccd8fecaa3c27a7 | |
| parent | a618d5f446d878c36feedfe2b09de2f5955d7aad (diff) | |
| download | chouette-core-aaf10a59670accb247143e23fa8db01d4be99cd4.tar.bz2 | |
show stoparea with parent and label for edit connectionlink stops
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | app/views/stop_areas/show.html.erb | 2 | ||||
| -rw-r--r-- | config/locales/connection_links.yml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 885ab6c40..c9ee1d76d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: 7b50dc7b0e18cebee2e0073f58a65730e05ca44a + revision: 4ed1a1a817d4997bff2dc9e5cf75dcaf207bce75 specs: ninoxe (0.0.8) GeoRuby diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb index 0f41b3578..f558d7c9b 100644 --- a/app/views/stop_areas/show.html.erb +++ b/app/views/stop_areas/show.html.erb @@ -91,7 +91,7 @@ <% if @stop_area.parent.present? %> <div class="parent"> <%= link_to([@referential, @stop_area.parent]) do %> - <%= image_tag "map/" + @stop_area.parent.type + ".png" %><span><%= @stop_area.parent.name %></span> + <%= image_tag "map/" + @stop_area.parent.stop_area_type + ".png" %><span><%= @stop_area.parent.name %></span> <% end %> <%= link_to image_tag("user_interface/ui/remove.png"), referential_stop_area_path(@referential, @stop_area.parent), :method => :delete, :confirm => t('stop_areas.actions.destroy_confirm'), :class => "remove" %> </div> diff --git a/config/locales/connection_links.yml b/config/locales/connection_links.yml index 387a205be..09ccfebe1 100644 --- a/config/locales/connection_links.yml +++ b/config/locales/connection_links.yml @@ -3,11 +3,11 @@ en: actions: new: Add a new connection link edit: Edit this connection link - destroy: Remove this liconnection linkne + destroy: Remove this connection link destroy_confirm: Are you sure you want destroy this connection link? select_departure: Select start of link select_arrival: Select end of link - select_areas: "Select stop areas" + select_areas: "Select start/end of link" new: title: Add a new connection link edit: @@ -66,7 +66,7 @@ fr: destroy_confirm: Etes vous sûr de détruire cette correspondance ? select_departure: "Sélectionner l'arrêt de départ" select_arrival: "Sélectionner l'arrêt d'arrivée" - select_areas: "Sélectionner les arrêts" + select_areas: "Sélectionner les départ/arrivée" new: title: Ajouter une correspondance edit: |