Merge master

7 files changed, 20 insertions, 10 deletions

diff --git a/config/initializers/stif.rb b/config/initializers/stif.rb
index 1a896ba21..6a79cadc8 100644
--- a/config/initializers/stif.rb
+++ b/config/initializers/stif.rb
@@ -1,11 +1,9 @@
 Rails.application.config.to_prepare do
   Organisation.after_create do |organisation|
-    line_referential = LineReferential.find_by(name: "CodifLigne")
+    line_referential      = LineReferential.find_by(name: "CodifLigne")
     stop_area_referential = StopAreaReferential.find_by(name: "Reflex")
 
-    stif = Organisation.find_by(name: "STIF")
-
-    organisation.workbenches.find_or_create_by(name: "Gestion de l'offre", organisation: stif) do |workbench|
+    organisation.workbenches.find_or_create_by(name: "Gestion de l'offre") do |workbench|
       workbench.line_referential      = line_referential
       workbench.stop_area_referential = stop_area_referential
 
diff --git a/config/locales/area_types.fr.yml b/config/locales/area_types.fr.yml
index ddc0a8c56..b5b513368 100644
--- a/config/locales/area_types.fr.yml
+++ b/config/locales/area_types.fr.yml
@@ -5,4 +5,3 @@ fr:
       quay: "Quai"
       commercial_stop_point: "Arrêt commercial"
       stop_place: "Pôle d'échange"
-      itl: "ITL"
diff --git a/config/locales/enumerize.en.yml b/config/locales/enumerize.en.yml
index 2f865c9f1..b42f68003 100644
--- a/config/locales/enumerize.en.yml
+++ b/config/locales/enumerize.en.yml
@@ -85,7 +85,13 @@ en:
         cableway: Cableway
         funicular: Funicular
         other: Other
-
+    stop_area:
+        area_type:
+            zdep: ZDEp
+            zder: ZDEr
+            zdlp: ZDLp
+            zdlr: ZDLr
+            lda: LDA
     line:
       transport_mode:
         interchange: Interchange
diff --git a/config/locales/enumerize.fr.yml b/config/locales/enumerize.fr.yml
index 33a987359..ecfde38bd 100644
--- a/config/locales/enumerize.fr.yml
+++ b/config/locales/enumerize.fr.yml
@@ -84,7 +84,13 @@ fr:
         cableway: Téléphérique
         funicular: Funiculaire
         other: Autre
-
+    stop_area:
+        area_type:
+            zdep: ZDEp
+            zder: ZDEr
+            zdlp: ZDLp
+            zdlr: ZDLr
+            lda: LDA
     line:
       transport_mode:
         interchange: Interconnection
diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml
index 856dd6d15..b11c59bb1 100644
--- a/config/locales/journey_patterns.en.yml
+++ b/config/locales/journey_patterns.en.yml
@@ -11,6 +11,7 @@ en:
       destroy: "Remove this journey pattern"
       destroy_confirm: A"re you sure you want destroy this journey pattern ?"
       edit_route_sections: "Update route sections"
+      edit_journey_patterns_collection: "Edit journey patterns"
     new:
       title: "Add a new journey pattern"
     edit:
diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml
index 78860514a..83e77e474 100644
--- a/config/locales/journey_patterns.fr.yml
+++ b/config/locales/journey_patterns.fr.yml
@@ -11,6 +11,7 @@ fr:
       destroy: "Supprimer cette mission"
       destroy_confirm: "Etes vous sûr de vouloir détruire cette mission ?"
       edit_route_sections: "Modifier les sections de parcours"
+      edit_journey_patterns_collection: "Modifier les missions"
     new:
       title: "Ajouter une mission"
     edit:
diff --git a/config/routes.rb b/config/routes.rb
index b2d3922fa..99effe3e5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -101,10 +101,9 @@ ChouetteIhm::Application.routes.draw do
           get 'edit_boarding_alighting'
           put 'save_boarding_alighting'
         end
+        resource :journey_patterns_collection, :only => [:show, :update]
         resources :journey_patterns do
-          member do
-            get 'new_vehicle_journey'
-          end
+          get 'new_vehicle_journey', on: :member
           resource :route_sections_selector, path: 'sections' do
             post 'selection'
           end