Merge pull request #1521 from printercu/patch-1

Load all locales from config.i18n.available_locales

lib/carrierwave.rb

@@ -39,9 +39,16 @@ def tmp_path
 
   module CarrierWave
     class Railtie < Rails::Railtie
-      initializer "carrierwave.setup_paths" do
+      initializer "carrierwave.setup_paths" do |app|
         CarrierWave.root = Rails.root.join(Rails.public_path).to_s
         CarrierWave.base_path = ENV['RAILS_RELATIVE_URL_ROOT']
+
+        pattern = CarrierWave::Railtie.locales_pattern_from app.config.i18n.available_locales
+
+        files = Dir[File.join(File.dirname(__FILE__), 'carrierwave', 'locale', "#{pattern}.yml")]
+        # Loads the Carrierwave locale files before the Rails application locales
+        # letting the Rails application overrite the carrierwave locale defaults
+        I18n.load_path = files.concat I18n.load_path
       end
 
       initializer "carrierwave.active_record" do
@@ -50,11 +57,11 @@ class Railtie < Rails::Railtie
         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')
+      protected
+
+      def self.locales_pattern_from(args)
+        array = Array(args || [])
+        array.blank? ? '*' : "{#{array.join ','}}"
       end
     end
   end