Merge branch 'master' into staging

8 files changed, 20 insertions, 3 deletions

diff --git a/config/deploy.rb b/config/deploy.rb
index 78def7de7..0445ec480 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -12,7 +12,7 @@ set :group_writable, true
 set :bundle_cmd, "/var/lib/gems/2.2.0/bin/bundle"
 set :rake, "#{bundle_cmd} exec /var/lib/gems/2.2.0/bin/rake"
 
-set :keep_releases, 5
+set :keep_releases, -> { fetch(:kept_releases, 5) }
 after "deploy:restart", "deploy:cleanup"
 
 set :rails_env, -> { fetch(:stage) }
diff --git a/config/deploy/dev.rb b/config/deploy/dev.rb
index 400f1d787..5150311e9 100644
--- a/config/deploy/dev.rb
+++ b/config/deploy/dev.rb
@@ -1 +1,2 @@
 server "stif-boiv-dev.af83.priv", :app, :web, :db, :primary => true
+set :kept_releases, 2
diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml
index 26ca913b6..f6c5ba852 100644
--- a/config/locales/calendars.en.yml
+++ b/config/locales/calendars.en.yml
@@ -18,6 +18,7 @@ en:
       destroy_confirm: Are you sure you want destroy this calendar?
     errors:
       overlapped_periods: Another period is overlapped with this period
+      short_period: A period needs to last at least two days
     index:
       title: Calendars
       all: All
@@ -57,3 +58,4 @@ en:
             dates:
               date_in_date_ranges: A date can not be in Dates and in Date ranges.
               date_in_dates: A date can appear only once in the list of dates.
+              illegal_date: The date %{date} does not exist.
diff --git a/config/locales/calendars.fr.yml b/config/locales/calendars.fr.yml
index fe16cbfed..1b403c3f2 100644
--- a/config/locales/calendars.fr.yml
+++ b/config/locales/calendars.fr.yml
@@ -31,6 +31,7 @@ fr:
       destroy_confirm: Etes vous sûr de supprimer cet calendrier ?
     errors:
       overlapped_periods: Une autre période chevauche cette période
+      short_period: Une période doit être d'un duréé de deux jours minimum
     index:
       title: Calendriers
       all: Tous
@@ -70,3 +71,4 @@ fr:
             dates:
               date_in_date_ranges: Une même date ne peut pas être incluse à la fois dans la liste et dans les intervalles de dates.
               date_in_dates: Une même date ne peut pas être incluse plusieurs fois dans la liste.
+              illegal_date: La date %{date} n'existe pas.
diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml
index d62d79e58..80adc2337 100644
--- a/config/locales/journey_patterns.en.yml
+++ b/config/locales/journey_patterns.en.yml
@@ -24,6 +24,12 @@ en:
     form:
       warning: "Be careful, selection is also applied to the %{count} vehicle journeys associated to this journey pattern"
   activerecord:
+    errors:
+      models:
+        journey_pattern:
+          attributes:
+            stop_points:
+              minimum: 'Must at least have two stop points'
     models:
       journey_pattern:
         zero:  "journey pattern"
diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml
index 39005e464..0dceb2f43 100644
--- a/config/locales/journey_patterns.fr.yml
+++ b/config/locales/journey_patterns.fr.yml
@@ -24,6 +24,12 @@ fr:
     form:
       warning: "Attention, la sélection s'applique aussi aux %{count} courses de la mission"
   activerecord:
+    errors:
+      models:
+        journey_pattern:
+          attributes:
+            stop_points:
+              minimum: 'Une mission doit avoir au minimum deux arrêts'
     models:
       journey_pattern:
         zero:  "mission"
diff --git a/config/locales/routes.en.yml b/config/locales/routes.en.yml
index 718521c51..d8160772f 100644
--- a/config/locales/routes.en.yml
+++ b/config/locales/routes.en.yml
@@ -58,7 +58,7 @@ en:
         comment: "Comments"
         number: "Number"
         direction: "Direction"
-        wayback: "Wayback"
+        wayback: "Direction"
         stop_points: "Nb Stop points"
         opposite_route: "Reversed route"
         opposite_route_id: "Reversed route"
diff --git a/config/locales/routes.fr.yml b/config/locales/routes.fr.yml
index 67e538be4..0af2832a2 100644
--- a/config/locales/routes.fr.yml
+++ b/config/locales/routes.fr.yml
@@ -58,7 +58,7 @@ fr:
         number: "Indice"
         comment: "Commentaire"
         direction: "Direction"
-        wayback: "Sens"
+        wayback: "Direction"
         stop_points: "Nb arrêts"
         journey_patterns: "Nb missions"
         opposite_route: "Itinéraire associé"