fragments: ~
http_method_override: true
+wallabag_core:
+ languages:
+ en: 'English'
+ fr: 'Français'
+
# Twig Configuration
twig:
debug: "%kernel.debug%"
public: false
tags:
- { name: twig.extension }
+
+ wallabag.locale_listener:
+ class: Wallabag\CoreBundle\EventListener\LocaleListener
+ arguments: ["%kernel.default_locale%"]
+ tags:
+ - { name: kernel.event_subscriber }
+
+ wallabag.user_locale_listener:
+ class: Wallabag\CoreBundle\EventListener\UserLocaleListener
+ arguments: ["@session"]
+ tags:
+ - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
$this->get('session')->getFlashBag()->add(
'notice',
- 'Config saved'
+ 'Config saved. Some parameters will be considered after disconnection.'
);
return $this->redirect($this->generateUrl('config'));
--- /dev/null
+<?php
+
+namespace Wallabag\CoreBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class Configuration implements ConfigurationInterface
+{
+ public function getConfigTreeBuilder()
+ {
+ $treeBuilder = new TreeBuilder();
+ $rootNode = $treeBuilder->root('wallabag_core');
+
+ $rootNode
+ ->children()
+ ->arrayNode('languages')
+ ->prototype('scalar')->end()
+ ->end()
+ ->end()
+ ;
+
+ return $treeBuilder;
+ }
+}
{
public function load(array $configs, ContainerBuilder $container)
{
+ $configuration = new Configuration();
+ $config = $this->processConfiguration($configuration, $configs);
+ $container->setParameter('wallabag_core.languages', $config['languages']);
+
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yml');
}
--- /dev/null
+<?php
+
+namespace Wallabag\CoreBundle\EventListener;
+
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class LocaleListener implements EventSubscriberInterface
+{
+ private $defaultLocale;
+
+ public function __construct($defaultLocale = 'en')
+ {
+ $this->defaultLocale = $defaultLocale;
+ }
+
+ public function onKernelRequest(GetResponseEvent $event)
+ {
+ $request = $event->getRequest();
+ if (!$request->hasPreviousSession()) {
+ return;
+ }
+
+ // try to see if the locale has been set as a _locale routing parameter
+ if ($locale = $request->attributes->get('_locale')) {
+ $request->getSession()->set('_locale', $locale);
+ } else {
+ // if no explicit locale has been set on this request, use one from the session
+ $request->setLocale($request->getSession()->get('_locale', $this->defaultLocale));
+ }
+ }
+
+ public static function getSubscribedEvents()
+ {
+ return array(
+ // must be registered before the default Locale listener
+ KernelEvents::REQUEST => array(array('onKernelRequest', 17)),
+ );
+ }
+}
--- /dev/null
+<?php
+
+namespace Wallabag\CoreBundle\EventListener;
+
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
+
+/**
+ * Stores the locale of the user in the session after the
+ * login. This can be used by the LocaleListener afterwards.
+ */
+class UserLocaleListener
+{
+ /**
+ * @var Session
+ */
+ private $session;
+
+ public function __construct(Session $session)
+ {
+ $this->session = $session;
+ }
+
+ /**
+ * @param InteractiveLoginEvent $event
+ */
+ public function onInteractiveLogin(InteractiveLoginEvent $event)
+ {
+ $user = $event->getAuthenticationToken()->getUser();
+
+ if (null !== $user->getConfig()->getLanguage()) {
+ $this->session->set('_locale', $user->getConfig()->getLanguage());
+ }
+ }
+}
class ConfigType extends AbstractType
{
private $themes = array();
+ private $languages = array();
/**
- * @param array $themes Themes come from the LiipThemeBundle (liip_theme.themes)
+ * @param array $themes Themes come from the LiipThemeBundle (liip_theme.themes)
+ * @param array $languages Languages come from configuration, array just code language as key and label as value
*/
- public function __construct($themes)
+ public function __construct($themes, $languages)
{
$this->themes = array_combine(
$themes,
array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes)
);
+
+ $this->languages = $languages;
}
public function buildForm(FormBuilderInterface $builder, array $options)
'choices_as_values' => true,
))
->add('items_per_page')
- ->add('language')
+ ->add('language', 'choice', array(
+ 'choices' => $this->languages,
+ ))
->add('save', 'submit')
;
}
class: Wallabag\CoreBundle\Form\Type\ConfigType
arguments:
- %liip_theme.themes%
+ - %wallabag_core.languages%
tags:
- { name: form.type, alias: config }
# Flash messages
Information updated: "Vos informations personnelles ont bien été mises à jour"
-Config saved: "Les paramètres de wallabag ont bien été mis à jour"
+"Config saved. Some parameters will be considered after disconnection.": "Les paramètres ont bien été mis à jour. Certains seront pris en compte après déconnexion."
RSS information updated: "La configuration des flux RSS a bien été mise à jour"
Password updated: "Votre mot de passe a bien été mis à jour"
Entry starred: "Article ajouté dans les favoris"
$data = array(
'config[theme]' => 0,
'config[items_per_page]' => '30',
- 'config[language]' => 'fr_FR',
+ 'config[language]' => 'en',
);
$client->submit($form, $data);
array(array(
'config[theme]' => 0,
'config[items_per_page]' => '',
- 'config[language]' => 'fr_FR',
- )),
- array(array(
- 'config[theme]' => 0,
- 'config[items_per_page]' => '12',
- 'config[language]' => '',
+ 'config[language]' => 'en',
)),
);
}
projects / github / wallabag / wallabag.git / commitdiff
