mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-05 15:08:47 +00:00
Code Issues Projects Releases Wiki Activity

Replace slider with select

Browse source
This commit is contained in:
Nicolas Lœuillet 2016-03-14 13:49:47 +01:00
parent 37b371726b
commit 6432b9277e
5 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/db/wallabag_test.sqlite-journal
View file

Binary file not shown.

2
src/Wallabag/CoreBundle/Controller/DeveloperController.php
View file

@ -43,7 +43,7 @@ class DeveloperController extends Controller
$clientForm->handleRequest($request); $clientForm->handleRequest($request);
if ($clientForm->isValid()) { if ($clientForm->isValid()) {
$client->setAllowedGrantTypes(array('token', 'authorization_code', 'password','refresh_token')); $client->setAllowedGrantTypes(array('token', 'authorization_code', 'password', 'refresh_token'));
$em->persist($client); $em->persist($client);
$em->flush(); $em->flush();

12
src/Wallabag/CoreBundle/Form/Type/ConfigType.php
View file

@ -4,7 +4,6 @@ namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\RangeType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@ -36,11 +35,12 @@ class ConfigType extends AbstractType
'choices_as_values' => true, 'choices_as_values' => true,
)) ))
->add('items_per_page') ->add('items_per_page')
->add('reading_speed', RangeType::class, array( ->add('reading_speed', ChoiceType::class, array(
'attr' => array( 'choices' => array(
'min' => 0.5, 'I read ~100 words per minute' => '0.5',
'max' => 2, 'I read ~200 words per minute' => '1',
'step' => 0.5, 'I read ~300 words per minute' => '1.5',
'I read ~400 words per minute' => '2',
), ),
)) ))
->add('language', ChoiceType::class, array( ->add('language', ChoiceType::class, array(

6
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
View file

@ -57,6 +57,12 @@ Repeat new password: 'Confirmez votre nouveau mot de passe'
Username: "Nom d'utilisateur" Username: "Nom d'utilisateur"
Two factor authentication: "Double authentification" Two factor authentication: "Double authentification"
"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." "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."
"I read ~100 words per minute": "Je lis environ 100 mots par minute"
"I read ~200 words per minute": "Je lis environ 200 mots par minute"
"I read ~300 words per minute": "Je lis environ 300 mots par minute"
"I read ~400 words per minute": "Je lis environ 400 mots par minute"
"You can use online tools to estimate your reading speed": "Vous pouvez utiliser un outil en ligne pour estimer votre vitesse de lecture"
"like this one": "comme celui-ci"
# Tagging rules # Tagging rules
Tagging rules: "Règles de tag automatiques" Tagging rules: "Règles de tag automatiques"

1
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
View file

@ -47,6 +47,7 @@
{{ form_label(form.config.reading_speed) }} {{ form_label(form.config.reading_speed) }}
{{ form_errors(form.config.reading_speed) }} {{ form_errors(form.config.reading_speed) }}
{{ form_widget(form.config.reading_speed) }} {{ form_widget(form.config.reading_speed) }}
<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>
</div> </div>
</div> </div>