Author: rande
Date: 2010-03-18 17:15:15 +0100 (Thu, 18 Mar 2010)
New Revision: 28612
Modified:
plugins/mgI18nPlugin/branches/sf1.2/config/mgI18nPluginConfiguration.class.php
plugins/mgI18nPlugin/branches/sf1.3/config/mgI18nPluginConfiguration.class.php
Log:
[mgI18nPlugin] avoid to enable i18n if the application does not require any
i18n ....
Modified:
plugins/mgI18nPlugin/branches/sf1.2/config/mgI18nPluginConfiguration.class.php
===================================================================
---
plugins/mgI18nPlugin/branches/sf1.2/config/mgI18nPluginConfiguration.class.php
2010-03-18 16:06:30 UTC (rev 28611)
+++
plugins/mgI18nPlugin/branches/sf1.2/config/mgI18nPluginConfiguration.class.php
2010-03-18 16:15:15 UTC (rev 28612)
@@ -27,14 +27,12 @@
{
$context = $event->getSubject();
- if ($context->getI18N())
+ if (!sfConfig::get('sf_i18n') || !$context->getI18N() instanceof mgI18n)
{
- $i18n_options = $context->getI18N()->getOptions();
+ sfConfig::set('mg_i18n_enabled', false);
+
+ return;
}
- else
- {
- throw new sfException('Please read the README file to install the
plugin.');
- }
sfConfig::set('mg_i18n_enabled', mgI18nUser::canTranslate($context));
sfConfig::set('mg_i18n_global_application',
isset($i18n_options['global_application']) ?
$i18n_options['global_application'] :
$context->getConfiguration()->getApplication());
Modified:
plugins/mgI18nPlugin/branches/sf1.3/config/mgI18nPluginConfiguration.class.php
===================================================================
---
plugins/mgI18nPlugin/branches/sf1.3/config/mgI18nPluginConfiguration.class.php
2010-03-18 16:06:30 UTC (rev 28611)
+++
plugins/mgI18nPlugin/branches/sf1.3/config/mgI18nPluginConfiguration.class.php
2010-03-18 16:15:15 UTC (rev 28612)
@@ -27,14 +27,12 @@
{
$context = $event->getSubject();
- if ($context->getI18N())
+ if (!sfConfig::get('sf_i18n') || !$context->getI18N() instanceof mgI18n)
{
- $i18n_options = $context->getI18N()->getOptions();
+ sfConfig::set('mg_i18n_enabled', false);
+
+ return;
}
- else
- {
- throw new sfException('Please read the README file to install the
plugin.');
- }
sfConfig::set('mg_i18n_enabled', mgI18nUser::canTranslate($context));
sfConfig::set('mg_i18n_global_application',
isset($i18n_options['global_application']) ?
$i18n_options['global_application'] :
$context->getConfiguration()->getApplication());
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" 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/symfony-svn?hl=en.
