aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-03-14 13:49:47 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2016-03-14 13:49:47 +0100
commit6432b9277ed5dcf269590e421bd0aac4ad66f09c (patch)
tree9740fca7ceada412265c3e5279a150d901095a2f
parent37b371726be4b8e1fbdd7061196d814c2dd7e811 (diff)
downloadwallabag-6432b9277ed5dcf269590e421bd0aac4ad66f09c.tar.gz
wallabag-6432b9277ed5dcf269590e421bd0aac4ad66f09c.tar.zst
wallabag-6432b9277ed5dcf269590e421bd0aac4ad66f09c.zip
Replace slider with select
-rw-r--r--data/db/wallabag_test.sqlite-journalbin7736 -> 0 bytes
-rw-r--r--src/Wallabag/CoreBundle/Controller/DeveloperController.php2
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ConfigType.php12
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig1
5 files changed, 14 insertions, 7 deletions
diff --git a/data/db/wallabag_test.sqlite-journal b/data/db/wallabag_test.sqlite-journal
deleted file mode 100644
index 153aa187..00000000
--- a/data/db/wallabag_test.sqlite-journal
+++ /dev/null
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/DeveloperController.php
index f519bdbc..e5cfd83c 100644
--- a/src/Wallabag/CoreBundle/Controller/DeveloperController.php
+++ b/src/Wallabag/CoreBundle/Controller/DeveloperController.php
@@ -43,7 +43,7 @@ class DeveloperController extends Controller
43 $clientForm->handleRequest($request); 43 $clientForm->handleRequest($request);
44 44
45 if ($clientForm->isValid()) { 45 if ($clientForm->isValid()) {
46 $client->setAllowedGrantTypes(array('token', 'authorization_code', 'password','refresh_token')); 46 $client->setAllowedGrantTypes(array('token', 'authorization_code', 'password', 'refresh_token'));
47 $em->persist($client); 47 $em->persist($client);
48 $em->flush(); 48 $em->flush();
49 49
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 1218a933..0a5ea6cc 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -4,7 +4,6 @@ namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\ChoiceType; 6use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
7use Symfony\Component\Form\Extension\Core\Type\RangeType;
8use Symfony\Component\Form\Extension\Core\Type\SubmitType; 7use Symfony\Component\Form\Extension\Core\Type\SubmitType;
9use Symfony\Component\Form\FormBuilderInterface; 8use Symfony\Component\Form\FormBuilderInterface;
10use Symfony\Component\OptionsResolver\OptionsResolver; 9use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -36,11 +35,12 @@ class ConfigType extends AbstractType
36 'choices_as_values' => true, 35 'choices_as_values' => true,
37 )) 36 ))
38 ->add('items_per_page') 37 ->add('items_per_page')
39 ->add('reading_speed', RangeType::class, array( 38 ->add('reading_speed', ChoiceType::class, array(
40 'attr' => array( 39 'choices' => array(
41 'min' => 0.5, 40 'I read ~100 words per minute' => '0.5',
42 'max' => 2, 41 'I read ~200 words per minute' => '1',
43 'step' => 0.5, 42 'I read ~300 words per minute' => '1.5',
43 'I read ~400 words per minute' => '2',
44 ), 44 ),
45 )) 45 ))
46 ->add('language', ChoiceType::class, array( 46 ->add('language', ChoiceType::class, array(
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index f6ac34fd..7c6ad07e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -57,6 +57,12 @@ Repeat new password: 'Confirmez votre nouveau mot de passe'
57Username: "Nom d'utilisateur" 57Username: "Nom d'utilisateur"
58Two factor authentication: "Double authentification" 58Two factor authentication: "Double authentification"
59"Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion": "Activer l'authentification double-facteur veut dire que vous allez recevoir un code par email à chaque nouvelle connexion non approuvée." 59"Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion": "Activer l'authentification double-facteur veut dire que vous allez recevoir un code par email à chaque nouvelle connexion non approuvée."
60"I read ~100 words per minute": "Je lis environ 100 mots par minute"
61"I read ~200 words per minute": "Je lis environ 200 mots par minute"
62"I read ~300 words per minute": "Je lis environ 300 mots par minute"
63"I read ~400 words per minute": "Je lis environ 400 mots par minute"
64"You can use online tools to estimate your reading speed": "Vous pouvez utiliser un outil en ligne pour estimer votre vitesse de lecture"
65"like this one": "comme celui-ci"
60 66
61# Tagging rules 67# Tagging rules
62Tagging rules: "Règles de tag automatiques" 68Tagging rules: "Règles de tag automatiques"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 31931ca2..2b0b0828 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -47,6 +47,7 @@
47 {{ form_label(form.config.reading_speed) }} 47 {{ form_label(form.config.reading_speed) }}
48 {{ form_errors(form.config.reading_speed) }} 48 {{ form_errors(form.config.reading_speed) }}
49 {{ form_widget(form.config.reading_speed) }} 49 {{ form_widget(form.config.reading_speed) }}
50 <p>{% trans %}You can use online tools to estimate your reading speed{% endtrans %} (<a href="http://www.myreadspeed.com/calculate/">{% trans %}like this one{%endtrans%}</a>).</p>
50 </div> 51 </div>
51 </div> 52 </div>
52 53