Use Chouette::Line#transport_mode. Fixes #1

4 files changed, 48 insertions, 45 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 4397ea7b3..13fa6df90 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://chouette.dryade.priv/ninoxe
-  revision: 96759cedfefcd6e54b0cc57aa9801d3483331b62
+  revision: ac0ec92e6d4b04972e969f20fe623781d787a5f0
   specs:
     chouette-ninoxe (0.0.8)
       GeoRuby
diff --git a/app/views/lines/_form.erb b/app/views/lines/_form.erb
index ddbffdf55..2329ca75d 100644
--- a/app/views/lines/_form.erb
+++ b/app/views/lines/_form.erb
@@ -15,7 +15,7 @@
     <%= form.input :company, :as => :select, :collection => Chouette::Company.all, :include_blank => false%>
     <%= form.input :published_name %>
     <%= form.input :number %>
-    <%= form.input :transport_mode_name, :as => :select, :collection => Chouette::TransportMode.definitions, :include_blank => false, :member_label => Proc.new { |a| t("#{a[0]}") }  %>
+    <%= form.input :transport_mode_name, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => false, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") }  %>
     <%= form.input :comment %>              
   <% end %>
 
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index 74ed626b0..c2bc9aa10 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -33,7 +33,7 @@
     </p>
     <p>
       <label><%= @line.human_attribute_name("transport_mode_name") %>: </label>
-      <%= @line.transport_mode_name %>
+      <%= t("transport_modes.label.#{@line.transport_mode}") %>
     </p>
     <p>
       <label><%= @line.human_attribute_name("comment") %>: </label>
diff --git a/config/locales/transport_modes.yml b/config/locales/transport_modes.yml
index 51bea6b00..0ed6944a0 100644
--- a/config/locales/transport_modes.yml
+++ b/config/locales/transport_modes.yml
@@ -1,44 +1,47 @@
 en:
-  unknown: unknown
-  air: Air
-  train: Train
-  long_distance_train: Long distance train
-  local_train: Local train
-  rapid_transit: Rapid transit
-  metro: Metro
-  tramway: Tramway
-  coach: Coach
-  bus: Bus
-  ferry: Ferry
-  waterborne: Waterborne
-  private_vehicle: Private vehicle
-  walk: Walk
-  trolley_bus: Trolleybus
-  bicycle: Bicycle
-  shuttle: Shuttle
-  taxi: Taxi
-  val: VAL
-  other: Other
-
+  transport_modes:
+    label:
+      unknown: unknown
+      air: Air
+      train: Train
+      long_distance_train: Long distance train
+      local_train: Local train
+      rapid_transit: Rapid transit
+      metro: Metro
+      tramway: Tramway
+      coach: Coach
+      bus: Bus
+      ferry: Ferry
+      waterborne: Waterborne
+      private_vehicle: Private vehicle
+      walk: Walk
+      trolley_bus: Trolleybus
+      bicycle: Bicycle
+      shuttle: Shuttle
+      taxi: Taxi
+      val: VAL
+      other: Other
+      
 fr:
-  unknown: Inconnu
-  air: Air
-  train: Train
-  long_distance_train: Train longue distance
-  local_train: Train local
-  rapid_transit: Lignes rapides
-  metro: Métro
-  tramway: Tramway
-  coach: Voiture
-  bus: Bus
-  ferry: Ferry
-  waterborne: Eau
-  private_vehicle: Véhicule privé
-  walk: Piéton
-  trolley_bus: Trolley bus
-  bicycle: Vélo
-  shuttle: Navette
-  taxi: Taxi
-  val: VAL
-  other: Autre
-  
\ No newline at end of file
+  transport_modes:
+    label:
+      unknown: Inconnu
+      air: Air
+      train: Train
+      long_distance_train: Train longue distance
+      local_train: Train local
+      rapid_transit: Lignes rapides
+      metro: Métro
+      tramway: Tramway
+      coach: Voiture
+      bus: Bus
+      ferry: Ferry
+      waterborne: Eau
+      private_vehicle: Véhicule privé
+      walk: Piéton
+      trolley_bus: Trolley bus
+      bicycle: Vélo
+      shuttle: Navette
+      taxi: Taxi
+      val: VAL
+      other: Autre