diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-11-17 09:40:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-17 09:40:46 +0100 |
commit | 66336f65714433996bb5574662d50d9a8cf03aff (patch) | |
tree | 756e3b340815a321c10aacaab2a6d03046a53b9a /src/Wallabag | |
parent | e042a5d78fc7676eb399f61d199e8ec0045fbd1f (diff) | |
parent | 9e2440fe15633532c2bf62feac1535a85d6eb840 (diff) | |
download | wallabag-66336f65714433996bb5574662d50d9a8cf03aff.tar.gz wallabag-66336f65714433996bb5574662d50d9a8cf03aff.tar.zst wallabag-66336f65714433996bb5574662d50d9a8cf03aff.zip |
Merge pull request #2547 from wallabag/add-option-markasread
Added a configuration to define the redirection after archiving an entry
Diffstat (limited to 'src/Wallabag')
19 files changed, 142 insertions, 22 deletions
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php index 921c739f..45358022 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php | |||
@@ -21,6 +21,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface | |||
21 | $adminConfig->setReadingSpeed(1); | 21 | $adminConfig->setReadingSpeed(1); |
22 | $adminConfig->setLanguage('en'); | 22 | $adminConfig->setLanguage('en'); |
23 | $adminConfig->setPocketConsumerKey('xxxxx'); | 23 | $adminConfig->setPocketConsumerKey('xxxxx'); |
24 | $adminConfig->setActionMarkAsRead(0); | ||
24 | 25 | ||
25 | $manager->persist($adminConfig); | 26 | $manager->persist($adminConfig); |
26 | 27 | ||
@@ -32,6 +33,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface | |||
32 | $bobConfig->setReadingSpeed(1); | 33 | $bobConfig->setReadingSpeed(1); |
33 | $bobConfig->setLanguage('fr'); | 34 | $bobConfig->setLanguage('fr'); |
34 | $bobConfig->setPocketConsumerKey(null); | 35 | $bobConfig->setPocketConsumerKey(null); |
36 | $bobConfig->setActionMarkAsRead(1); | ||
35 | 37 | ||
36 | $manager->persist($bobConfig); | 38 | $manager->persist($bobConfig); |
37 | 39 | ||
@@ -43,6 +45,7 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface | |||
43 | $emptyConfig->setReadingSpeed(1); | 45 | $emptyConfig->setReadingSpeed(1); |
44 | $emptyConfig->setLanguage('en'); | 46 | $emptyConfig->setLanguage('en'); |
45 | $emptyConfig->setPocketConsumerKey(null); | 47 | $emptyConfig->setPocketConsumerKey(null); |
48 | $emptyConfig->setActionMarkAsRead(0); | ||
46 | 49 | ||
47 | $manager->persist($emptyConfig); | 50 | $manager->persist($emptyConfig); |
48 | 51 | ||
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index d0f0e3f3..bfc2fff8 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php | |||
@@ -16,6 +16,9 @@ use Wallabag\UserBundle\Entity\User; | |||
16 | */ | 16 | */ |
17 | class Config | 17 | class Config |
18 | { | 18 | { |
19 | const REDIRECT_TO_HOMEPAGE = 0; | ||
20 | const REDIRECT_TO_CURRENT_PAGE = 1; | ||
21 | |||
19 | /** | 22 | /** |
20 | * @var int | 23 | * @var int |
21 | * | 24 | * |
@@ -88,6 +91,13 @@ class Config | |||
88 | private $pocketConsumerKey; | 91 | private $pocketConsumerKey; |
89 | 92 | ||
90 | /** | 93 | /** |
94 | * @var int | ||
95 | * | ||
96 | * @ORM\Column(name="action_mark_as_read", type="integer", nullable=true) | ||
97 | */ | ||
98 | private $actionMarkAsRead; | ||
99 | |||
100 | /** | ||
91 | * @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config") | 101 | * @ORM\OneToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="config") |
92 | */ | 102 | */ |
93 | private $user; | 103 | private $user; |
@@ -310,6 +320,26 @@ class Config | |||
310 | } | 320 | } |
311 | 321 | ||
312 | /** | 322 | /** |
323 | * @return int | ||
324 | */ | ||
325 | public function getActionMarkAsRead() | ||
326 | { | ||
327 | return $this->actionMarkAsRead; | ||
328 | } | ||
329 | |||
330 | /** | ||
331 | * @param int $actionMarkAsRead | ||
332 | * | ||
333 | * @return Config | ||
334 | */ | ||
335 | public function setActionMarkAsRead($actionMarkAsRead) | ||
336 | { | ||
337 | $this->actionMarkAsRead = $actionMarkAsRead; | ||
338 | |||
339 | return $this; | ||
340 | } | ||
341 | |||
342 | /** | ||
313 | * @param TaggingRule $rule | 343 | * @param TaggingRule $rule |
314 | * | 344 | * |
315 | * @return Config | 345 | * @return Config |
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 0bac2874..7e3b9dd4 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -7,6 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType; | |||
7 | use Symfony\Component\Form\Extension\Core\Type\SubmitType; | 7 | use Symfony\Component\Form\Extension\Core\Type\SubmitType; |
8 | use Symfony\Component\Form\FormBuilderInterface; | 8 | use Symfony\Component\Form\FormBuilderInterface; |
9 | use Symfony\Component\OptionsResolver\OptionsResolver; | 9 | use Symfony\Component\OptionsResolver\OptionsResolver; |
10 | use Wallabag\CoreBundle\Entity\Config; | ||
10 | 11 | ||
11 | class ConfigType extends AbstractType | 12 | class ConfigType extends AbstractType |
12 | { | 13 | { |
@@ -48,6 +49,13 @@ class ConfigType extends AbstractType | |||
48 | 'config.form_settings.reading_speed.400_word' => '2', | 49 | 'config.form_settings.reading_speed.400_word' => '2', |
49 | ], | 50 | ], |
50 | ]) | 51 | ]) |
52 | ->add('action_mark_as_read', ChoiceType::class, [ | ||
53 | 'label' => 'config.form_settings.action_mark_as_read.label', | ||
54 | 'choices' => [ | ||
55 | 'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE, | ||
56 | 'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE, | ||
57 | ], | ||
58 | ]) | ||
51 | ->add('language', ChoiceType::class, [ | 59 | ->add('language', ChoiceType::class, [ |
52 | 'choices' => array_flip($this->languages), | 60 | 'choices' => array_flip($this->languages), |
53 | 'label' => 'config.form_settings.language_label', | 61 | 'label' => 'config.form_settings.language_label', |
diff --git a/src/Wallabag/CoreBundle/Helper/Redirect.php b/src/Wallabag/CoreBundle/Helper/Redirect.php index c14c79d1..f78b7fe0 100644 --- a/src/Wallabag/CoreBundle/Helper/Redirect.php +++ b/src/Wallabag/CoreBundle/Helper/Redirect.php | |||
@@ -3,6 +3,8 @@ | |||
3 | namespace Wallabag\CoreBundle\Helper; | 3 | namespace Wallabag\CoreBundle\Helper; |
4 | 4 | ||
5 | use Symfony\Component\Routing\Router; | 5 | use Symfony\Component\Routing\Router; |
6 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; | ||
7 | use Wallabag\CoreBundle\Entity\Config; | ||
6 | 8 | ||
7 | /** | 9 | /** |
8 | * Manage redirections to avoid redirecting to empty routes. | 10 | * Manage redirections to avoid redirecting to empty routes. |
@@ -10,10 +12,12 @@ use Symfony\Component\Routing\Router; | |||
10 | class Redirect | 12 | class Redirect |
11 | { | 13 | { |
12 | private $router; | 14 | private $router; |
15 | private $tokenStorage; | ||
13 | 16 | ||
14 | public function __construct(Router $router) | 17 | public function __construct(Router $router, TokenStorageInterface $tokenStorage) |
15 | { | 18 | { |
16 | $this->router = $router; | 19 | $this->router = $router; |
20 | $this->tokenStorage = $tokenStorage; | ||
17 | } | 21 | } |
18 | 22 | ||
19 | /** | 23 | /** |
@@ -24,6 +28,16 @@ class Redirect | |||
24 | */ | 28 | */ |
25 | public function to($url, $fallback = '') | 29 | public function to($url, $fallback = '') |
26 | { | 30 | { |
31 | $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; | ||
32 | |||
33 | if (null === $user || !is_object($user)) { | ||
34 | return $url; | ||
35 | } | ||
36 | |||
37 | if (Config::REDIRECT_TO_HOMEPAGE === $user->getConfig()->getActionMarkAsRead()) { | ||
38 | return $this->router->generate('homepage'); | ||
39 | } | ||
40 | |||
27 | if (null !== $url) { | 41 | if (null !== $url) { |
28 | return $url; | 42 | return $url; |
29 | } | 43 | } |
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 9786ac27..dad9bd42 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -109,6 +109,7 @@ services: | |||
109 | class: Wallabag\CoreBundle\Helper\Redirect | 109 | class: Wallabag\CoreBundle\Helper\Redirect |
110 | arguments: | 110 | arguments: |
111 | - "@router" | 111 | - "@router" |
112 | - "@security.token_storage" | ||
112 | 113 | ||
113 | wallabag_core.helper.prepare_pager_for_entries: | 114 | wallabag_core.helper.prepare_pager_for_entries: |
114 | class: Wallabag\CoreBundle\Helper\PreparePagerForEntries | 115 | class: Wallabag\CoreBundle\Helper\PreparePagerForEntries |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index b66aa3ea..c24c5965 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | # 200_word: 'I read ~200 words per minute' | 70 | # 200_word: 'I read ~200 words per minute' |
71 | # 300_word: 'I read ~300 words per minute' | 71 | # 300_word: 'I read ~300 words per minute' |
72 | # 400_word: 'I read ~400 words per minute' | 72 | # 400_word: 'I read ~400 words per minute' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer | 77 | pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer |
74 | # android_configuration: Configure your Android application | 78 | # android_configuration: Configure your Android application |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 9e19dcc4..561d276e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -70,8 +70,12 @@ config: | |||
70 | 200_word: 'Ich lese ~200 Wörter pro Minute' | 70 | 200_word: 'Ich lese ~200 Wörter pro Minute' |
71 | 300_word: 'Ich lese ~300 Wörter pro Minute' | 71 | 300_word: 'Ich lese ~300 Wörter pro Minute' |
72 | 400_word: 'Ich lese ~400 Wörter pro Minute' | 72 | 400_word: 'Ich lese ~400 Wörter pro Minute' |
73 | action_mark_as_read: | ||
74 | label: 'Wohin soll nach dem Gelesenmarkieren eines Artikels weitergeleitet werden?' | ||
75 | redirect_homepage: 'Zur Homepage' | ||
76 | redirect_current_page: 'Zur aktuellen Seite' | ||
73 | pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren | 77 | pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren |
74 | # android_configuration: Configure your Android application | 78 | android_configuration: Konfiguriere deine Android Application |
75 | form_rss: | 79 | form_rss: |
76 | description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' | 80 | description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' |
77 | token_label: 'RSS-Token' | 81 | token_label: 'RSS-Token' |
@@ -90,17 +94,17 @@ config: | |||
90 | email_label: 'E-Mail-Adresse' | 94 | email_label: 'E-Mail-Adresse' |
91 | twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' | 95 | twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' |
92 | delete: | 96 | delete: |
93 | # title: Delete my account (a.k.a danger zone) | 97 | title: Lösche mein Konto (a.k.a Gefahrenzone) |
94 | # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. | 98 | description: Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt. |
95 | # confirm: Are you really sure? (THIS CAN'T BE UNDONE) | 99 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) |
96 | # button: Delete my account | 100 | button: Lösche mein Konto |
97 | reset: | 101 | reset: |
98 | # title: Reset area (a.k.a danger zone) | 102 | title: Zurücksetzen (a.k.a Gefahrenzone) |
99 | # description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE. | 103 | description: Beim Nutzen der folgenden Schaltflächenhast du die Möglichkeit, einige Informationen von deinem Konto zu entfernen. Sei dir bewusst, dass dies NICHT RÜCKGÄNGIG zu machen ist. |
100 | # annotations: Remove ALL annotations | 104 | annotations: Entferne ALLE Annotationen |
101 | # tags: Remove ALL tags | 105 | tags: Entferne ALLE Tags |
102 | # entries: Remove ALL entries | 106 | entries: Entferne ALLE Einträge |
103 | # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 107 | confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) |
104 | form_password: | 108 | form_password: |
105 | old_password_label: 'Altes Kennwort' | 109 | old_password_label: 'Altes Kennwort' |
106 | new_password_label: 'Neues Kennwort' | 110 | new_password_label: 'Neues Kennwort' |
@@ -371,7 +375,7 @@ import: | |||
371 | how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.' | 375 | how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.' |
372 | worker: | 376 | worker: |
373 | enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:" | 377 | enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:" |
374 | # download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors." | 378 | download_images_warning: "Du hast das Herunterladen von Bildern für deine Artikel aktiviert. Verbunden mit dem klassischen Import kann es ewig dauern fortzufahren (oder sogar fehlschlagen). Wir <strong>empfehlen</strong> den asynchronen Import zu aktivieren, um Fehler zu vermeiden." |
375 | firefox: | 379 | firefox: |
376 | page_title: 'Aus Firefox importieren' | 380 | page_title: 'Aus Firefox importieren' |
377 | description: "Dieser Import wird all deine Lesezeichen aus Firefox importieren. Gehe zu deinen Lesezeichen (Strg+Shift+O), dann auf \"Importen und Sichern\", wähle \"Sichern…\". Du erhälst eine .json Datei." | 381 | description: "Dieser Import wird all deine Lesezeichen aus Firefox importieren. Gehe zu deinen Lesezeichen (Strg+Shift+O), dann auf \"Importen und Sichern\", wähle \"Sichern…\". Du erhälst eine .json Datei." |
@@ -467,7 +471,7 @@ user: | |||
467 | back_to_list: Zurück zur Liste | 471 | back_to_list: Zurück zur Liste |
468 | 472 | ||
469 | error: | 473 | error: |
470 | # page_title: An error occurred | 474 | page_title: Ein Fehler ist aufgetreten |
471 | 475 | ||
472 | flashes: | 476 | flashes: |
473 | config: | 477 | config: |
@@ -480,9 +484,9 @@ flashes: | |||
480 | tagging_rules_updated: 'Tagging-Regeln aktualisiert' | 484 | tagging_rules_updated: 'Tagging-Regeln aktualisiert' |
481 | tagging_rules_deleted: 'Tagging-Regel gelöscht' | 485 | tagging_rules_deleted: 'Tagging-Regel gelöscht' |
482 | rss_token_updated: 'RSS-Token aktualisiert' | 486 | rss_token_updated: 'RSS-Token aktualisiert' |
483 | # annotations_reset: Annotations reset | 487 | annotations_reset: Anmerkungen zurücksetzen |
484 | # tags_reset: Tags reset | 488 | tags_reset: Tags zurücksetzen |
485 | # entries_reset: Entries reset | 489 | entries_reset: Einträge zurücksetzen |
486 | entry: | 490 | entry: |
487 | notice: | 491 | notice: |
488 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' | 492 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' |
@@ -514,6 +518,6 @@ flashes: | |||
514 | client_deleted: 'Client gelöscht' | 518 | client_deleted: 'Client gelöscht' |
515 | user: | 519 | user: |
516 | notice: | 520 | notice: |
517 | # added: 'User "%username%" added' | 521 | added: 'Benutzer "%username%" hinzugefügt' |
518 | # updated: 'User "%username%" updated' | 522 | updated: 'Benutzer "%username%" aktualisiert' |
519 | # deleted: 'User "%username%" deleted' | 523 | deleted: 'Benutzer "%username%" gelöscht' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 7516bbd5..ec49368c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | 200_word: 'I read ~200 words per minute' | 70 | 200_word: 'I read ~200 words per minute' |
71 | 300_word: 'I read ~300 words per minute' | 71 | 300_word: 'I read ~300 words per minute' |
72 | 400_word: 'I read ~400 words per minute' | 72 | 400_word: 'I read ~400 words per minute' |
73 | action_mark_as_read: | ||
74 | label: 'Where do you want to be redirected after mark an article as read?' | ||
75 | redirect_homepage: 'To the homepage' | ||
76 | redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Consumer key for Pocket to import contents | 77 | pocket_consumer_key_label: Consumer key for Pocket to import contents |
74 | android_configuration: Configure your Android application | 78 | android_configuration: Configure your Android application |
75 | form_rss: | 79 | form_rss: |
@@ -96,11 +100,11 @@ config: | |||
96 | button: Delete my account | 100 | button: Delete my account |
97 | reset: | 101 | reset: |
98 | title: Reset area (a.k.a danger zone) | 102 | title: Reset area (a.k.a danger zone) |
99 | description: By hiting buttons below you'll have ability to remove some informations from your account. Be aware that these actions are IRREVERSIBLE. | 103 | description: By hitting buttons below you'll have ability to remove some information from your account. Be aware that these actions are IRREVERSIBLE. |
100 | annotations: Remove ALL annotations | 104 | annotations: Remove ALL annotations |
101 | tags: Remove ALL tags | 105 | tags: Remove ALL tags |
102 | entries: Remove ALL entries | 106 | entries: Remove ALL entries |
103 | confirm: Are you really really sure? (THIS CAN'T BE UNDONE) | 107 | confirm: Are you really sure? (THIS CAN'T BE UNDONE) |
104 | form_password: | 108 | form_password: |
105 | old_password_label: 'Current password' | 109 | old_password_label: 'Current password' |
106 | new_password_label: 'New password' | 110 | new_password_label: 'New password' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 208982d9..15d0c3cf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | 200_word: 'Leo ~200 palabras por minuto' | 70 | 200_word: 'Leo ~200 palabras por minuto' |
71 | 300_word: 'Leo ~300 palabras por minuto' | 71 | 300_word: 'Leo ~300 palabras por minuto' |
72 | 400_word: 'Leo ~400 palabras por minuto' | 72 | 400_word: 'Leo ~400 palabras por minuto' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | # pocket_consumer_key_label: Consumer key for Pocket to import contents | 77 | # pocket_consumer_key_label: Consumer key for Pocket to import contents |
74 | # android_configuration: Configure your Android application | 78 | # android_configuration: Configure your Android application |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index c443b21c..e7fa4f86 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | 200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه میخوانم' | 70 | 200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه میخوانم' |
71 | 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه میخوانم' | 71 | 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه میخوانم' |
72 | 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه میخوانم' | 72 | 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه میخوانم' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب | 77 | pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب |
74 | # android_configuration: Configure your Android application | 78 | # android_configuration: Configure your Android application |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index ea759dd3..f85a797d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | 200_word: "Je lis environ 200 mots par minute" | 70 | 200_word: "Je lis environ 200 mots par minute" |
71 | 300_word: "Je lis environ 300 mots par minute" | 71 | 300_word: "Je lis environ 300 mots par minute" |
72 | 400_word: "Je lis environ 400 mots par minute" | 72 | 400_word: "Je lis environ 400 mots par minute" |
73 | action_mark_as_read: | ||
74 | label: 'Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?' | ||
75 | redirect_homepage: "À la page d'accueil" | ||
76 | redirect_current_page: 'À la page courante' | ||
73 | pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données | 77 | pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données |
74 | android_configuration: Configurez votre application Android | 78 | android_configuration: Configurez votre application Android |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index b3bc573b..8a8469d2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | 200_word: 'Leggo ~200 parole al minuto' | 70 | 200_word: 'Leggo ~200 parole al minuto' |
71 | 300_word: 'Leggo ~300 parole al minuto' | 71 | 300_word: 'Leggo ~300 parole al minuto' |
72 | 400_word: 'Leggo ~400 parole al minuto' | 72 | 400_word: 'Leggo ~400 parole al minuto' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti | 77 | pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti |
74 | # android_configuration: Configure your Android application | 78 | # android_configuration: Configure your Android application |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 97b5f4a9..d37dc724 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | 200_word: "Legissi a l'entorn de 200 mots per minuta" | 70 | 200_word: "Legissi a l'entorn de 200 mots per minuta" |
71 | 300_word: "Legissi a l'entorn de 300 mots per minuta" | 71 | 300_word: "Legissi a l'entorn de 300 mots per minuta" |
72 | 400_word: "Legissi a l'entorn de 400 mots per minuta" | 72 | 400_word: "Legissi a l'entorn de 400 mots per minuta" |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas | 77 | pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas |
74 | android_configuration: Configuratz vòstra aplicacion Android | 78 | android_configuration: Configuratz vòstra aplicacion Android |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index b4212b83..117a1e12 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | 200_word: 'Czytam ~200 słów na minutę' | 70 | 200_word: 'Czytam ~200 słów na minutę' |
71 | 300_word: 'Czytam ~300 słów na minutę' | 71 | 300_word: 'Czytam ~300 słów na minutę' |
72 | 400_word: 'Czytam ~400 słów na minutę' | 72 | 400_word: 'Czytam ~400 słów na minutę' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' | 77 | pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' |
74 | android_configuration: Skonfiguruj swoją androidową aplikację | 78 | android_configuration: Skonfiguruj swoją androidową aplikację |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index d8fc9d5c..5d2607af 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | 200_word: 'Posso ler ~200 palavras por minuto' | 70 | 200_word: 'Posso ler ~200 palavras por minuto' |
71 | 300_word: 'Posso ler ~300 palavras por minuto' | 71 | 300_word: 'Posso ler ~300 palavras por minuto' |
72 | 400_word: 'Posso ler ~400 palavras por minuto' | 72 | 400_word: 'Posso ler ~400 palavras por minuto' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' | 77 | pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' |
74 | # android_configuration: Configure your Android application | 78 | # android_configuration: Configure your Android application |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index d130e431..6b51d9ce 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | # 200_word: 'I read ~200 words per minute' | 70 | # 200_word: 'I read ~200 words per minute' |
71 | # 300_word: 'I read ~300 words per minute' | 71 | # 300_word: 'I read ~300 words per minute' |
72 | # 400_word: 'I read ~400 words per minute' | 72 | # 400_word: 'I read ~400 words per minute' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket | 77 | pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket |
74 | # android_configuration: Configure your Android application | 78 | # android_configuration: Configure your Android application |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index f67d8bee..9c392433 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -70,6 +70,10 @@ config: | |||
70 | # 200_word: 'I read ~200 words per minute' | 70 | # 200_word: 'I read ~200 words per minute' |
71 | # 300_word: 'I read ~300 words per minute' | 71 | # 300_word: 'I read ~300 words per minute' |
72 | # 400_word: 'I read ~400 words per minute' | 72 | # 400_word: 'I read ~400 words per minute' |
73 | action_mark_as_read: | ||
74 | # label: 'Where do you to be redirected after mark an article as read?' | ||
75 | # redirect_homepage: 'To the homepage' | ||
76 | # redirect_current_page: 'To the current page' | ||
73 | # pocket_consumer_key_label: Consumer key for Pocket to import contents | 77 | # pocket_consumer_key_label: Consumer key for Pocket to import contents |
74 | # android_configuration: Configure your Android application | 78 | # android_configuration: Configure your Android application |
75 | form_rss: | 79 | form_rss: |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index ec3b23c8..4c01b128 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -38,6 +38,14 @@ | |||
38 | 38 | ||
39 | <fieldset class="w500p inline"> | 39 | <fieldset class="w500p inline"> |
40 | <div class="row"> | 40 | <div class="row"> |
41 | {{ form_label(form.config.action_mark_as_read) }} | ||
42 | {{ form_errors(form.config.action_mark_as_read) }} | ||
43 | {{ form_widget(form.config.action_mark_as_read) }} | ||
44 | </div> | ||
45 | </fieldset> | ||
46 | |||
47 | <fieldset class="w500p inline"> | ||
48 | <div class="row"> | ||
41 | {{ form_label(form.config.language) }} | 49 | {{ form_label(form.config.language) }} |
42 | {{ form_errors(form.config.language) }} | 50 | {{ form_errors(form.config.language) }} |
43 | {{ form_widget(form.config.language) }} | 51 | {{ form_widget(form.config.language) }} |
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 f69d158f..e774795b 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 | |||
@@ -51,6 +51,14 @@ | |||
51 | </div> | 51 | </div> |
52 | </div> | 52 | </div> |
53 | 53 | ||
54 | <div class="row"> | ||
55 | <div class="input-field col s12"> | ||
56 | {{ form_label(form.config.action_mark_as_read) }} | ||
57 | {{ form_errors(form.config.action_mark_as_read) }} | ||
58 | {{ form_widget(form.config.action_mark_as_read) }} | ||
59 | </div> | ||
60 | </div> | ||
61 | |||
54 | <div class="row"> | 62 | <div class="row"> |
55 | <div class="input-field col s12"> | 63 | <div class="input-field col s12"> |
56 | {{ form_label(form.config.language) }} | 64 | {{ form_label(form.config.language) }} |