Changeset 6497

Timestamp:

12/14/07 07:46:42 (10 months ago)

Author:

fabien

Message:

added a loadConfiguration() method to sfI18N and sfDatabaseManager to load .yml files

Files:

• trunk/data/config/factories.yml (modified) (1 diff)
• trunk/lib/config/sfFactoryConfigHandler.class.php (modified) (1 diff)
• trunk/lib/database/sfDatabaseManager.class.php (modified) (1 diff)
• trunk/lib/i18n/sfI18N.class.php (modified) (1 diff)
• trunk/lib/util/sfContext.class.php (modified) (1 diff)

trunk/data/config/factories.yml

@@ -28 +28 @@
-    class: sfI18N
-    param:
+      load_configuration: true
-      cache:
-        class: sfFileCache

trunk/lib/config/sfFactoryConfigHandler.class.php

@@ -149 +149 @@
-            $cache = "    \$cache = null;\n";
-          }
+
+          $configuration = '';
+          if (isset($parameters['load_configuration']) && $parameters['load_configuration'])
+          {
+            $configuration = "  \$this->factories['i18n']->loadConfiguration();\n";
+          }
-          $instances[] = sprintf("\n  if (sfConfig::get('sf_i18n'))\n  {\n".
-                     "    \$class = sfConfig::get('sf_factory_i18n', '%s');\n".
-                     "%s".
-                     "    \$this->factories['i18n'] = new \$class(\$this, \$cache);\n".
+                     $configuration.
-                     "  }\n"
-                     , $class, $cache

trunk/lib/database/sfDatabaseManager.class.php

@@ -50 +50 @@
-  public function initialize()
-  {
-
+
+
+
+
+
+
+
+
-    require(sfConfigCache::getInstance()->checkConfig(sfConfig::get('sf_app_config_dir_name').'/databases.yml'));
-  }

trunk/lib/i18n/sfI18N.class.php

@@ -46 +46 @@
-    $this->cache   = $cache;
-
-    include(sfConfigCache::getInstance()->checkConfig(sfConfig::get('sf_app_config_dir_name').'/i18n.yml'));
-
-    $context->getEventDispatcher()->connect('user.change_culture', array($this, 'listenToChangeCultureEvent'));
-    $context->getEventDispatcher()->connect('controller.change_action', array($this, 'listenToChangeActionEvent'));
+  }
+
+  /**
+   * Loads i18n configuration.
+   */
+  public function loadConfiguration()
+  {
+    include(sfConfigCache::getInstance()->checkConfig(sfConfig::get('sf_app_config_dir_name').'/i18n.yml'));
-  }
-

trunk/lib/util/sfContext.class.php

@@ -42 +42 @@
-      // setup our database connections
-      $this->factories['databaseManager'] = new sfDatabaseManager(array('auto_shutdown' => false));
+      $this->factories['databaseManager']->loadConfiguration();
-    }
-