Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

6 files changed, 124 insertions, 0 deletions

diff --git a/config/locales/directions.yml b/config/locales/directions.yml
new file mode 100644
index 000000000..82b87673a
--- /dev/null
+++ b/config/locales/directions.yml
@@ -0,0 +1,31 @@
+en:
+  directions:
+    label:
+      straight_forward: straight forward
+      backward: backward
+      clockwise: clockwise
+      anti_clockwise: anticlockwise
+      north: north
+      north_west: north west
+      west: west
+      south_west: south west
+      south: south
+      south_east: south east
+      east: east
+      north_east: north east
+fr:
+  directions:
+    label:
+      straight_forward: aller
+      backward: retour
+      clockwise: sens horaire
+      anti_clockwise: sens anti horaire
+      north: nord
+      north_west: nord ouest
+      west: ouest
+      south_west: sud ouest
+      south: sud
+      south_east: sud est
+      east: est
+      north_east: nord est
+
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index a24422b9b..490a7b630 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -11,6 +11,7 @@ en:
       title: Update line %{line}
     show:
       title: Line %{line}
+      itineraries: "Line's route list"
     index:
       title: Lines
       name_or_number: Name or number
@@ -52,6 +53,7 @@ fr:
       title: Modifier la ligne %{line}
     show:
       title: Ligne %{line}
+      itineraries: "Liste des itinéraires de la ligne"
     index:
       name_or_number: Nom ou indice
       title: Lignes
diff --git a/config/locales/routes.yml b/config/locales/routes.yml
new file mode 100644
index 000000000..a4cd3a366
--- /dev/null
+++ b/config/locales/routes.yml
@@ -0,0 +1,77 @@
+en:
+  routes:
+    actions:
+      new: Add a new route
+      edit: Edit this route
+      destroy: Remove this route
+      destroy_confirm: Are you sure you want destroy this route?
+    new:
+      title: Add a new route
+    edit:
+      title: Update route %{route}
+    show:
+      title: Route %{route}
+      stop_areas: "Routes's stop areas list" 
+      no_opposite_route: No reversed route associated
+      undefined: Undefined
+    index:
+      title: Routes
+      selection: Selection
+      selection_all: All
+  activerecord:        
+    models:        
+      route: Route
+    attributes:
+      route:
+        line: Line
+        name: Name
+        published_name: Published name        
+        comment: Comments
+        number: Number
+        direction_code: Direction
+        wayback_code: Wayback
+        opposite_route: Reversed route
+        objectid: Neptune identifier
+        object_version: Version
+        creation_time: Created on
+        creator_id: Created by 
+
+fr:
+  routes:
+    actions:
+      new: Ajouter un itinéraire
+      edit: Modifier cet itinéraire
+      destroy: Supprimer cet itinéraire
+      destroy_confirm: Etes vous sûr de détruire cet itinéraire ?
+    new:
+      title: Ajouter un itinéraire
+    edit:
+      title: "Modifier l'itinéraire %{route}"
+    show:
+      title: Itinéraire %{route} de la ligne %{line}
+      stop_areas: "Liste des arrêts de l'itinéraire" 
+      no_opposite_route: Aucun itinéraire associé en sens opposé
+      undefined: Non défini
+    index:
+      title: Itinéraires
+      selection: Sélection
+      selection_all: Tous
+  activerecord:        
+    models:        
+      route: Itinéraire
+    attributes:
+      route:
+        line: Ligne
+        name: Nom
+        published_name: Nom public        
+        number: Indice
+        comment: Commentaire
+        direction_code: Direction
+        wayback_code: Sens
+        opposite_route: Itinéraire associé en sens opposé
+        objectid: Identifiant Neptune
+        object_version: Version
+        creation_time: Créé le
+        creator_id: Créé par
+
+
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index bc1254ac9..ca4751dbe 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -16,6 +16,7 @@ en:
       title: Stop %{stop_area}
       geographic_data: Geographic data 
       no_geographic_data: None
+      genealogical: Links between stop area
     index:
       title: Stop areas
       name_or_country_code: Name or Country code
@@ -69,6 +70,7 @@ fr:
       title: Arrêt %{stop_area}
       geographic_data: Données géographiques 
       no_geographic_data: Aucune
+      genealogical: Lien entre arrêts 
     index:
       name_or_country_code: Nom ou Code Postal
       title: Arrêts
diff --git a/config/locales/waybacks.yml b/config/locales/waybacks.yml
new file mode 100644
index 000000000..6891b844d
--- /dev/null
+++ b/config/locales/waybacks.yml
@@ -0,0 +1,11 @@
+en:
+  waybacks:
+    label:
+      straight_forward: straight forward
+      backward: backward
+fr:
+  waybacks:
+    label:
+      straight_forward: aller
+      backward: retour
+
diff --git a/config/routes.rb b/config/routes.rb
index df64353d0..4aaedc87b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,6 +17,7 @@ ChouetteIhm::Application.routes.draw do
   resources :referentials do
     resources :lines, :networks do
       resources :stop_areas
+      resources :routes
     end
 
     resources :companies, :stop_areas, :time_tables