lib/merrycms/engine.rb in merrycms-0.1.2 vs lib/merrycms/engine.rb in merrycms-0.1.4

@@ -9,15 +9,21 @@
 require 'nested_set'
 require 'i18n/active_record'
 require 'merrycms/rails/routes'
 require 'kaminari'
 require 'meta_search'
+require 'open4'
+require 'rvideo'
+require 'paperclip'
+require 'paperclip_processors/video_thumbnail'
+require 'paperclip_processors/poster'
 
 module Merrycms
   class Engine < Rails::Engine
     
     # I18n config
     #config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '*', '*.{rb,yml}').to_s]
+    config.i18n.load_path += Dir[File.join(File.dirname(__FILE__), '../../config/locales/*/*.{rb,yml}')]
     config.i18n.load_path += Dir[File.join(File.dirname(__FILE__), '../../config/locales/*/admin/*.{rb,yml}')]
     config.i18n.default_locale = :fr
 
     # JavaScript files you want as :defaults (application.js is always included).
     config.action_view.javascript_expansions[:defaults] = %w(jquery jquery-ui.min rails)