X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FController%2FPocketController.php;h=7a35514baf7803584f0ba08aea509b6c80545352;hb=0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc;hp=c88e115e4a426ae29b5da248092993c4a3db1965;hpb=d2b4f01d7435e8a8f99b15a2487916427c04e58d;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index c88e115e..7a35514b 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php @@ -17,8 +17,8 @@ class PocketController extends Controller { $pocket = $this->get('wallabag_import.pocket.import'); $form = $this->createFormBuilder($pocket) - ->add('read', CheckboxType::class, array( - 'label' => 'Mark all as read', + ->add('mark_as_read', CheckboxType::class, array( + 'label' => 'import.form.mark_as_read_label', 'required' => false, )) ->getForm(); @@ -39,7 +39,7 @@ class PocketController extends Controller ->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL)); $this->get('session')->set('import.pocket.code', $requestToken); - $this->get('session')->set('read', $request->request->get('form')['read']); + $this->get('session')->set('mark_as_read', $request->request->get('form')['mark_as_read']); return $this->redirect( 'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', array(), UrlGeneratorInterface::ABSOLUTE_URL), @@ -54,8 +54,8 @@ class PocketController extends Controller { $message = 'Import failed, please try again.'; $pocket = $this->get('wallabag_import.pocket.import'); - $markAsRead = $this->get('session')->get('read'); - $this->get('session')->remove('read'); + $markAsRead = $this->get('session')->get('mark_as_read'); + $this->get('session')->remove('mark_as_read'); // something bad happend on pocket side if (false === $pocket->authorize($this->get('session')->get('import.pocket.code'))) {