Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fixed i18n override problem with rails 4
- Loading branch information
Showing
with
7 additions
and
2 deletions.
-
+7
−0
lib/carrierwave.rb
-
+0
−2
lib/carrierwave/validations/active_model.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 |
|
|
|
|
|
|
@@ -78,5 +78,3 @@ def validates_download_of(*attr_names) |
|
|
end |
|
|
end |
|
|
end |
|
|
|
|
|
I18n.load_path << File.join(File.dirname(__FILE__), "..", "locale", 'en.yml') |