diff options
author | Maxime <maxime.m62@gmail.com> | 2017-04-15 21:18:24 +0200 |
---|---|---|
committer | Maxime <maxime.m62@gmail.com> | 2017-04-15 21:18:24 +0200 |
commit | d35bf13a677b194371b486231670e23ddafef534 (patch) | |
tree | 4f563970548aa769905446cfd67883c6302fc5b6 | |
parent | ee857bed698881ab560517cf12d7b9e0f7d99dc4 (diff) | |
download | wallabag-qrcode-for-wallabagiosapp.tar.gz wallabag-qrcode-for-wallabagiosapp.tar.zst wallabag-qrcode-for-wallabagiosapp.zip |
Remove iphone to be more genericqrcode-for-wallabagiosapp
And rename scheme wallabagv2 -> wallabag-token
13 files changed, 14 insertions, 14 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index cbafac7f..efec7a04 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | # field_uris: 'Redirect URIs' | 452 | # field_uris: 'Redirect URIs' |
453 | # field_grant_types: 'Grant type allowed' | 453 | # field_grant_types: 'Grant type allowed' |
454 | # no_client: 'No client yet.' | 454 | # no_client: 'No client yet.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | # remove: | 456 | # remove: |
457 | # warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !' | 457 | # warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !' |
458 | # warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." | 458 | # warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index e474cc3a..b4b96e2b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | field_uris: 'Weiterleitungs-URIs' | 452 | field_uris: 'Weiterleitungs-URIs' |
453 | field_grant_types: "Erlaubte grant_types" | 453 | field_grant_types: "Erlaubte grant_types" |
454 | no_client: 'Bisher kein Client.' | 454 | no_client: 'Bisher kein Client.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | remove: | 456 | remove: |
457 | warn_message_1: 'Du hast die Möglichkeit, diesen Client zu entfernen. DIESE AKTION IST NICHT WIDERRUFBAR!' | 457 | warn_message_1: 'Du hast die Möglichkeit, diesen Client zu entfernen. DIESE AKTION IST NICHT WIDERRUFBAR!' |
458 | warn_message_2: "Wenn du ihn entfernst, hat keine der damit konfigurierten Anwendungen mehr die Möglichkeit, sich in deinen wallabag-Konto anzumelden." | 458 | warn_message_2: "Wenn du ihn entfernst, hat keine der damit konfigurierten Anwendungen mehr die Möglichkeit, sich in deinen wallabag-Konto anzumelden." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 2fcb7d3c..3786d87f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | field_uris: 'Redirect URIs' | 452 | field_uris: 'Redirect URIs' |
453 | field_grant_types: 'Grant type allowed' | 453 | field_grant_types: 'Grant type allowed' |
454 | no_client: 'No client yet.' | 454 | no_client: 'No client yet.' |
455 | show_qrcode_iphone: 'Show QRCode iPhone' | 455 | show_qrcode: 'Show QRCode' |
456 | remove: | 456 | remove: |
457 | warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !' | 457 | warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !' |
458 | warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." | 458 | warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index d0522742..2a076df4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | field_uris: 'URIs de redirección' | 452 | field_uris: 'URIs de redirección' |
453 | field_grant_types: 'Permisos concedidos' | 453 | field_grant_types: 'Permisos concedidos' |
454 | no_client: 'Todavía no hay clientes.' | 454 | no_client: 'Todavía no hay clientes.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | remove: | 456 | remove: |
457 | warn_message_1: 'Tienes permiso para eliminar el cliente %name%. ¡Está acción es IRREVERSIBLE!' | 457 | warn_message_1: 'Tienes permiso para eliminar el cliente %name%. ¡Está acción es IRREVERSIBLE!' |
458 | warn_message_2: "Si lo eliminas, cada aplicación configurada con ese cliente no podrá autenticarse en wallabag." | 458 | warn_message_2: "Si lo eliminas, cada aplicación configurada con ese cliente no podrá autenticarse en wallabag." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index dd81a525..5ab21152 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | # field_uris: 'Redirect URIs' | 452 | # field_uris: 'Redirect URIs' |
453 | # field_grant_types: 'Grant type allowed' | 453 | # field_grant_types: 'Grant type allowed' |
454 | # no_client: 'No client yet.' | 454 | # no_client: 'No client yet.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | # remove: | 456 | # remove: |
457 | # warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !' | 457 | # warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !' |
458 | # warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." | 458 | # warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 93f89498..fa20d43a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | field_uris: "Adresse de redirection" | 452 | field_uris: "Adresse de redirection" |
453 | field_grant_types: "Type de privilège accordé" | 453 | field_grant_types: "Type de privilège accordé" |
454 | no_client: "Aucun client pour le moment" | 454 | no_client: "Aucun client pour le moment" |
455 | show_qrcode_iphone: 'Voir le QRCode iPhone' | 455 | show_qrcode: 'Voir le QRCode' |
456 | remove: | 456 | remove: |
457 | warn_message_1: "Vous avez la possibilité de supprimer le client %name%. Cette action est IRRÉVERSIBLE !" | 457 | warn_message_1: "Vous avez la possibilité de supprimer le client %name%. Cette action est IRRÉVERSIBLE !" |
458 | warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l’utilisaient ne fonctionneront plus avec votre compte wallabag." | 458 | warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l’utilisaient ne fonctionneront plus avec votre compte wallabag." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 3e61140d..e237eb1b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | field_uris: 'Redirect URI' | 452 | field_uris: 'Redirect URI' |
453 | field_grant_types: 'Tipi di grant permessi' | 453 | field_grant_types: 'Tipi di grant permessi' |
454 | no_client: 'Ancora nessun client.' | 454 | no_client: 'Ancora nessun client.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | remove: | 456 | remove: |
457 | warn_message_1: "Hai la possibilitò di rimuovere questo client.L'operazione è IRREVERSIBILE!" | 457 | warn_message_1: "Hai la possibilitò di rimuovere questo client.L'operazione è IRREVERSIBILE!" |
458 | warn_message_2: "Se lo rimuovi, ogni app configurata con questo client non sarà più in grado di autenticarsi." | 458 | warn_message_2: "Se lo rimuovi, ogni app configurata con questo client non sarà più in grado di autenticarsi." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 81d80a52..f5a09d6d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | field_uris: 'URLs de redireccion' | 452 | field_uris: 'URLs de redireccion' |
453 | field_grant_types: 'Tipe de privilègi acordat' | 453 | field_grant_types: 'Tipe de privilègi acordat' |
454 | no_client: 'Pas cap de client pel moment.' | 454 | no_client: 'Pas cap de client pel moment.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | remove: | 456 | remove: |
457 | warn_message_1: 'Avètz la possibilitat de supriimr un client. Aquesta accion es IRREVERSIBLA !' | 457 | warn_message_1: 'Avètz la possibilitat de supriimr un client. Aquesta accion es IRREVERSIBLA !' |
458 | warn_message_2: "Se suprimissètz un client, totas las aplicacions que l'emplegan foncionaràn pas mai amb vòstre compte wallabag." | 458 | warn_message_2: "Se suprimissètz un client, totas las aplicacions que l'emplegan foncionaràn pas mai amb vòstre compte wallabag." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index ce8eb4bc..64617ae6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | field_uris: 'Przekieruj URIs' | 452 | field_uris: 'Przekieruj URIs' |
453 | field_grant_types: 'Przyznaj pozwolenie' | 453 | field_grant_types: 'Przyznaj pozwolenie' |
454 | no_client: 'Nie ma jeszcze klienta.' | 454 | no_client: 'Nie ma jeszcze klienta.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | remove: | 456 | remove: |
457 | warn_message_1: 'Masz możliwość usunięcia tego klienta. Ta akcja jest NIEODWRACALNA !' | 457 | warn_message_1: 'Masz możliwość usunięcia tego klienta. Ta akcja jest NIEODWRACALNA !' |
458 | warn_message_2: "Jeżeli go usuniesz, aplikacje skonfigurowane z tym klientem nię będa w stanie autoryzować twojego wallabag." | 458 | warn_message_2: "Jeżeli go usuniesz, aplikacje skonfigurowane z tym klientem nię będa w stanie autoryzować twojego wallabag." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 5f121fad..a0430858 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | field_uris: 'URIs de redirecionamento' | 452 | field_uris: 'URIs de redirecionamento' |
453 | field_grant_types: 'Tipo permitido' | 453 | field_grant_types: 'Tipo permitido' |
454 | no_client: 'Nenhum cliente até agora.' | 454 | no_client: 'Nenhum cliente até agora.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | remove: | 456 | remove: |
457 | warn_message_1: 'Você tem permissão pare remover este cliente. Esta ação é IRREVERSÍVEL !' | 457 | warn_message_1: 'Você tem permissão pare remover este cliente. Esta ação é IRREVERSÍVEL !' |
458 | warn_message_2: 'Se você remover isso, todo o aplicativo configurado com este cliente não poderá se autenticar no seu wallabag.' | 458 | warn_message_2: 'Se você remover isso, todo o aplicativo configurado com este cliente não poderá se autenticar no seu wallabag.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 568274fd..485d19c9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | # field_uris: 'Redirect URIs' | 452 | # field_uris: 'Redirect URIs' |
453 | # field_grant_types: 'Grant type allowed' | 453 | # field_grant_types: 'Grant type allowed' |
454 | # no_client: 'No client yet.' | 454 | # no_client: 'No client yet.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | # remove: | 456 | # remove: |
457 | # warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !' | 457 | # warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !' |
458 | # warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." | 458 | # warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 5f466d22..c9395c65 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -452,7 +452,7 @@ developer: | |||
452 | # field_uris: 'Redirect URIs' | 452 | # field_uris: 'Redirect URIs' |
453 | # field_grant_types: 'Grant type allowed' | 453 | # field_grant_types: 'Grant type allowed' |
454 | # no_client: 'No client yet.' | 454 | # no_client: 'No client yet.' |
455 | # show_qrcode_iphone: 'Show QRCode iPhone' | 455 | # show_qrcode: 'Show QRCode' |
456 | # remove: | 456 | # remove: |
457 | # warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !' | 457 | # warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !' |
458 | # warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." | 458 | # warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag." |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig index 99f8ed29..08ba5b4c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig | |||
@@ -52,10 +52,10 @@ | |||
52 | {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/> | 52 | {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/> |
53 | {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/> | 53 | {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/> |
54 | <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a> | 54 | <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a> |
55 | <a class="waves-effect waves-light btn" href="">{{ 'developer.existing_clients.show_qrcode_iphone'|trans }}</a> | 55 | <a class="waves-effect waves-light btn" href="">{{ 'developer.existing_clients.show_qrcode'|trans }}</a> |
56 | <img id="iphoneQrcode{{ client.id }}" /> | 56 | <img id="iphoneQrcode{{ client.id }}" /> |
57 | <script> | 57 | <script> |
58 | const imgBase64 = jrQrcode.getQrBase64('wallabagv2://{{ app.user.username }}%%{{ wallabag_url }}%%{{ client.id }}_{{ client.randomId }}%%{{ client.secret }}'); | 58 | const imgBase64 = jrQrcode.getQrBase64('wallabag-token://{{ app.user.username }}%%{{ wallabag_url }}%%{{ client.id }}_{{ client.randomId }}%%{{ client.secret }}'); |
59 | document.getElementById('iphoneQrcode{{ client.id }}').src = imgBase64; | 59 | document.getElementById('iphoneQrcode{{ client.id }}').src = imgBase64; |
60 | </script> | 60 | </script> |
61 | </p> | 61 | </p> |