Author: david
Date: Fri Nov 12 15:06:05 2010
New Revision: 8836
Log:
Fix issue with extra plugin i18n strings being deleted then re-added.
Modified:
trunk/vendor/symfony/lib/i18n/extract/sfI18nApplicationExtract.class.php
trunk/vendor/symfony/lib/i18n/extract/sfI18nModuleExtract.class.php
Modified:
trunk/vendor/symfony/lib/i18n/extract/sfI18nApplicationExtract.class.php
==============================================================================
--- trunk/vendor/symfony/lib/i18n/extract/sfI18nApplicationExtract.class.php
Fri Nov 12 14:35:48 2010 (r8835)
+++ trunk/vendor/symfony/lib/i18n/extract/sfI18nApplicationExtract.class.php
Fri Nov 12 15:06:05 2010 (r8836)
@@ -25,6 +25,9 @@
{
$this->extractObjects = array();
+ // Force application message source, so we don't load all the plugin i18n
data yet
+ $this->i18n->setMessageSource(array(sfConfig::get('sf_app_i18n_dir')),
$this->culture);
+
// Modules
$moduleNames =
sfFinder::type('dir')->maxdepth(0)->relative()->in(sfConfig::get('sf_app_module_dir'));
foreach ($moduleNames as $moduleName)
Modified: trunk/vendor/symfony/lib/i18n/extract/sfI18nModuleExtract.class.php
==============================================================================
--- trunk/vendor/symfony/lib/i18n/extract/sfI18nModuleExtract.class.php Fri Nov
12 14:35:48 2010 (r8835)
+++ trunk/vendor/symfony/lib/i18n/extract/sfI18nModuleExtract.class.php Fri Nov
12 15:06:05 2010 (r8836)
@@ -29,11 +29,6 @@
}
$this->module = $this->parameters['module'];
-
- if (!isset($this->parameters['path']))
- {
-
$this->i18n->setMessageSource($this->i18n->getConfiguration()->getI18NDirs($this->module),
$this->culture);
- }
}
/**
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
