From 2f82e7f8e1827423e2dbe4a91089c66d3afff367 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 8 Oct 2016 10:57:57 +0200 Subject: Cleanup subscriber / listener definition --- src/Wallabag/UserBundle/Resources/config/services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index eb9c8e67..8062e53f 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml @@ -21,7 +21,7 @@ services: arguments: - WallabagUserBundle:User - wallabag_user.create_config: + wallabag_user.listener.create_config: class: Wallabag\UserBundle\EventListener\CreateConfigListener arguments: - "@doctrine.orm.entity_manager" -- cgit v1.2.3 From d7acde5cc3e391c4588c94f71252418ee39d13a2 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Nov 2016 20:07:47 +0100 Subject: Use the correct template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When resetting the password, the overriden template we used wasn’t well spelled. And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english. --- .../UserBundle/Resources/views/Resetting/checkEmail.html.twig | 11 ----------- .../Resources/views/Resetting/check_email.html.twig | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig create mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig deleted file mode 100644 index 66cbdc28..00000000 --- a/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "FOSUserBundle::layout.html.twig" %} - -{% trans_default_domain 'FOSUserBundle' %} - -{% block fos_user_content %} -
-
- {{ 'resetting.check_email'|trans({'%email%': email}) }} -
-
-{% endblock fos_user_content %} diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig new file mode 100644 index 00000000..e9d46dcc --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig @@ -0,0 +1,11 @@ +{% extends "FOSUserBundle::layout.html.twig" %} + +{% trans_default_domain 'FOSUserBundle' %} + +{% block fos_user_content %} +
+
+

{{ 'resetting.check_email'|trans({'%tokenLifetime%': tokenLifetime}) }}

+
+
+{% endblock fos_user_content %} -- cgit v1.2.3 From cda0662311c6ae95682d102d4c528edfc71f7c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 28 Nov 2016 12:44:17 +0100 Subject: Removed FOSUser attributes removed in alpha4 See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4 --- src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig | 8 -------- src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | 2 -- 2 files changed, 10 deletions(-) (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig index 67843f20..3ffd15f5 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig @@ -47,14 +47,6 @@ -
-
- {{ form_widget(edit_form.locked) }} - {{ form_label(edit_form.locked) }} - {{ form_errors(edit_form.locked) }} -
-
- {% if twofactor_auth %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig index 996bdb1a..daba29e4 100644 --- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig @@ -17,7 +17,6 @@ {{ 'user.form.username_label'|trans }} {{ 'user.form.email_label'|trans }} {{ 'user.form.last_login_label'|trans }} - {{ 'user.form.locked_label'|trans }} {{ 'user.list.actions'|trans }} @@ -27,7 +26,6 @@ {{ user.username }} {{ user.email }} {% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %} - {% if user.locked %}{{ 'user.list.yes'|trans }}{% else %}{{ 'user.list.no'|trans }}{% endif %} {{ 'user.list.edit_action'|trans }} -- cgit v1.2.3 From 68da51d2a39f5922a34090a0ec4ece295f85054d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 1 Dec 2016 10:51:04 +0100 Subject: Fixed 404 for wallabag logo in 2FA --- src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml | 2 +- .../UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml index 85f2ea9c..ee0a27d5 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml @@ -2,7 +2,7 @@ auth_code: on: 'on' mailer: - subject: 'Wallabag authentication Code' + subject: 'wallabag authentication code' body: hello: "Hi %user%," first_para: "Since you enable two factor authentication on your wallabag account and you just logged in from a new device (computer, phone, etc.), we send you a code to validate your connection." diff --git a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig b/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig index 3731f13b..5d1f22b7 100644 --- a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig @@ -74,7 +74,7 @@ - +
logologo

wallabag

{{ "auth_code.on"|trans({}, 'wallabag_user') }} {{ wallabag_url }}
-- cgit v1.2.3 From 87958ce6454d26ce1bb4686b98c087921bb0585e Mon Sep 17 00:00:00 2001 From: Sven Fischer Date: Thu, 1 Dec 2016 18:03:36 +0100 Subject: add translations/wallabag_user.de.yml (fixes #2673) --- .../UserBundle/Resources/translations/wallabag_user.de.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml new file mode 100644 index 00000000..85d155f7 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml @@ -0,0 +1,11 @@ +# Two factor mail +auth_code: + on: 'an' + mailer: + subject: 'Wallabag Authentifizierungcode' + body: + hello: "Hi %user%," + first_para: "da du die Zwei-Faktor-Authentifizierung in deinem wallabag Konto aktiviert hast, und du dich gerade von einem neuen Gerät (Computer, Handy, etc.) anmeldest, senden wir dir einen Code, um deinen Zugriff zu prüfen." + second_para: "Hier ist der Code:" + support: "Bitte zögere nicht, Kontakt mit uns aufzunehmen falls du ein Problem hast:" + signature: "Das wallabag Team" -- cgit v1.2.3 From 10d85dbae39ae22cd55f4363fda1ef065c83a109 Mon Sep 17 00:00:00 2001 From: Strubbl Date: Thu, 1 Dec 2016 18:23:41 +0100 Subject: Update wallabag_user.de.yml Wallabag->wallabag --- src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml index 85d155f7..4efaaab4 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.de.yml @@ -2,7 +2,7 @@ auth_code: on: 'an' mailer: - subject: 'Wallabag Authentifizierungcode' + subject: 'wallabag Authentifizierungcode' body: hello: "Hi %user%," first_para: "da du die Zwei-Faktor-Authentifizierung in deinem wallabag Konto aktiviert hast, und du dich gerade von einem neuen Gerät (Computer, Handy, etc.) anmeldest, senden wir dir einen Code, um deinen Zugriff zu prüfen." -- cgit v1.2.3 From 24879db1f73c85b121702ba8c6ea36bae285c7c3 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 12 Dec 2016 17:41:03 +0100 Subject: Add default value for list_mode --- src/Wallabag/UserBundle/Resources/config/services.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Wallabag/UserBundle/Resources') diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index 164a25ec..72f6f12c 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml @@ -31,5 +31,7 @@ services: - "%wallabag_core.rss_limit%" - "%wallabag_core.language%" - "%wallabag_core.reading_speed%" + - "%wallabag_core.action_mark_as_read%" + - "%wallabag_core.list_mode%" tags: - { name: kernel.event_subscriber } -- cgit v1.2.3