aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-08 19:39:50 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-08 20:25:42 +0200
commit876d77a67d1415c1be56f08e9a2d3b1d294bb61f (patch)
tree5811d482ca0baa6b9791721e518efbe4a543b92c /src/Wallabag/CoreBundle/Resources
parenteed812afd0626697d33f7e9d3bfd8eca138c463d (diff)
downloadwallabag-876d77a67d1415c1be56f08e9a2d3b1d294bb61f.tar.gz
wallabag-876d77a67d1415c1be56f08e9a2d3b1d294bb61f.tar.zst
wallabag-876d77a67d1415c1be56f08e9a2d3b1d294bb61f.zip
Better display and description
Confirmation message isn’t required since it is written in the delete description
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml9
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig12
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig8
13 files changed, 68 insertions, 51 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 4c412592..2de5d7bd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'Navn' 88 name_label: 'Navn'
89 email_label: 'Emailadresse' 89 email_label: 'Emailadresse'
90 # twoFactorAuthentication_label: 'Two factor authentication' 90 # twoFactorAuthentication_label: 'Two factor authentication'
91 # delete_account: 'Delete my account' 91 delete:
92 # title: Delete my account (danger zone !)
93 # 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.
94 # confirm: Are you really sure? (it can't be UNDONE)
95 # button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'Gammel adgangskode' 97 old_password_label: 'Gammel adgangskode'
94 new_password_label: 'Ny adgangskode' 98 new_password_label: 'Ny adgangskode'
@@ -487,6 +491,3 @@ flashes:
487 notice: 491 notice:
488 # client_created: 'New client created.' 492 # client_created: 'New client created.'
489 # client_deleted: 'Client deleted' 493 # client_deleted: 'Client deleted'
490 account:
491 notice:
492 # account_deleted: 'Account deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 99b79bce..515d43a0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'Name' 88 name_label: 'Name'
89 email_label: 'E-Mail-Adresse' 89 email_label: 'E-Mail-Adresse'
90 twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' 90 twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung'
91 # delete_account: 'Delete my account' 91 delete:
92 # title: Delete my account (danger zone !)
93 # 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.
94 # confirm: Are you really sure? (it can't be UNDONE)
95 # button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'Altes Kennwort' 97 old_password_label: 'Altes Kennwort'
94 new_password_label: 'Neues Kennwort' 98 new_password_label: 'Neues Kennwort'
@@ -487,6 +491,3 @@ flashes:
487 notice: 491 notice:
488 client_created: 'Neuer Client erstellt.' 492 client_created: 'Neuer Client erstellt.'
489 client_deleted: 'Client gelöscht' 493 client_deleted: 'Client gelöscht'
490 account:
491 notice:
492 # account_deleted: 'Account deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 94144ed4..43f5a950 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'Name' 88 name_label: 'Name'
89 email_label: 'Email' 89 email_label: 'Email'
90 twoFactorAuthentication_label: 'Two factor authentication' 90 twoFactorAuthentication_label: 'Two factor authentication'
91 delete_account: 'Delete my account' 91 delete:
92 title: Delete my account (danger zone !)
93 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.
94 confirm: Are you really sure? (it can't be UNDONE)
95 button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'Current password' 97 old_password_label: 'Current password'
94 new_password_label: 'New password' 98 new_password_label: 'New password'
@@ -486,9 +490,6 @@ flashes:
486 notice: 490 notice:
487 client_created: 'New client %name% created.' 491 client_created: 'New client %name% created.'
488 client_deleted: 'Client %name% deleted' 492 client_deleted: 'Client %name% deleted'
489 account:
490 notice:
491 account_deleted: 'Account deleted'
492 user: 493 user:
493 notice: 494 notice:
494 added: 'User "%username%" added' 495 added: 'User "%username%" added'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index a5e8d722..adeab2b0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'Nombre' 88 name_label: 'Nombre'
89 email_label: 'Direccion e-mail' 89 email_label: 'Direccion e-mail'
90 twoFactorAuthentication_label: 'Autentificación de dos factores' 90 twoFactorAuthentication_label: 'Autentificación de dos factores'
91 # delete_account: 'Delete my account' 91 delete:
92 # title: Delete my account (danger zone !)
93 # 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.
94 # confirm: Are you really sure? (it can't be UNDONE)
95 # button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'Contraseña actual' 97 old_password_label: 'Contraseña actual'
94 new_password_label: 'Nueva contraseña' 98 new_password_label: 'Nueva contraseña'
@@ -487,6 +491,3 @@ flashes:
487 notice: 491 notice:
488 client_created: 'Nuevo cliente creado.' 492 client_created: 'Nuevo cliente creado.'
489 client_deleted: 'Cliente suprimido' 493 client_deleted: 'Cliente suprimido'
490 account:
491 notice:
492 # account_deleted: 'Account deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 4b8d9689..0751752b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'نام' 88 name_label: 'نام'
89 email_label: 'نشانی ایمیل' 89 email_label: 'نشانی ایمیل'
90 twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای' 90 twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای'
91 # delete_account: 'Delete my account' 91 delete:
92 # title: Delete my account (danger zone !)
93 # 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.
94 # confirm: Are you really sure? (it can't be UNDONE)
95 # button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'رمز قدیمی' 97 old_password_label: 'رمز قدیمی'
94 new_password_label: 'رمز تازه' 98 new_password_label: 'رمز تازه'
@@ -486,6 +490,3 @@ flashes:
486 notice: 490 notice:
487 # client_created: 'New client created.' 491 # client_created: 'New client created.'
488 # client_deleted: 'Client deleted' 492 # client_deleted: 'Client deleted'
489 account:
490 notice:
491 # account_deleted: 'Account deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 67cd5f0e..1c32a77c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'Nom' 88 name_label: 'Nom'
89 email_label: 'Adresse e-mail' 89 email_label: 'Adresse e-mail'
90 twoFactorAuthentication_label: 'Double authentification' 90 twoFactorAuthentication_label: 'Double authentification'
91 delete_account: 'Supprimer mon compte' 91 delete:
92 title: Supprimer mon compte (attention danger !)
93 description: Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c'est IRRÉVERSIBLE). Vous serez ensuite déconnecté.
94 confirm: Vous êtes vraiment sûr ? (c'est IRRÉVERSIBLE !)
95 button: 'Supprimer mon compte'
92 form_password: 96 form_password:
93 old_password_label: 'Mot de passe actuel' 97 old_password_label: 'Mot de passe actuel'
94 new_password_label: 'Nouveau mot de passe' 98 new_password_label: 'Nouveau mot de passe'
@@ -487,6 +491,3 @@ flashes:
487 notice: 491 notice:
488 client_created: 'Nouveau client %name% créé' 492 client_created: 'Nouveau client %name% créé'
489 client_deleted: 'Client %name% supprimé' 493 client_deleted: 'Client %name% supprimé'
490 account:
491 notice:
492 account_deleted: 'Compte supprimé'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 55d961f3..f662bd55 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'Nome' 88 name_label: 'Nome'
89 email_label: 'E-mail' 89 email_label: 'E-mail'
90 twoFactorAuthentication_label: 'Two factor authentication' 90 twoFactorAuthentication_label: 'Two factor authentication'
91 # delete_account: 'Delete my account' 91 delete:
92 # title: Delete my account (danger zone !)
93 # 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.
94 # confirm: Are you really sure? (it can't be UNDONE)
95 # button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'Password corrente' 97 old_password_label: 'Password corrente'
94 new_password_label: 'Nuova password' 98 new_password_label: 'Nuova password'
@@ -487,6 +491,3 @@ flashes:
487 notice: 491 notice:
488 client_created: 'Nuovo client creato.' 492 client_created: 'Nuovo client creato.'
489 client_deleted: 'Client eliminato' 493 client_deleted: 'Client eliminato'
490 account:
491 notice:
492 # account_deleted: 'Account deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 5c6b4247..9e314f73 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'Nom' 88 name_label: 'Nom'
89 email_label: 'Adreça de corrièl' 89 email_label: 'Adreça de corrièl'
90 twoFactorAuthentication_label: 'Dobla autentificacion' 90 twoFactorAuthentication_label: 'Dobla autentificacion'
91 # delete_account: 'Delete my account' 91 delete:
92 # title: Delete my account (danger zone !)
93 # 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.
94 # confirm: Are you really sure? (it can't be UNDONE)
95 # button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'Senhal actual' 97 old_password_label: 'Senhal actual'
94 new_password_label: 'Senhal novèl' 98 new_password_label: 'Senhal novèl'
@@ -487,6 +491,3 @@ flashes:
487 notice: 491 notice:
488 client_created: 'Novèl client creat' 492 client_created: 'Novèl client creat'
489 client_deleted: 'Client suprimit' 493 client_deleted: 'Client suprimit'
490 account:
491 notice:
492 # account_deleted: 'Account deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index be966427..9877d59a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'Nazwa' 88 name_label: 'Nazwa'
89 email_label: 'Adres email' 89 email_label: 'Adres email'
90 twoFactorAuthentication_label: 'Autoryzacja dwuetapowa' 90 twoFactorAuthentication_label: 'Autoryzacja dwuetapowa'
91 # delete_account: 'Delete my account' 91 delete:
92 # title: Delete my account (danger zone !)
93 # 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.
94 # confirm: Are you really sure? (it can't be UNDONE)
95 # button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'Stare hasło' 97 old_password_label: 'Stare hasło'
94 new_password_label: 'Nowe hasło' 98 new_password_label: 'Nowe hasło'
@@ -487,6 +491,3 @@ flashes:
487 notice: 491 notice:
488 client_created: 'Nowy klient utworzony.' 492 client_created: 'Nowy klient utworzony.'
489 client_deleted: 'Klient usunięty' 493 client_deleted: 'Klient usunięty'
490 account:
491 notice:
492 # account_deleted: 'Account deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 1e52cf0b..83246ed3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'Nume' 88 name_label: 'Nume'
89 email_label: 'E-mail' 89 email_label: 'E-mail'
90 # twoFactorAuthentication_label: 'Two factor authentication' 90 # twoFactorAuthentication_label: 'Two factor authentication'
91 # delete_account: 'Delete my account' 91 delete:
92 # title: Delete my account (danger zone !)
93 # 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.
94 # confirm: Are you really sure? (it can't be UNDONE)
95 # button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'Parola veche' 97 old_password_label: 'Parola veche'
94 new_password_label: 'Parola nouă' 98 new_password_label: 'Parola nouă'
@@ -487,6 +491,3 @@ flashes:
487 notice: 491 notice:
488 # client_created: 'New client created.' 492 # client_created: 'New client created.'
489 # client_deleted: 'Client deleted' 493 # client_deleted: 'Client deleted'
490 account:
491 notice:
492 # account_deleted: 'Account deleted'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index ef5477e1..24dd6ff8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -88,7 +88,11 @@ config:
88 name_label: 'İsim' 88 name_label: 'İsim'
89 email_label: 'E-posta' 89 email_label: 'E-posta'
90 twoFactorAuthentication_label: 'İki adımlı doğrulama' 90 twoFactorAuthentication_label: 'İki adımlı doğrulama'
91 # delete_account: 'Delete my account' 91 delete:
92 # title: Delete my account (danger zone !)
93 # 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.
94 # confirm: Are you really sure? (it can't be UNDONE)
95 # button: Delete my account
92 form_password: 96 form_password:
93 old_password_label: 'Eski şifre' 97 old_password_label: 'Eski şifre'
94 new_password_label: 'Yeni şifre' 98 new_password_label: 'Yeni şifre'
@@ -486,6 +490,3 @@ flashes:
486 notice: 490 notice:
487 # client_created: 'New client created.' 491 # client_created: 'New client created.'
488 # client_deleted: 'Client deleted' 492 # client_deleted: 'Client deleted'
489 account:
490 notice:
491 # account_deleted: 'Account deleted'
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 b10db473..54508b6d 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
@@ -148,11 +148,17 @@
148 148
149 {{ form_widget(form.user._token) }} 149 {{ form_widget(form.user._token) }}
150 {{ form_widget(form.user.save) }} 150 {{ form_widget(form.user.save) }}
151 {% if enabled_users > 1 %}
152 <a class='btn red delete-account' href='{{ path('delete_account') }}'>{{ 'config.form_user.delete_account' | trans }}</a>
153 {% endif %}
154 </form> 151 </form>
155 152
153 {% if enabled_users > 1 %}
154 <h2>{{ 'config.form_user.delete.title'|trans }}</h2>
155
156 <p>{{ 'config.form_user.delete.description'|trans }}</p>
157 <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
158 {{ 'config.form_user.delete.button'|trans }}
159 </a>
160 {% endif %}
161
156 <h2>{{ 'config.tab_menu.password'|trans }}</h2> 162 <h2>{{ 'config.tab_menu.password'|trans }}</h2>
157 163
158 {{ form_start(form.pwd) }} 164 {{ form_start(form.pwd) }}
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 25d259b8..8434508d 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
@@ -172,10 +172,10 @@
172 <br /><hr /><br /> 172 <br /><hr /><br />
173 173
174 <div class="row"> 174 <div class="row">
175 <h5>{{ 'config.delete.title'|trans }}</h5> 175 <h5>{{ 'config.form_user.delete.title'|trans }}</h5>
176 <p>{{ 'config.delete.description'|trans }}</p> 176 <p>{{ 'config.form_user.delete.description'|trans }}</p>
177 <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account"> 177 <a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.form_user.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
178 {{ 'config.form_user.delete_account' | trans }} 178 {{ 'config.form_user.delete.button'|trans }}
179 </a> 179 </a>
180 </div> 180 </div>
181 {% endif %} 181 {% endif %}