refactor export reports

3 files changed, 21 insertions, 7 deletions

diff --git a/Gemfile b/Gemfile
index da1a72974..11dc7d562 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,8 @@ gem 'inherited_resources'
 gem 'will_paginate', '~> 3.0'
 gem 'ransack'
 gem 'squeel'
-gem 'ninoxe', '0.1.1'
+#gem 'ninoxe', '0.1.1'
+gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
 gem 'acts_as_list', '0.1.6'
 gem "acts_as_tree-1.8", '1.1.0', :require => "acts_as_tree"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index da760a109..c9f3b20c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,13 @@
+GIT
+  remote: git://github.com/dryade/ninoxe.git
+  revision: 7d9a16621e075a684886f7ab5723e0b2e25ba45c
+  specs:
+    ninoxe (0.1.1)
+      activerecord (>= 3.1.3)
+      acts_as_list (= 0.1.6)
+      foreigner (= 1.4.0)
+      georuby-ext (= 0.0.2)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -180,11 +190,6 @@ GEM
     net-ssh (2.6.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    ninoxe (0.1.1)
-      activerecord (>= 3.1.3)
-      acts_as_list (= 0.1.6)
-      foreigner (= 1.4.0)
-      georuby-ext (= 0.0.2)
     nokogiri (1.5.9)
     nokogiri (1.5.9-java)
     open4 (1.3.0)
@@ -343,7 +348,7 @@ DEPENDENCIES
   launchy
   map_layers (= 0.0.4)
   modernizr-rails (~> 2.0.6)
-  ninoxe (= 0.1.1)
+  ninoxe!
   pg (~> 0.11.0)
   rabl
   rails (= 3.2.6)
diff --git a/config/locales/exports.yml b/config/locales/exports.yml
index fcfd5ef51..9efa68667 100644
--- a/config/locales/exports.yml
+++ b/config/locales/exports.yml
@@ -23,8 +23,12 @@ en:
       completed: Completed export
       failed: Failed export
       undefined: "%{key} undefined"
+      EXPORT: %{0} Export
+      EXPORTED_LINE: "Line %{0} (%{1}) exported"
+      EMPTY_LINE: "Line without valid vehicle journey : not exported"
       EXPORT_ERROR: "Error durring export"
       EXCEPTION: "Origin %{0}" 
+      # old report for backward compatibility
       NEPTUNE_EXPORT: Neptune Export
       NEPTUNE_EXPORTED_LINE: "Line %{0} (%{1}) exported"
       NEPTUNE_EMPTY_LINE: "Line %{0} (%{1}) without valid vehicle journey : not exported"
@@ -107,8 +111,12 @@ fr:
       completed: Export achevé avec succès
       failed: Export interrompu
       undefined: "%{key} non défini"
+      EXPORT: Export %{0}
+      EXPORTED_LINE: "Ligne %{0} (%{1}) exportée"
+      EMPTY_LINE: "Ligne sans course valide : non exportée"
       EXPORT_ERROR: "Erreur lors de l'export"
       EXCEPTION: "Cause %{0}" 
+      # old report for backward compatibility
       NEPTUNE_EXPORT: Export Neptune
       NEPTUNE_EXPORTED_LINE: "Ligne %{0} (%{1}) exportée"
       NEPTUNE_EMPTY_LINE: "Ligne %{0} (%{1}) sans course valide : non exportée"