Fixed i18n override problem with rails 4

thiagofm · Nov 10, 2013 · 21e0d27bc37a197f9e0a241affa8f1cb17ba0738 · 21e0d27
1 parent a5cc1c0
commit 21e0d27bc37a197f9e0a241affa8f1cb17ba0738
Unified Split

Showing with 7 additions and 2 deletions.

+7 −0 lib/carrierwave.rb

+0 −2 lib/carrierwave/validations/active_model.rb
diff --git a/lib/carrierwave.rb b/lib/carrierwave.rb
@@ -92,6 +92,13 @@ class Railtie < Rails::Railtie
           require 'carrierwave/orm/activerecord'
         end
       end
+
+      ##
+      # Loads the Carrierwave locale files before the Rails application locales
+      # letting the Rails application overrite the carrierwave locale defaults
+      config.before_configuration do
+        I18n.load_path << File.join(File.dirname(__FILE__), "carrierwave", "locale", 'en.yml')
+      end
     end
   end
 

diff --git a/lib/carrierwave/validations/active_model.rb b/lib/carrierwave/validations/active_model.rb
@@ -78,5 +78,3 @@ def validates_download_of(*attr_names)
     end
   end
 end
-
-I18n.load_path << File.join(File.dirname(__FILE__), "..", "locale", 'en.yml')