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

4 files changed, 83 insertions, 5 deletions

diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 20263f5c6..4d9b11b3c 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -1,6 +1,6 @@
 Apartment.configure do |config|
   # set your options (described below) here
-  config.excluded_models = ["Referential", "User", "Import", "ImportLogMessage", "Delayed::Backend::ActiveRecord::Job"]        # these models will not be multi-tenanted, but remain in the global (public) namespace
+  config.excluded_models = ["Referential", "User", "Import", "ImportLogMessage", "Export", "ExportLogMessage", "Delayed::Backend::ActiveRecord::Job"]        # these models will not be multi-tenanted, but remain in the global (public) namespace
 
   # Dynamically get database names to migrate
   config.database_names = lambda{ Referential.select(:slug).map(&:slug) }
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 72aca7e44..b93a3824f 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -3,3 +3,5 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
+
+ Mime::Type.register "application/zip", :zip
diff --git a/config/locales/exports.yml b/config/locales/exports.yml
new file mode 100644
index 000000000..74b7cd387
--- /dev/null
+++ b/config/locales/exports.yml
@@ -0,0 +1,79 @@
+en:
+  exports:
+    actions:
+      new: New export
+      destroy: Destroy
+      destroy_confirm: Are you sure you want destroy this export?
+      download: Download
+    new:
+      title: New export
+    index:
+      title: Exports
+    show:
+      report: Report
+    statuses:
+      pending: Pending
+      completed: Completed
+      failed: Failed
+  export_log_messages:
+    messages:
+      started: Started export
+      completed: Completed export
+      failed: Failed export
+    severities:
+      info: Information
+      warning: Warning
+      error: Error
+  activerecord:        
+    models:        
+      export:
+        zero:  export
+        one:   export
+        other: exports
+    attributes:
+      export:
+        status: Status
+      export_log_message:
+        created_at: Date
+        position: N.
+        full_message: Message
+fr:
+  exports:
+    actions:
+      new: Nouvel export
+      destroy: Supprimer cet export
+      destroy_confirm: Etes vous sûr de détruire cet export ?
+      download: Télécharger
+    new:
+      title: Nouvel export
+    index:
+      title: Exports
+    show:
+      report: Rapport
+    statuses:
+      pending: En cours
+      completed: Achevé
+      failed: Echoué
+  export_log_messages:
+    messages:
+      started: Export démarré
+      completed: Export achevé avec succès
+      failed: Export interromptu
+    severities:
+      info: Information
+      warning: Alerte
+      error: Erreur
+  activerecord:        
+    models:        
+      export: Export
+      neptune_export: 
+        zero:  Export Neptune
+        one:   Export Neptune
+        other: Exports Neptune
+    attributes:
+      export:
+        status: Status
+      export_log_message:
+        created_at: Date
+        position: "No"
+        full_message: Message
diff --git a/config/routes.rb b/config/routes.rb
index 6645ac927..ba4f29ab6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,8 +1,4 @@
 ChouetteIhm::Application.routes.draw do
-  get "imports/new"
-
-  get "imports/index"
-
   devise_for :users
 
   # The priority is based upon order of creation:
@@ -46,6 +42,7 @@ ChouetteIhm::Application.routes.draw do
     end
 
     resources :imports
+    resources :exports
 
     resources :companies, :stop_areas