diff options
| author | Marc Florisson | 2012-09-10 18:39:40 +0200 |
|---|---|---|
| committer | Marc Florisson | 2012-09-10 18:39:40 +0200 |
| commit | 3dbe700c50929b5430a2e95d1d43f3d0aa4a6862 (patch) | |
| tree | bdf5d394fe72da6a06e66d0456ef493c3fa6ba32 | |
| parent | 9d8f1101e80c3392f3030f0a3edd1a16b17a8c0c (diff) | |
| download | chouette-core-3dbe700c50929b5430a2e95d1d43f3d0aa4a6862.tar.bz2 | |
connection_link enhancement. Refs #117
| -rw-r--r-- | app/views/connection_links/_connection_link.erb | 19 | ||||
| -rw-r--r-- | config/locales/connection_links.yml | 8 |
2 files changed, 17 insertions, 10 deletions
diff --git a/app/views/connection_links/_connection_link.erb b/app/views/connection_links/_connection_link.erb index 7690fb18f..b3b44aed5 100644 --- a/app/views/connection_links/_connection_link.erb +++ b/app/views/connection_links/_connection_link.erb @@ -1,18 +1,19 @@ <%= div_for(connection_link) do %> - <%= link_to truncate(connection_link.name, :length => 30), [@referential, connection_link], :title => "Correspondance #{connection_link.name}" %> + <%= link_to truncate(connection_link.name, :length => 30), [@referential, connection_link], :title => "#{Chouette::TimeTable.model_name.human} #{connection_link.name}" %> <div class="info"> - <%= connection_link.human_attribute_name('departure') %> + <%= t('.from') %> <% if connection_link.departure.present? %> - <%= link_to_if connection_link.departure, connection_link.departure.name, referential_stop_area_path(@referential, connection_link.departure), :title => "#{connection_link.human_attribute_name('departure')} #{connection_link.departure.name}" %> + <%= link_to_if connection_link.departure, connection_link.departure.name, referential_stop_area_path(@referential, connection_link.departure), :title => "#{connection_link.human_attribute_name('departure')} #{connection_link.departure.name}" %> <% else %> - <%= connection_link.human_attribute_name("undefined") %> - <% end %><br> - <%= connection_link.human_attribute_name('arrival') %> + <%= connection_link.human_attribute_name('undefined') %> + <% end %> + <%= t('.to') %> <% if connection_link.arrival.present? %> - <%= link_to_if( connection_link.arrival, connection_link.arrival.name, referential_stop_area_path(@referential, connection_link.arrival), :title => "#{connection_link.human_attribute_name('arrival')} #{connection_link.arrival.name}" ) %> + <%= link_to_if( connection_link.arrival, connection_link.arrival.name, referential_stop_area_path(@referential, connection_link.arrival), :title => "#{connection_link.human_attribute_name('arrival')} #{connection_link.arrival.name}" ) %> <% else %> - <%= connection_link.human_attribute_name("undefined") %> - <% end %> + <%= connection_link.human_attribute_name("undefined") %> + <% end %> - + <%= connection_link.human_attribute_name('default_duration').capitalize %>: <%= connection_link.default_duration ? connection_link.default_duration.strftime('%Mm %Ss') : connection_link.human_attribute_name("undefined") %> <div class="actions"> <%= link_to t("actions.edit"), edit_referential_connection_link_path(@referential, connection_link), :class => "edit" %> | diff --git a/config/locales/connection_links.yml b/config/locales/connection_links.yml index 6c7426f82..fb9b98ba4 100644 --- a/config/locales/connection_links.yml +++ b/config/locales/connection_links.yml @@ -13,6 +13,9 @@ en: show: title: Connection link %{connection_link} durations: "Durations (hh mm ss):" + connection_link: + from: From + to: to index: title: Connection links name: Name @@ -73,7 +76,10 @@ fr: title: Modifier la correspondance %{connection_link} show: title: Correspondance %{connection_link} - durations: "Durées (hh mm ss) :" + durations: "Durées (hh mm ss) :" + connection_link: + from: De + to: vers index: name: Nom title: Correspondances |