[Jifty-commit] r2165 - jifty/trunk/lib

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Wed Nov 15 15:38:45 2006
New Revision: 2165

Modified:
   jifty/trunk/lib/Jifty.pm

Log:
* Jifty.pm: Load I18N after plugins, but before the main
  classloader, so the main classes has access to _().

  Now the comment agrees with code:

    # can't do this before we have the config set up and load plugins
    Jifty::I18N->refresh();


Modified: jifty/trunk/lib/Jifty.pm
==============================================================================
--- jifty/trunk/lib/Jifty.pm	(original)
+++ jifty/trunk/lib/Jifty.pm	Wed Nov 15 15:38:45 2006
@@ -135,6 +135,12 @@
         push @plugins, $class->new(%options);
     }
 
+    Jifty->plugins(@plugins);
+
+    # Now that we have the config set up and loaded plugins,
+    # load the localization files.
+    Jifty::I18N->refresh();
+    
     # Get a classloader set up
     my $class_loader = Jifty::ClassLoader->new(
         base => Jifty->app_class,
@@ -143,10 +149,6 @@
     Jifty->class_loader($class_loader);
     $class_loader->require;
 
-    Jifty->plugins(@plugins);
-
-    Jifty::I18N->refresh(); # can't do this before we have the config set up and load plugins
-    
     Jifty->handler(Jifty::Handler->new());
     Jifty->api(Jifty::API->new());