lib/paperclip-globalize3.rb in paperclip-globalize3-1.1.0 vs lib/paperclip-globalize3.rb in paperclip-globalize3-2.0.0

@@ -2,8 +2,18 @@
 require "paperclip/globalize3/attachment"
 
 require "globalize"
 require "paperclip"
 
-Paperclip.interpolates(:locale) { |_, _| Globalize.locale.to_s }
+Paperclip.interpolates(:locale) { |attachment, _|
+  if attachment.instance.send("#{attachment.name}_file_name").respond_to?(:translation_metadata)
+    attachment.instance.send("#{attachment.name}_file_name").translation_metadata[:locale].to_s
+  else
+    Globalize.locale.to_s
+  end
+}
+
+unless Paperclip::Attachment.instance_methods.include?(:assign_attributes)
+  Paperclip::Attachment.send(:include, Paperclip::Globalize3::Attachment::Compatibility::Paperclip41)
+end
 
 Paperclip::Attachment.send(:include, Paperclip::Globalize3::Attachment)