Merge remote-tracking branch 'origin/master' into 1726-WorkbenchImport-for-multi-Netex-import

21 files changed, 159 insertions, 53 deletions

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 88c02341b..19a919cc2 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -1,9 +1,9 @@
 # i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks
 
 # The "main" locale.
-base_locale: en
+base_locale: fr
 ## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
-# locales: [es, fr]
+locales: [en, fr]
 ## Reporting locale, default: en. Available: en, ru.
 # internal_locale: en
 
@@ -18,7 +18,6 @@ data:
     ## Default:
     - config/locales/%{locale}.yml
     ## More files:
-    - config/locales/*.%{locale}.yml
     - config/locales/**/*.%{locale}.yml
     ## Another gem (replace %#= with %=):
     # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
@@ -27,13 +26,12 @@ data:
   # `i18n-tasks normalize -p` will force move the keys according to these rules
   write:
     ## For example, write devise and simple form keys to their respective files:
-    - ['{devise}.*', 'config/locales/devise.%{locale}.yml']
-    - ['{simple_form}.*', 'config/locales/simple_form.%{locale}.yml']
+    - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']
     ## Catch-all default:
     - config/locales/%{locale}.yml
 
   ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
-  # router: convervative_router
+  # router: conservative_router
 
   yaml:
     write:
@@ -68,13 +66,18 @@ search:
     - app/assets/images
     - app/assets/fonts
     - app/assets/javascripts
+    - app/assets/videos
 
   ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
   ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.
-  # include: ["*.rb", "*.html.slim"]
+  # only: ["*.rb", "*.html.slim"]
 
-  ## Default scanner finds t() and I18n.t() calls.
-  # scanner: I18n::Tasks::Scanners::PatternWithScopeScanner
+  ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`.
+  # strict: true
+
+  ## Multiple scanners can be used. Their results are merged.
+  ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.
+  ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
 
 ## Google Translate
 # translation:
@@ -104,3 +107,16 @@ search:
 ## Ignore these keys completely:
 # ignore:
 #  - kaminari.*
+
+## Sometimes, it isn't possible for i18n-tasks to match the key correctly,
+## e.g. in case of a relative key defined in a helper method.
+## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.:
+#
+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#       only: %w(*.html.haml *.html.slim),
+#       patterns: [['= title\b', '.page_title']] %>
+#
+# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:
+#
+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#       patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>
diff --git a/config/locales/actions.en.yml b/config/locales/actions.en.yml
index cffd04fcf..f6979136a 100644
--- a/config/locales/actions.en.yml
+++ b/config/locales/actions.en.yml
@@ -4,6 +4,7 @@ en:
     destroy: "Destroy"
     delete: "Delete"
     search: "Search"
+    submit: "Submit"
     add: "Add new"
     new: "Add new"
     show: "See"
diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml
index f6c5ba852..cb1ede4c7 100644
--- a/config/locales/calendars.en.yml
+++ b/config/locales/calendars.en.yml
@@ -9,6 +9,19 @@ en:
       friday: F
       saturday: Sa
       sunday: Su
+    months:
+      1: January
+      2: February
+      3: March
+      4: April
+      5: May
+      6: June
+      7: July
+      8: August
+      9: September
+      10: October
+      11: November
+      12: December
     standard_calendars: Standard calendars
     standard_calendar: Standard calendar
     actions:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a6002175..b25f5fd7f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -14,6 +14,38 @@ en:
     formats:
       short: "%Y/%m/%d"
       short_with_time: "%Y/%m/%d at %Hh%M"
+    abbr_day_names:
+    - Sun
+    - Mon
+    - Tue
+    - Wed
+    - Thu
+    - Fri
+    - Sat
+    day_names:
+    - Sunday
+    - Monday
+    - Tuesday
+    - Wednesday
+    - Thursday
+    - Friday
+    - Saturday
+    month_names:
+    -
+    - January
+    - February
+    - March
+    - April
+    - May
+    - June
+    - July
+    - August
+    - September
+    - October
+    - November
+    - December
+  errors:
+    format: "%{message}"
 
   last_update: 'Last update on<br>%{time}'
   last_sync: 'Last sync on %{time}'
diff --git a/config/locales/enumerize.en.yml b/config/locales/enumerize.en.yml
index f76237288..0bc3e5edc 100644
--- a/config/locales/enumerize.en.yml
+++ b/config/locales/enumerize.en.yml
@@ -114,6 +114,7 @@ en:
       transport_mode:
         interchange: Interchange
         unknown: "unknown"
+        undefined: "undefined"
         air: "Air"
         train: "Train"
         long_distance_train: "Long distance train"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3d5dc4c2c..8ef183d91 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -14,6 +14,36 @@ fr:
     formats:
       short: "%d/%m/%Y"
       short_with_time: "%d/%m/%Y à %Hh%M"
+    abbr_day_names:
+    - dim
+    - lun
+    - mar
+    - mer
+    - jeu
+    - ven
+    - sam
+    day_names:
+    - dimanche
+    - lundi
+    - mardi
+    - mercredi
+    - jeudi
+    - vendredi
+    - samedi
+    month_names:
+    -
+    - janvier
+    - février
+    - mars
+    - avril
+    - mai
+    - juin
+    - juillet
+    - août
+    - septembre
+    - octobre
+    - novembre
+    - décembre
   errors:
     format: "%{message}"
 
@@ -25,3 +55,4 @@ fr:
 
   id_codif: 'ID Codifligne'
   id_reflex: 'ID Reflex'
+  objectid: 'ID'
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index a5eb0f969..b20f0f1da 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -7,6 +7,8 @@ en:
     index:
       title: "Imports"
       warning: ""
+    new:
+      title: "Imports"
     show:
       report: "Report"
       imported_file: "Original file"
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 8fe8817f5..933025c82 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -7,6 +7,8 @@ fr:
     index:
       title: "Imports"
       warning: ""
+    new:
+      title: "Imports"
     show:
       report: "Rapport"
       imported_file: "Fichier source"
diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml
index d4bd45129..9f89c9d46 100644
--- a/config/locales/mailers.en.yml
+++ b/config/locales/mailers.en.yml
@@ -4,6 +4,6 @@ en:
       created:
         subject: A new shared calendar has been created
         body: A new shared calendar% {cal_name} has been added by STIF. You can now view it in the list of shared calendars %{cal_index_url}
-      created:
+      updated:
         subject: A shared calendar has been updated
         body: A new shared calendar% {cal_name} has been updated by STIF. You can now view it in the list of shared calendars %{cal_index_url}
diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml
index 7a4c60869..5f39f03f4 100644
--- a/config/locales/referentials.en.yml
+++ b/config/locales/referentials.en.yml
@@ -1,6 +1,6 @@
 en:
   referentials:
-    filter:
+    filters:
       name_or_number_or_objectid: 'Search by name, number or objectid'
     search_no_results: 'No data space matching your query'
     index:
@@ -41,6 +41,7 @@ en:
       user_excluded: "%{user} is a reserved value"
       overlapped_referential: "%{referential} cover the same perimeter"
       overlapped_period: "Another period is on the same period"
+      short_period: Min period length is two days
   activerecord:
     models:
       referential:
diff --git a/config/locales/routes.en.yml b/config/locales/routes.en.yml
index d8160772f..3099d4ab1 100644
--- a/config/locales/routes.en.yml
+++ b/config/locales/routes.en.yml
@@ -84,9 +84,3 @@ en:
       hub:
         route:
           objectid: "[prefix]:Route:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 8."
-
-  # simpleform
-  helpers:
-    submit:
-      route:
-        create: 'Create route'
diff --git a/config/locales/routing_constraint_zones.en.yml b/config/locales/routing_constraint_zones.en.yml
index 59d4484a8..836705a6a 100644
--- a/config/locales/routing_constraint_zones.en.yml
+++ b/config/locales/routing_constraint_zones.en.yml
@@ -24,9 +24,6 @@ en:
   routing_constraint_zones:
     search_no_results: "No ITL matches your query"
     actions:
-      new: New routing constraint zone
-      edit: Edit this routing constraint zone
-      destroy: Delete this routing constraint zone
       destroy_confirm: Are you sure you want to delete this routing constraint zone?
     new:
       title: Add a new routings constraint zone
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index f6c0079ee..ad722312e 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -7,21 +7,11 @@ en:
     required:
       text: 'Required field'
       mark: '*'
-      # You can uncomment the line below if you need to overwrite the whole required html.
-      # When using html, text and mark won't be used.
-      # html: '<abbr title="required">*</abbr>'
     error_notification:
       default_message: "Please review the problems below:"
-    # Labels and hints examples
-    # labels:
-    #   defaults:
-    #     password: 'Password'
-    #   user:
-    #     new:
-    #       email: 'E-mail to sign in.'
-    #     edit:
-    #       email: 'E-mail.'
-    # hints:
-    #   defaults:
-    #     username: 'User name to sign in.'
-    #     password: 'No special characters, please.'
+
+  helpers:
+    submit:
+      create: Submit
+      edit: Edit
+      update: Edit
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 2a6893595..cd5dd1fbe 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -15,16 +15,3 @@ fr:
       create: Valider
       edit: Editer
       update: Editer
-    # Labels and hints examples
-    # labels:
-    #   defaults:
-    #     password: 'Password'
-    #   user:
-    #     new:
-    #       email: 'E-mail to sign in.'
-    #     edit:
-    #       email: 'E-mail.'
-    # hints:
-    #   defaults:
-    #     username: 'User name to sign in.'
-    #     password: 'No special characters, please.'
diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml
index 3d6b65350..324294892 100644
--- a/config/locales/stop_areas.en.yml
+++ b/config/locales/stop_areas.en.yml
@@ -1,6 +1,8 @@
 en:
   stop_areas: &en_stop_areas
     search_no_results: "No stop area matching your query"
+    errors:
+      empty: Aucun stop_area_id
     default_geometry_success: "%{count} modified stop areas"
     stop_area:
       no_position: "No Position"
@@ -90,6 +92,7 @@ en:
         registration_number: "Registration number"
         published_name: "Published name"
         deleted: "Deleted"
+        deleted_at: "Deleted at"
         comment: "Description"
         stop_area_type: "Area type"
         area_type: "Area type"
@@ -179,5 +182,6 @@ en:
           comment: "Maximum length = 255."
           coordinates: "Coordinates are mandatory."
           projection_xy: "x,y in secondary referential, dot for decimal separator"
+
   referential_stop_areas:
     <<: *en_stop_areas
diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml
index 3e49cdf7c..216516e5b 100644
--- a/config/locales/stop_areas.fr.yml
+++ b/config/locales/stop_areas.fr.yml
@@ -1,6 +1,8 @@
 fr:
   stop_areas: &fr_stop_areas
     search_no_results: "Aucun arrêt ne correspond à votre recherche"
+    errors:
+      empty: Aucun stop_area_id
     default_geometry_success: "%{count} arrêts édités"
     stop_area:
       no_position: "Pas de position"
@@ -14,6 +16,7 @@ fr:
       new: "Ajouter un arrêt"
       edit: "Editer cet arrêt"
       destroy: "Supprimer cet arrêt"
+      deleted_at: "Activé"
       destroy_confirm: "Etes vous sûr de supprimer cet arrêt ainsi que tous ses fils?"
       select_parent: "Créer ou éditer la relation enfant -> parent"
       add_children: "Créer ou éditer la relation parent -> enfants"
diff --git a/config/locales/time_tables.en.yml b/config/locales/time_tables.en.yml
index dc6c6d9f4..24750f0af 100644
--- a/config/locales/time_tables.en.yml
+++ b/config/locales/time_tables.en.yml
@@ -24,6 +24,8 @@ en:
       success: "Actualize succeded"
     new:
       title: "Add a new timetable"
+    duplicate:
+      title: "Duplicate timetable"
     edit:
       title: "Update timetable %{time_table}"
     show:
diff --git a/config/locales/workbenches.en.yml b/config/locales/workbenches.en.yml
new file mode 100644
index 000000000..8525a4b9f
--- /dev/null
+++ b/config/locales/workbenches.en.yml
@@ -0,0 +1,12 @@
+en:
+  workbenches:
+    index:
+      title: "%{organisation} dashboard"
+      offers:
+        title: "Transport offers"
+        organisation: "Organisation offers"
+        idf: "IDF offers"
+        referentials: "Referentials"
+        calendars: "Calendars"
+        see: "See the list"
+        no_content: "No content yet."
diff --git a/config/locales/workbenches.fr.yml b/config/locales/workbenches.fr.yml
new file mode 100644
index 000000000..1cdc19a13
--- /dev/null
+++ b/config/locales/workbenches.fr.yml
@@ -0,0 +1,12 @@
+fr:
+  workbenches:
+    index:
+      title: "Tableau de bord %{organisation}"
+      offers:
+        title: "Offres de transport"
+        organisation: "Offres de mon organisation"
+        idf: "Offres IDF"
+        referentials: "Jeux de données"
+        calendars: "Calendriers"
+        see: "Voir la liste"
+        no_content: "Aucun contenu pour le moment"
diff --git a/config/routes.rb b/config/routes.rb
index 686c19eff..0ed401cf5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,7 @@
 require 'sidekiq/web'
 
 ChouetteIhm::Application.routes.draw do
-  resources :workbenches, :only => [:show] do
+  resources :workbenches, only: [:show, :index] do
     delete :referentials, on: :member, action: :delete_referentials
     resources :imports do
       get :download, on: :member
@@ -14,7 +14,7 @@ ChouetteIhm::Application.routes.draw do
 
   devise_scope :user do
     authenticated :user do
-      root :to => 'referentials#index', as: :authenticated_root
+      root :to => 'workbenches#index', as: :authenticated_root
     end
 
     unauthenticated :user do
@@ -77,7 +77,7 @@ ChouetteIhm::Application.routes.draw do
     get :autocomplete, on: :collection, controller: 'autocomplete_calendars'
   end
 
-  resources :referentials do
+  resources :referentials, except: :index do
     resources :api_keys
     resources :autocomplete_stop_areas, only: [:show, :index] do
       get 'around', on: :member
@@ -214,7 +214,8 @@ ChouetteIhm::Application.routes.draw do
       end
     end
   end
-  root :to => "referentials#index"
+
+  root :to => "workbenches#index"
 
   get '/help/(*slug)' => 'help#show'
 
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
new file mode 100644
index 000000000..be0fceb30
--- /dev/null
+++ b/config/sidekiq.yml
@@ -0,0 +1,5 @@
+:concurrency: 5
+:pidfile: tmp/pids/sidekiq.pid
+:queues:
+  - default
+  - mailers