remove import/export type on list count

3 files changed, 37 insertions, 29 deletions

diff --git a/app/models/import.rb b/app/models/import.rb
index 6f1e71cc0..4ea931e92 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -88,7 +88,7 @@ class Import < ActiveRecord::Base
   end
 
   def name
-    "#{Import.model_name.humanize} #{id}"
+    "#{self.class.model_name.human} #{id}"
   end
 
   def import_options
diff --git a/config/locales/exports.yml b/config/locales/exports.yml
index 7a006ea5c..3d359d609 100644
--- a/config/locales/exports.yml
+++ b/config/locales/exports.yml
@@ -61,21 +61,21 @@ en:
         one:   "export"
         other: "exports"
       neptune_export: 
-        zero:  "Neptune Export"
+        zero:  "Export"
         one:   "Neptune Export" 
-        other: "Neptune Exports"
+        other: "Exports"
       csv_export: 
-        zero:  "CSV Export"
+        zero:  "Export"
         one:   "CSV Export" 
-        other: "CSV Exports"
+        other: "Exports"
       gtfs_export: 
-        zero:  "GTFS Export"
+        zero:  "Export"
         one:   "GTFS Export"
-        other: "GTFS Exports"
+        other: "Exports"
       netex_export: 
-        zero:  "NeTEx Export"
+        zero:  "Export"
         one:   "NeTEx Export"
-        other: "NeTEx Exports"
+        other: "Exports"
     attributes:
       export:
         status: "Status"
@@ -149,21 +149,21 @@ fr:
         one:   "export"
         other: "exports"
       neptune_export: 
-        zero:  "Export Neptune"
+        zero:  "Export"
         one:   "Export Neptune"
-        other: "Exports Neptune"
+        other: "Exports"
       csv_export: 
-        zero:  "Export CSV"
+        zero:  "Export"
         one:   "Export CSV"
-        other: "Exports CSV"
+        other: "Exports"
       gtfs_export: 
-        zero:  "Export GTFS"
+        zero:  "Export"
         one:   "Export GTFS"
-        other: "Exports GTFS"
+        other: "Exports"
       netex_export: 
-        zero:  "Export NeTEx"
+        zero:  "Export"
         one:   "Export NeTEx"
-        other: "Exports NeTEx"
+        other: "Exports"
     attributes:
       export:
         status: "Status"
diff --git a/config/locales/imports.yml b/config/locales/imports.yml
index 4f25caaa9..b10888a35 100644
--- a/config/locales/imports.yml
+++ b/config/locales/imports.yml
@@ -107,17 +107,21 @@ en:
         one:   "import"
         other: "imports"
       neptune_import:
-        zero:  "Neptune import"
+        zero:  "import"
         one:   "Neptune import"
-        other: "Neptune imports"
+        other: "imports"
       csv_import:
-        zero:  "CSV import"
+        zero:  "import"
         one:   "CSV import"
-        other: "CSV imports"
+        other: "imports"
       gtfs_import:
-        zero:  "GTFS import"
+        zero:  "import"
         one:   "GTFS import"
-        other: "GTFS imports"
+        other: "imports"
+      netex_import:
+        zero:  "import"
+        one:   "NeTEx import"
+        other: "imports"
     attributes:
       import:
         resources: "File to import"
@@ -247,17 +251,21 @@ fr:
         one:   "import"
         other: "imports"
       neptune_import:
-        zero:  "import Neptune"
+        zero:  "import"
         one:   "import Neptune"
-        other: "imports Neptune"
+        other: "imports"
       csv_import:
-        zero:  "import CSV"
+        zero:  "import"
         one:   "import CSV"
-        other: "imports CSV"
+        other: "imports"
       gtfs_import:
-        zero:  "import GTFS"
+        zero:  "import"
         one:   "import GTFS"
-        other: "imports GTFS"
+        other: "imports"
+      netex_import:
+        zero:  "import"
+        one:   "import NeTEx"
+        other: "imports"
     attributes:
       import:
         resources: "Fichier à importer"