Moved the loadpath reversal from config/initializers back into applic…

…ation.rb, since they need to load earlier

config/application.rb

@@ -9,6 +9,24 @@
   # Bundler.require(:default, :assets, Rails.env)
 end
 
+# Override engine views so that plugin views have higher priority.
+Rails::Engine.initializers.detect{|i| i.name == :add_view_paths }.
+  instance_variable_set("@block", Proc.new {
+    views = paths.app.views.to_a
+    unless views.empty?
+      ActiveSupport.on_load(:action_controller){ append_view_path(views) }
+      ActiveSupport.on_load(:action_mailer){ append_view_path(views) }
+    end
+  }
+)
+
+# Override I18n load paths so that plugin locales have higher priority.
+Rails::Engine.initializers.detect{|i| i.name == :add_locales }.
+  instance_variable_set("@block", Proc.new {
+    config.i18n.railties_load_path.concat( paths.config.locales.to_a ).reverse!
+  }
+)
+
 module FatFreeCRM
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.