2 files changed, 9 insertions, 3 deletions
diff --git a/app/models/import.rb b/app/models/import.rb
index c96d2fdad..662fe4a84 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -61,6 +61,11 @@ class Import < ActiveRecord::Base
     self.status ||= "pending"
   end
 
+  before_validation :extract_file_type, :on => :create
+  def extract_file_type
+    self.file_type = resources.original_filename.rpartition(".").last
+  end
+
   after_create :delayed_import
   def delayed_import
     save_resources
@@ -81,7 +86,7 @@ class Import < ActiveRecord::Base
   end
 
   def saved_resources
-    "#{root}/#{id}.zip"
+    "#{root}/#{id}.#{file_type}"
   end
 
   def name
@@ -89,7 +94,7 @@ class Import < ActiveRecord::Base
   end
 
   def import_options
-    { :import_id => self.id }
+    { :import_id => self.id , :file_format => self.file_type }
   end
 
   def import
diff --git a/app/models/import_log_message.rb b/app/models/import_log_message.rb
index 699c9603d..f06a61213 100644
--- a/app/models/import_log_message.rb
+++ b/app/models/import_log_message.rb
@@ -30,7 +30,8 @@ class ImportLogMessage < ActiveRecord::Base
   end
  
   def full_message
-    I18n.translate key, arguments.symbolize_keys.merge(:scope => "import_log_messages.messages")
+    last_key=key.rpartition("|").last
+    I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => last_key)
   end
 
 end