forked from wallabag/wallabag
Convert english translation file
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
This commit is contained in:
@ -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'))) {
|
||||
|
||||
Reference in New Issue
Block a user