diff options
22 files changed, 50 insertions, 89 deletions
diff --git a/app/DoctrineMigrations/Version20190708122957.php b/app/DoctrineMigrations/Version20190708122957.php new file mode 100644 index 00000000..9585e997 --- /dev/null +++ b/app/DoctrineMigrations/Version20190708122957.php | |||
@@ -0,0 +1,22 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Schema\Schema; | ||
6 | use Wallabag\CoreBundle\Doctrine\WallabagMigration; | ||
7 | |||
8 | /** | ||
9 | * Change reading speed value. | ||
10 | */ | ||
11 | final class Version20190708122957 extends WallabagMigration | ||
12 | { | ||
13 | public function up(Schema $schema): void | ||
14 | { | ||
15 | $this->addSql('UPDATE ' . $this->getTable('config', true) . ' SET reading_speed = reading_speed*200'); | ||
16 | } | ||
17 | |||
18 | public function down(Schema $schema): void | ||
19 | { | ||
20 | $this->addSql('UPDATE ' . $this->getTable('config', true) . ' SET reading_speed = reading_speed/200'); | ||
21 | } | ||
22 | } | ||
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php index c54e9f2c..5e914965 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php | |||
@@ -19,7 +19,7 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface | |||
19 | 19 | ||
20 | $adminConfig->setTheme('material'); | 20 | $adminConfig->setTheme('material'); |
21 | $adminConfig->setItemsPerPage(30); | 21 | $adminConfig->setItemsPerPage(30); |
22 | $adminConfig->setReadingSpeed(1); | 22 | $adminConfig->setReadingSpeed(200); |
23 | $adminConfig->setLanguage('en'); | 23 | $adminConfig->setLanguage('en'); |
24 | $adminConfig->setPocketConsumerKey('xxxxx'); | 24 | $adminConfig->setPocketConsumerKey('xxxxx'); |
25 | $adminConfig->setActionMarkAsRead(0); | 25 | $adminConfig->setActionMarkAsRead(0); |
@@ -32,7 +32,7 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface | |||
32 | $bobConfig = new Config($this->getReference('bob-user')); | 32 | $bobConfig = new Config($this->getReference('bob-user')); |
33 | $bobConfig->setTheme('default'); | 33 | $bobConfig->setTheme('default'); |
34 | $bobConfig->setItemsPerPage(10); | 34 | $bobConfig->setItemsPerPage(10); |
35 | $bobConfig->setReadingSpeed(1); | 35 | $bobConfig->setReadingSpeed(200); |
36 | $bobConfig->setLanguage('fr'); | 36 | $bobConfig->setLanguage('fr'); |
37 | $bobConfig->setPocketConsumerKey(null); | 37 | $bobConfig->setPocketConsumerKey(null); |
38 | $bobConfig->setActionMarkAsRead(1); | 38 | $bobConfig->setActionMarkAsRead(1); |
@@ -45,7 +45,7 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface | |||
45 | $emptyConfig = new Config($this->getReference('empty-user')); | 45 | $emptyConfig = new Config($this->getReference('empty-user')); |
46 | $emptyConfig->setTheme('material'); | 46 | $emptyConfig->setTheme('material'); |
47 | $emptyConfig->setItemsPerPage(10); | 47 | $emptyConfig->setItemsPerPage(10); |
48 | $emptyConfig->setReadingSpeed(1); | 48 | $emptyConfig->setReadingSpeed(200); |
49 | $emptyConfig->setLanguage('en'); | 49 | $emptyConfig->setLanguage('en'); |
50 | $emptyConfig->setPocketConsumerKey(null); | 50 | $emptyConfig->setPocketConsumerKey(null); |
51 | $emptyConfig->setActionMarkAsRead(0); | 51 | $emptyConfig->setActionMarkAsRead(0); |
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 1714ce74..6901fa08 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -4,6 +4,7 @@ namespace Wallabag\CoreBundle\Form\Type; | |||
4 | 4 | ||
5 | use Symfony\Component\Form\AbstractType; | 5 | use Symfony\Component\Form\AbstractType; |
6 | use Symfony\Component\Form\Extension\Core\Type\ChoiceType; | 6 | use Symfony\Component\Form\Extension\Core\Type\ChoiceType; |
7 | use Symfony\Component\Form\Extension\Core\Type\IntegerType; | ||
7 | use Symfony\Component\Form\Extension\Core\Type\SubmitType; | 8 | use Symfony\Component\Form\Extension\Core\Type\SubmitType; |
8 | use Symfony\Component\Form\FormBuilderInterface; | 9 | use Symfony\Component\Form\FormBuilderInterface; |
9 | use Symfony\Component\OptionsResolver\OptionsResolver; | 10 | use Symfony\Component\OptionsResolver\OptionsResolver; |
@@ -37,19 +38,13 @@ class ConfigType extends AbstractType | |||
37 | 'choices' => array_flip($this->themes), | 38 | 'choices' => array_flip($this->themes), |
38 | 'label' => 'config.form_settings.theme_label', | 39 | 'label' => 'config.form_settings.theme_label', |
39 | ]) | 40 | ]) |
40 | ->add('items_per_page', null, [ | 41 | ->add('items_per_page', IntegerType::class, [ |
41 | 'label' => 'config.form_settings.items_per_page_label', | 42 | 'label' => 'config.form_settings.items_per_page_label', |
42 | 'property_path' => 'itemsPerPage', | 43 | 'property_path' => 'itemsPerPage', |
43 | ]) | 44 | ]) |
44 | ->add('reading_speed', ChoiceType::class, [ | 45 | ->add('reading_speed', IntegerType::class, [ |
45 | 'label' => 'config.form_settings.reading_speed.label', | 46 | 'label' => 'config.form_settings.reading_speed.label', |
46 | 'property_path' => 'readingSpeed', | 47 | 'property_path' => 'readingSpeed', |
47 | 'choices' => [ | ||
48 | 'config.form_settings.reading_speed.100_word' => '0.5', | ||
49 | 'config.form_settings.reading_speed.200_word' => '1', | ||
50 | 'config.form_settings.reading_speed.300_word' => '1.5', | ||
51 | 'config.form_settings.reading_speed.400_word' => '2', | ||
52 | ], | ||
53 | ]) | 48 | ]) |
54 | ->add('action_mark_as_read', ChoiceType::class, [ | 49 | ->add('action_mark_as_read', ChoiceType::class, [ |
55 | 'label' => 'config.form_settings.action_mark_as_read.label', | 50 | 'label' => 'config.form_settings.action_mark_as_read.label', |
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index 37d0640a..8a575b68 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | |||
@@ -54,8 +54,8 @@ class EntryFilterType extends AbstractType | |||
54 | $lower = $values['value']['left_number'][0]; | 54 | $lower = $values['value']['left_number'][0]; |
55 | $upper = $values['value']['right_number'][0]; | 55 | $upper = $values['value']['right_number'][0]; |
56 | 56 | ||
57 | $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed()); | 57 | $min = (int) ($lower * $this->user->getConfig()->getReadingSpeed() / 200); |
58 | $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed()); | 58 | $max = (int) ($upper * $this->user->getConfig()->getReadingSpeed() / 200); |
59 | 59 | ||
60 | if (null === $lower && null === $upper) { | 60 | if (null === $lower && null === $upper) { |
61 | // no value? no filter | 61 | // no value? no filter |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index fab05835..2db283ae 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Poster pr. side' | 68 | items_per_page_label: 'Poster pr. side' |
69 | language_label: 'Sprog' | 69 | language_label: 'Sprog' |
70 | reading_speed: | 70 | reading_speed: |
71 | # label: 'Reading speed' | 71 | # label: 'Reading speed (words per minute)' |
72 | # help_message: 'You can use online tools to estimate your reading speed:' | 72 | # help_message: 'You can use online tools to estimate your reading speed:' |
73 | # 100_word: 'I read ~100 words per minute' | ||
74 | # 200_word: 'I read ~200 words per minute' | ||
75 | # 300_word: 'I read ~300 words per minute' | ||
76 | # 400_word: 'I read ~400 words per minute' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | # label: 'Where do you want to be redirected to after marking an article as read?' | 74 | # label: 'Where do you want to be redirected to after marking an article as read?' |
79 | # redirect_homepage: 'To the homepage' | 75 | # redirect_homepage: 'To the homepage' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 6ba464d0..db01272f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Einträge pro Seite' | 68 | items_per_page_label: 'Einträge pro Seite' |
69 | language_label: 'Sprache' | 69 | language_label: 'Sprache' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'Lesegeschwindigkeit' | 71 | label: 'Lesegeschwindigkeit (Wörter pro Minute)' |
72 | help_message: 'Du kannst Online-Tools nutzen, um deine Lesegeschwindigkeit herauszufinden.' | 72 | help_message: 'Du kannst Online-Tools nutzen, um deine Lesegeschwindigkeit herauszufinden.' |
73 | 100_word: 'Ich lese ~100 Wörter pro Minute' | ||
74 | 200_word: 'Ich lese ~200 Wörter pro Minute' | ||
75 | 300_word: 'Ich lese ~300 Wörter pro Minute' | ||
76 | 400_word: 'Ich lese ~400 Wörter pro Minute' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | label: 'Wohin soll nach dem Gelesenmarkieren eines Artikels weitergeleitet werden?' | 74 | label: 'Wohin soll nach dem Gelesenmarkieren eines Artikels weitergeleitet werden?' |
79 | redirect_homepage: 'Zur Homepage' | 75 | redirect_homepage: 'Zur Homepage' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index a7c32f11..6d006310 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Items per page' | 68 | items_per_page_label: 'Items per page' |
69 | language_label: 'Language' | 69 | language_label: 'Language' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'Reading speed' | 71 | label: 'Reading speed (words per minute)' |
72 | help_message: 'You can use online tools to estimate your reading speed:' | 72 | help_message: 'You can use online tools to estimate your reading speed:' |
73 | 100_word: 'I read ~100 words per minute' | ||
74 | 200_word: 'I read ~200 words per minute' | ||
75 | 300_word: 'I read ~300 words per minute' | ||
76 | 400_word: 'I read ~400 words per minute' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | label: 'What to do after removing, starring or marking as read an article?' | 74 | label: 'What to do after removing, starring or marking as read an article?' |
79 | redirect_homepage: 'Go to the homepage' | 75 | redirect_homepage: 'Go to the homepage' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 093c5857..0eb74396 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Número de artículos por página' | 68 | items_per_page_label: 'Número de artículos por página' |
69 | language_label: 'Idioma' | 69 | language_label: 'Idioma' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'Velocidad de lectura' | 71 | label: 'Velocidad de lectura (palabras por minuto)' |
72 | help_message: 'Puede utilizar herramientas en línea para calcular su velocidad de lectura:' | 72 | help_message: 'Puede utilizar herramientas en línea para calcular su velocidad de lectura:' |
73 | 100_word: 'Leo ~100 palabras por minuto' | ||
74 | 200_word: 'Leo ~200 palabras por minuto' | ||
75 | 300_word: 'Leo ~300 palabras por minuto' | ||
76 | 400_word: 'Leo ~400 palabras por minuto' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | label: '¿Dónde quieres ser redirigido después de marcar un artículo como leído?' | 74 | label: '¿Dónde quieres ser redirigido después de marcar un artículo como leído?' |
79 | redirect_homepage: 'A la página de inicio' | 75 | redirect_homepage: 'A la página de inicio' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 00caa0ac..35afdbf4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'تعداد مقاله در هر صفحه' | 68 | items_per_page_label: 'تعداد مقاله در هر صفحه' |
69 | language_label: 'زبان' | 69 | language_label: 'زبان' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'سرعت خواندن' | 71 | # label: 'Reading speed (words per minute)' |
72 | help_message: 'سرعت خواندنتان را با ابزارهای آنلاین تخمین بزنید:' | 72 | help_message: 'سرعت خواندنتان را با ابزارهای آنلاین تخمین بزنید:' |
73 | 100_word: 'من تقریباً ۱۰۰ واژه را در دقیقه میخوانم' | ||
74 | 200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه میخوانم' | ||
75 | 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه میخوانم' | ||
76 | 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه میخوانم' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | # label: 'Where do you want to be redirected to after marking an article as read?' | 74 | # label: 'Where do you want to be redirected to after marking an article as read?' |
79 | # redirect_homepage: 'To the homepage' | 75 | # redirect_homepage: 'To the homepage' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index ca66acde..8a79b02f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: "Nombre d’articles par page" | 68 | items_per_page_label: "Nombre d’articles par page" |
69 | language_label: "Langue" | 69 | language_label: "Langue" |
70 | reading_speed: | 70 | reading_speed: |
71 | label: "Vitesse de lecture" | 71 | label: "Vitesse de lecture (mots par minute)" |
72 | help_message: "Vous pouvez utiliser un outil en ligne pour estimer votre vitesse de lecture :" | 72 | help_message: "Vous pouvez utiliser un outil en ligne pour estimer votre vitesse de lecture :" |
73 | 100_word: "Je lis environ 100 mots par minute" | ||
74 | 200_word: "Je lis environ 200 mots par minute" | ||
75 | 300_word: "Je lis environ 300 mots par minute" | ||
76 | 400_word: "Je lis environ 400 mots par minute" | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | label: "Que faire lorsqu'un article est supprimé, marqué comme lu ou marqué comme favoris ?" | 74 | label: "Que faire lorsqu'un article est supprimé, marqué comme lu ou marqué comme favoris ?" |
79 | redirect_homepage: "Retourner à la page d’accueil" | 75 | redirect_homepage: "Retourner à la page d’accueil" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 85720ef8..859bbb14 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Elementi per pagina' | 68 | items_per_page_label: 'Elementi per pagina' |
69 | language_label: 'Lingua' | 69 | language_label: 'Lingua' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'Velocità di lettura' | 71 | label: 'Velocità di lettura (parole al minuto)' |
72 | help_message: 'Puoi utilizzare degli strumenti online per valutare la tua velocità di lettura:' | 72 | help_message: 'Puoi utilizzare degli strumenti online per valutare la tua velocità di lettura:' |
73 | 100_word: 'Leggo ~100 parole al minuto' | ||
74 | 200_word: 'Leggo ~200 parole al minuto' | ||
75 | 300_word: 'Leggo ~300 parole al minuto' | ||
76 | 400_word: 'Leggo ~400 parole al minuto' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | label: "Dove vuoi essere reindirizzato dopo aver segnato l'articolo come già letto?" | 74 | label: "Dove vuoi essere reindirizzato dopo aver segnato l'articolo come già letto?" |
79 | redirect_homepage: 'Alla homepage' | 75 | redirect_homepage: 'Alla homepage' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 18d1173b..7d928613 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: "Nombre d'articles per pagina" | 68 | items_per_page_label: "Nombre d'articles per pagina" |
69 | language_label: 'Lenga' | 69 | language_label: 'Lenga' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'Velocitat de lectura' | 71 | label: 'Velocitat de lectura (mots per minuta)' |
72 | help_message: 'Podètz utilizar una aisina en linha per estimar vòstra velocitat de lectura :' | 72 | help_message: 'Podètz utilizar una aisina en linha per estimar vòstra velocitat de lectura :' |
73 | 100_word: "Legissi a l'entorn de 100 mots per minuta" | ||
74 | 200_word: "Legissi a l'entorn de 200 mots per minuta" | ||
75 | 300_word: "Legissi a l'entorn de 300 mots per minuta" | ||
76 | 400_word: "Legissi a l'entorn de 400 mots per minuta" | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | label: 'Ont volètz èsser menat aprèp aver marcat un article coma legit ?' | 74 | label: 'Ont volètz èsser menat aprèp aver marcat un article coma legit ?' |
79 | redirect_homepage: "A la pagina d’acuèlh" | 75 | redirect_homepage: "A la pagina d’acuèlh" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 6528a562..8e7ad7f2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Ilość elementów na stronie' | 68 | items_per_page_label: 'Ilość elementów na stronie' |
69 | language_label: 'Język' | 69 | language_label: 'Język' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'Prędkość czytania' | 71 | label: 'Prędkość czytania (słów na minutę)' |
72 | help_message: 'Możesz skorzystać z narzędzi online do określenia twojej prędkości czytania:' | 72 | help_message: 'Możesz skorzystać z narzędzi online do określenia twojej prędkości czytania:' |
73 | 100_word: 'Czytam ~100 słów na minutę' | ||
74 | 200_word: 'Czytam ~200 słów na minutę' | ||
75 | 300_word: 'Czytam ~300 słów na minutę' | ||
76 | 400_word: 'Czytam ~400 słów na minutę' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | label: 'Gdzie zostaniesz przekierowany po oznaczeniu artukuły jako przeczytanego' | 74 | label: 'Gdzie zostaniesz przekierowany po oznaczeniu artukuły jako przeczytanego' |
79 | redirect_homepage: 'do strony głównej' | 75 | redirect_homepage: 'do strony głównej' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 3f1c7a68..ee45c085 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Itens por página' | 68 | items_per_page_label: 'Itens por página' |
69 | language_label: 'Idioma' | 69 | language_label: 'Idioma' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'Velocidade de leitura' | 71 | label: 'Velocidade de leitura (palavras por minuto)' |
72 | help_message: 'Você pode usar ferramentas online para estimar sua velocidade de leitura:' | 72 | help_message: 'Você pode usar ferramentas online para estimar sua velocidade de leitura:' |
73 | 100_word: 'Posso ler ~100 palavras por minuto' | ||
74 | 200_word: 'Posso ler ~200 palavras por minuto' | ||
75 | 300_word: 'Posso ler ~300 palavras por minuto' | ||
76 | 400_word: 'Posso ler ~400 palavras por minuto' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | # label: 'Where do you want to be redirected to after marking an article as read?' | 74 | # label: 'Where do you want to be redirected to after marking an article as read?' |
79 | # redirect_homepage: 'To the homepage' | 75 | # redirect_homepage: 'To the homepage' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index d82e9377..edfc77a2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Articole pe pagină' | 68 | items_per_page_label: 'Articole pe pagină' |
69 | language_label: 'Limbă' | 69 | language_label: 'Limbă' |
70 | reading_speed: | 70 | reading_speed: |
71 | # label: 'Reading speed' | 71 | # label: 'Reading speed (words per minute)' |
72 | # help_message: 'You can use online tools to estimate your reading speed:' | 72 | # help_message: 'You can use online tools to estimate your reading speed:' |
73 | # 100_word: 'I read ~100 words per minute' | ||
74 | # 200_word: 'I read ~200 words per minute' | ||
75 | # 300_word: 'I read ~300 words per minute' | ||
76 | # 400_word: 'I read ~400 words per minute' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | # label: 'Where do you want to be redirected to after marking an article as read?' | 74 | # label: 'Where do you want to be redirected to after marking an article as read?' |
79 | # redirect_homepage: 'To the homepage' | 75 | # redirect_homepage: 'To the homepage' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index 23d31333..c99da444 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Записей на странице' | 68 | items_per_page_label: 'Записей на странице' |
69 | language_label: 'Язык' | 69 | language_label: 'Язык' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'Скорость чтения' | 71 | label: 'Скорость чтения (слов в минуту)' |
72 | help_message: 'Вы можете использовать онлайн-инструменты для оценки скорости чтения:' | 72 | help_message: 'Вы можете использовать онлайн-инструменты для оценки скорости чтения:' |
73 | 100_word: 'Я читаю ~100 слов в минуту' | ||
74 | 200_word: 'Я читаю ~200 слов в минуту' | ||
75 | 300_word: 'Я читаю ~300 слов в минуту' | ||
76 | 400_word: 'Я читаю ~400 слов в минуту' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | label: 'Куда Вы хотите быть перенаправлены, после пометки записи, как прочитанная?' | 74 | label: 'Куда Вы хотите быть перенаправлены, после пометки записи, как прочитанная?' |
79 | redirect_homepage: 'На домашнюю страницу' | 75 | redirect_homepage: 'На домашнюю страницу' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index d7f47904..9927d059 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'ไอเทมต่อหน้า' | 68 | items_per_page_label: 'ไอเทมต่อหน้า' |
69 | language_label: 'ภาษา' | 69 | language_label: 'ภาษา' |
70 | reading_speed: | 70 | reading_speed: |
71 | label: 'การอ่านแบบด่วน' | 71 | label: 'การอ่านแบบด่วน (คำต่อนาที)' |
72 | help_message: 'คุณสามารถใช้เครื่องมือออนไลน์เพื่อประเมินการอ่านแบบด่วน:' | 72 | help_message: 'คุณสามารถใช้เครื่องมือออนไลน์เพื่อประเมินการอ่านแบบด่วน:' |
73 | 100_word: 'ฉันอ่าน ~100 คำต่อนาที' | ||
74 | 200_word: 'ฉันอ่าน ~200 คำต่อนาท' | ||
75 | 300_word: 'ฉันอ่าน ~300 คำต่อนาท' | ||
76 | 400_word: 'ฉันอ่าน ~400 คำต่อนาท' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | label: 'คุณต้องการเปลี่ยนทิศทางหลังจากระบุเครื่องหมายรายการอ่านที่ไหน?' | 74 | label: 'คุณต้องการเปลี่ยนทิศทางหลังจากระบุเครื่องหมายรายการอ่านที่ไหน?' |
79 | redirect_homepage: 'ไปยังโฮมเพจ' | 75 | redirect_homepage: 'ไปยังโฮมเพจ' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index a444cadb..60fa44d5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -68,12 +68,8 @@ config: | |||
68 | items_per_page_label: 'Sayfa başına makale sayısı' | 68 | items_per_page_label: 'Sayfa başına makale sayısı' |
69 | language_label: 'Dil' | 69 | language_label: 'Dil' |
70 | reading_speed: | 70 | reading_speed: |
71 | # label: 'Reading speed' | 71 | # label: 'Reading speed (words per minute)' |
72 | # help_message: 'You can use online tools to estimate your reading speed:' | 72 | # help_message: 'You can use online tools to estimate your reading speed:' |
73 | # 100_word: 'I read ~100 words per minute' | ||
74 | # 200_word: 'I read ~200 words per minute' | ||
75 | # 300_word: 'I read ~300 words per minute' | ||
76 | # 400_word: 'I read ~400 words per minute' | ||
77 | action_mark_as_read: | 73 | action_mark_as_read: |
78 | # label: 'Where do you want to be redirected to after marking an article as read?' | 74 | # label: 'Where do you want to be redirected to after marking an article as read?' |
79 | # redirect_homepage: 'To the homepage' | 75 | # redirect_homepage: 'To the homepage' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 6c5d2601..d8b39160 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -46,7 +46,7 @@ | |||
46 | <div id="entry-{{ entry.id|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}"> | 46 | <div id="entry-{{ entry.id|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}"> |
47 | <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|e|raw }}">{{ entry.title | striptags | truncate(80, true, '…') | default('entry.default_title'|trans) | raw }}</a></h2> | 47 | <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|e|raw }}">{{ entry.title | striptags | truncate(80, true, '…') | default('entry.default_title'|trans) | raw }}</a></h2> |
48 | 48 | ||
49 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 49 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed * 200 %} |
50 | <div class="estimatedTime"> | 50 | <div class="estimatedTime"> |
51 | <span class="tool reading-time"> | 51 | <span class="tool reading-time"> |
52 | {% if readingTime > 0 %} | 52 | {% if readingTime > 0 %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index e87ba201..7616cf4c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | |||
@@ -62,7 +62,7 @@ | |||
62 | {% endif %} | 62 | {% endif %} |
63 | 63 | ||
64 | <i class="tool icon icon-time"> | 64 | <i class="tool icon icon-time"> |
65 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 65 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed * 200 %} |
66 | {% if readingTime > 0 %} | 66 | {% if readingTime > 0 %} |
67 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | 67 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} |
68 | {% else %} | 68 | {% else %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig index 6ba18768..b7167e95 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig | |||
@@ -1,4 +1,4 @@ | |||
1 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 1 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed * 200 %} |
2 | <i class="material-icons">timer</i> | 2 | <i class="material-icons">timer</i> |
3 | {% if readingTime > 0 %} | 3 | {% if readingTime > 0 %} |
4 | <span>{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}</span> | 4 | <span>{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}</span> |
diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php index d8b5f383..46c90075 100644 --- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php | |||
@@ -51,7 +51,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
51 | $data = [ | 51 | $data = [ |
52 | 'config[theme]' => 'baggy', | 52 | 'config[theme]' => 'baggy', |
53 | 'config[items_per_page]' => '30', | 53 | 'config[items_per_page]' => '30', |
54 | 'config[reading_speed]' => '0.5', | 54 | 'config[reading_speed]' => '100', |
55 | 'config[action_mark_as_read]' => '0', | 55 | 'config[action_mark_as_read]' => '0', |
56 | 'config[language]' => 'en', | 56 | 'config[language]' => 'en', |
57 | ]; | 57 | ]; |
@@ -92,7 +92,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
92 | $crawler = $client->request('GET', '/config'); | 92 | $crawler = $client->request('GET', '/config'); |
93 | $form = $crawler->filter('button[id=config_save]')->form(); | 93 | $form = $crawler->filter('button[id=config_save]')->form(); |
94 | $data = [ | 94 | $data = [ |
95 | 'config[reading_speed]' => '2', | 95 | 'config[reading_speed]' => '400', |
96 | ]; | 96 | ]; |
97 | $client->submit($form, $data); | 97 | $client->submit($form, $data); |
98 | 98 | ||
@@ -106,7 +106,7 @@ class ConfigControllerTest extends WallabagCoreTestCase | |||
106 | $crawler = $client->request('GET', '/config'); | 106 | $crawler = $client->request('GET', '/config'); |
107 | $form = $crawler->filter('button[id=config_save]')->form(); | 107 | $form = $crawler->filter('button[id=config_save]')->form(); |
108 | $data = [ | 108 | $data = [ |
109 | 'config[reading_speed]' => '0.5', | 109 | 'config[reading_speed]' => '100', |
110 | ]; | 110 | ]; |
111 | $client->submit($form, $data); | 111 | $client->submit($form, $data); |
112 | } | 112 | } |