add messages for GTFS and Failed exports

3 files changed, 45 insertions, 19 deletions

diff --git a/Gemfile b/Gemfile
index d202bea05..b13e2f806 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,8 +22,8 @@ end
 gem "map_layers", "~> 0.0.4"
 gem "georuby-ext", :git => 'git://github.com/dryade/georuby-ext.git'
 
-gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
-#gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface' #, :path => '~/Projects/UserInterfaceDryade'
+#gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
+gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface' #, :path => '~/Projects/UserInterfaceDryade'
 gem 'json'
 gem 'cocoon'
 gem 'formtastic'
@@ -36,8 +36,8 @@ gem 'jquery-rails'
 gem "modernizr-rails", "~> 2.0.6"
 
 gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
-gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
-#gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
+#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
+gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
 gem 'acts_as_list', '0.1.6'
 
 #gem 'composite_primary_keys', '~> 5.0.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index 956bb290e..0fc692582 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,16 @@
 GIT
+  remote: git://chouette.dryade.priv/ninoxe
+  revision: 3362853a708f475464b6d3c8b42c905f3ade44a9
+  specs:
+    ninoxe (0.0.8)
+      GeoRuby
+      activerecord (>= 3.1.3)
+      acts_as_list (= 0.1.6)
+      composite_primary_keys (>= 4.1.2)
+      geokit
+      rails (>= 3.1.3)
+
+GIT
   remote: git://github.com/dnagir/database_cleaner.git
   revision: 0c0aa44f13ae392000a6f506b62d5d1602cb4e53
   branch: postgre_jruby_issue
@@ -48,20 +60,8 @@ GIT
       rgeo (~> 0.3.8)
 
 GIT
-  remote: git://github.com/dryade/ninoxe.git
-  revision: cc7981838537c5ffd277380de518eee42ee5bc86
-  specs:
-    ninoxe (0.0.8)
-      GeoRuby
-      activerecord (>= 3.1.3)
-      acts_as_list (= 0.1.6)
-      composite_primary_keys (>= 4.1.2)
-      geokit
-      rails (>= 3.1.3)
-
-GIT
-  remote: git://github.com/dryade/user-interface.git
-  revision: b05f55c444913061584e2b9bcbfb9c3b4b116a28
+  remote: git://sim.dryade.priv/user_interface
+  revision: f71b689a6be8ecbd3daf0803cd7cc8fe4dfc949f
   specs:
     user_interface (0.0.1)
       rails (> 3.1.0)
diff --git a/config/locales/exports.yml b/config/locales/exports.yml
index 4fa16d191..8744a9fde 100644
--- a/config/locales/exports.yml
+++ b/config/locales/exports.yml
@@ -22,9 +22,22 @@ en:
       completed: Completed export
       failed: Failed export
       undefined: %{key} undefined
+      EXPORT_ERROR: "Error durring export"
+      EXCEPTION : "Origin %{0}" 
       NEPTUNE_EXPORT: Neptune Export
       NEPTUNE_EXPORTED_LINE: "Line %{0} (%{1}) exported"
       NEPTUNE_EMPTY_LINE: "Line %{0} (%{1}) without valid vehicle journey : not exported"
+      GTFS_EXPORT: GTFS Export
+      GTFS_OK: Export GTFS terminated
+      GTFS_NO_LINE: No line to export
+      GTFS_MISSING_PARAMETER: "Missing parameter : %{0}"
+      GTFS_UNKNOWN_PARAMETER: "Unknown parameter : %{0}"
+      GTFS_FILE_ACCESS: "Unable to access file %{0}"
+      GTFS_EMPTY_TIMETABLE: "Timetable without date nor period %{0}"
+      GTFS_EMPTY_DATA: "No %{0} data to export"
+      GTFS_INVALID_DATA: "%{0} %{1} : invalid data %{2}=%{3}"
+      GTFS_MISSING_DATA: "%{0} %{1} : missing value for : %{2}"
+      CSV_EXPORT: CSV Export
     severities:
       info: Information
       ok: Ok
@@ -77,11 +90,24 @@ fr:
     messages:
       started: Export démarré
       completed: Export achevé avec succès
-      failed: Export interromptu
+      failed: Export interrompu
       undefined: %{key} non défini
+      EXPORT_ERROR: "Erreur lors de l'export"
+      EXCEPTION : "Cause %{0}" 
       NEPTUNE_EXPORT: Export Neptune
       NEPTUNE_EXPORTED_LINE: "Ligne %{0} (%{1}) exportée"
       NEPTUNE_EMPTY_LINE: "Ligne %{0} (%{1}) sans course valide : non exportée"
+      GTFS_EXPORT: Export GTFS
+      GTFS_OK: Export GTFS terminé
+      GTFS_NO_LINE: Pas de ligne à exporter
+      GTFS_MISSING_PARAMETER: "Paramètre %{0} manquant"
+      GTFS_UNKNOWN_PARAMETER: "Paramètre %{0} inconnu"
+      GTFS_FILE_ACCESS: "Accès au fichier %{0} impossible"
+      GTFS_EMPTY_TIMETABLE: "Calendier sans date ni periode %{0}"
+      GTFS_EMPTY_DATA: "Pas de donné de type %{0} à exporter"
+      GTFS_INVALID_DATA: "%{0} %{1} : attribut %{2}=%{3} invalide"
+      GTFS_MISSING_DATA: "%{0} %{1} : valeur manquante : %{2}"
+      CSV_EXPORT: Export CSV
     severities:
       info: Information
       ok: Ok