Author: Jonathan.Wage
Date: 2010-01-19 20:29:10 +0100 (Tue, 19 Jan 2010)
New Revision: 26899
Modified:
plugins/sfSympalPlugin/trunk/config/app.yml
plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
plugins/sfSympalPlugin/trunk/lib/sfSympalConfig.class.php
plugins/sfSympalPlugin/trunk/lib/util/sfSympalToolkit.class.php
plugins/sfSympalPlugin/trunk/modules/sympal_default/lib/Basesympal_defaultActions.class.php
plugins/sfSympalPlugin/trunk/modules/sympal_default/lib/Basesympal_defaultComponents.class.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing issue with language codes
Modified: plugins/sfSympalPlugin/trunk/config/app.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-19 19:14:32 UTC (rev
26898)
+++ plugins/sfSympalPlugin/trunk/config/app.yml 2010-01-19 19:29:10 UTC (rev
26899)
@@ -263,7 +263,7 @@
gravatar_default_image: "/sfSympalPlugin/images/symfony_button.gif"
# Configure the available languages
- language_codes: [en, fr, es]
+ language_codes: []
# Configure the default theme to render Sympal with
default_theme: default
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php 2010-01-19
19:14:32 UTC (rev 26898)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalHelper.php 2010-01-19
19:29:10 UTC (rev 26899)
@@ -117,7 +117,7 @@
function get_change_language_icons()
{
$icons = array();
- foreach (sfSympalConfig::get('language_codes') as $code)
+ foreach (sfSympalConfig::getLanguageCodes() as $code)
{
if (sfContext::getInstance()->getUser()->getCulture() == $code)
{
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-19 19:14:32 UTC (rev 26898)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-19 19:29:10 UTC (rev 26899)
@@ -51,7 +51,7 @@
<li>
<?php
$user = sfContext::getInstance()->getUser();
- $form = new sfFormLanguage($user, array('languages' =>
sfSympalConfig::get('language_codes', null, array($user->getCulture()))));
+ $form = new sfFormLanguage($user, array('languages' =>
sfSympalConfig::getLanguageCodes()));
unset($form[$form->getCSRFFieldName()]);
$widgetSchema = $form->getWidgetSchema();
$widgetSchema['language']->setAttribute('onChange',
"this.form.submit();");
Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalConfig.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalConfig.class.php 2010-01-19
19:14:32 UTC (rev 26898)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalConfig.class.php 2010-01-19
19:29:10 UTC (rev 26899)
@@ -2,6 +2,11 @@
class sfSympalConfig extends sfConfig
{
+ public static function getLanguageCodes()
+ {
+ return !empty(self::$config['app_sympal_config_language_codes']) ?
self::$config['app_sympal_config_language_codes'] : array();
+ }
+
public static function get($group, $name = null, $default = null)
{
$default = $default === null ? false : $default;
@@ -25,6 +30,11 @@
public static function isI18nEnabled($name = null)
{
+ if (empty(self::$config['app_sympal_config_language_codes']))
+ {
+ return false;
+ }
+
if ($name)
{
if (is_object($name))
Modified: plugins/sfSympalPlugin/trunk/lib/util/sfSympalToolkit.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/util/sfSympalToolkit.class.php
2010-01-19 19:14:32 UTC (rev 26898)
+++ plugins/sfSympalPlugin/trunk/lib/util/sfSympalToolkit.class.php
2010-01-19 19:29:10 UTC (rev 26899)
@@ -190,7 +190,7 @@
$content->Type->name,
$content->Type->id,
$content->id,
- implode('|', sfSympalConfig::get('language_codes')),
+ implode('|', sfSympalConfig::getLanguageCodes()),
implode('|', sfSympalConfig::get('content_formats'))
);
}
@@ -214,7 +214,7 @@
$content->Type->name,
$content->Type->id,
$content->id,
- implode('|', sfSympalConfig::get('language_codes')),
+ implode('|', sfSympalConfig::getLanguageCodes()),
implode('|', sfSympalConfig::get('content_formats'))
);
}
@@ -233,7 +233,7 @@
$contentType->name,
$contentType->id,
null,
- implode('|', sfSympalConfig::get('language_codes')),
+ implode('|', sfSympalConfig::getLanguageCodes()),
implode('|', sfSympalConfig::get('content_formats'))
);
}
Modified:
plugins/sfSympalPlugin/trunk/modules/sympal_default/lib/Basesympal_defaultActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/modules/sympal_default/lib/Basesympal_defaultActions.class.php
2010-01-19 19:14:32 UTC (rev 26898)
+++
plugins/sfSympalPlugin/trunk/modules/sympal_default/lib/Basesympal_defaultActions.class.php
2010-01-19 19:29:10 UTC (rev 26899)
@@ -16,7 +16,7 @@
public function executeChange_language(sfWebRequest $request)
{
$oldCulture = $this->getUser()->getCulture();
- $this->form = new sfFormLanguage($this->getUser(), array('languages' =>
sfSympalConfig::get('language_codes', null,
array($this->getUser()->getCulture()))));
+ $this->form = new sfFormLanguage($this->getUser(), array('languages' =>
sfSympalConfig::getLanguageCodes()));
unset($this->form[$this->form->getCSRFFieldName()]);
$this->form->process($request);
Modified:
plugins/sfSympalPlugin/trunk/modules/sympal_default/lib/Basesympal_defaultComponents.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/modules/sympal_default/lib/Basesympal_defaultComponents.class.php
2010-01-19 19:14:32 UTC (rev 26898)
+++
plugins/sfSympalPlugin/trunk/modules/sympal_default/lib/Basesympal_defaultComponents.class.php
2010-01-19 19:29:10 UTC (rev 26899)
@@ -4,7 +4,7 @@
{
public function executeLanguage(sfWebRequest $request)
{
- $this->form = new sfFormLanguage($this->getUser(), array('languages' =>
sfSympalConfig::get('language_codes', null,
array($this->getUser()->getCulture()))));
+ $this->form = new sfFormLanguage($this->getUser(), array('languages' =>
sfSympalConfig::getLanguageCodes()));
unset($this->form[$this->form->getCSRFFieldName()]);
$widgetSchema = $this->form->getWidgetSchema();
$widgetSchema->setLabel('language', 'Select Language');
--
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.
