X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FForm%2FType%2FConfigType.php;h=6901fa08e2f2755d3b0466c581c066bb80694795;hb=41022cb289f5d08418ccb2d7050098c4ee3721e4;hp=a139f2df0f076bd4ec5af45aa90f5d610f1260b6;hpb=86719c63bf47686ca55020e6b0443344de36d45a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index a139f2df..6901fa08 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -4,14 +4,16 @@ namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Wallabag\CoreBundle\Entity\Config;
 
 class ConfigType extends AbstractType
 {
-    private $themes = array();
-    private $languages = array();
+    private $themes = [];
+    private $languages = [];
 
     /**
      * @param array $themes    Themes come from the LiipThemeBundle (liip_theme.themes)
@@ -21,7 +23,9 @@ class ConfigType extends AbstractType
     {
         $this->themes = array_combine(
             $themes,
-            array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes)
+            array_map(function ($s) {
+                return ucwords(strtolower(str_replace('-', ' ', $s)));
+            }, $themes)
         );
 
         $this->languages = $languages;
@@ -30,24 +34,45 @@ class ConfigType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('theme', ChoiceType::class, array(
+            ->add('theme', ChoiceType::class, [
                 'choices' => array_flip($this->themes),
-                'choices_as_values' => true,
-            ))
-            ->add('items_per_page')
-            ->add('language', ChoiceType::class, array(
+                'label' => 'config.form_settings.theme_label',
+            ])
+            ->add('items_per_page', IntegerType::class, [
+                'label' => 'config.form_settings.items_per_page_label',
+                'property_path' => 'itemsPerPage',
+            ])
+            ->add('reading_speed', IntegerType::class, [
+                'label' => 'config.form_settings.reading_speed.label',
+                'property_path' => 'readingSpeed',
+            ])
+            ->add('action_mark_as_read', ChoiceType::class, [
+                'label' => 'config.form_settings.action_mark_as_read.label',
+                'property_path' => 'actionMarkAsRead',
+                'choices' => [
+                    'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE,
+                    'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE,
+                ],
+            ])
+            ->add('language', ChoiceType::class, [
                 'choices' => array_flip($this->languages),
-                'choices_as_values' => true,
-            ))
-            ->add('save', SubmitType::class)
+                'label' => 'config.form_settings.language_label',
+            ])
+            ->add('pocket_consumer_key', null, [
+                'property_path' => 'pocketConsumerKey',
+                'label' => 'config.form_settings.pocket_consumer_key_label',
+            ])
+            ->add('save', SubmitType::class, [
+                'label' => 'config.form.save',
+            ])
         ;
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
+        $resolver->setDefaults([
             'data_class' => 'Wallabag\CoreBundle\Entity\Config',
-        ));
+        ]);
     }
 
     public function getBlockPrefix()