diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-16 22:22:25 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-16 22:22:25 +0200 |
commit | ebe0787e093f4f2934430033015d6ebad1c64dca (patch) | |
tree | 0e28c1da4fdb1ee48ae021a4e63d9a8ee1ec302d /src/Wallabag/CoreBundle/Resources | |
parent | 4fc998245c56ad95c1e753ab52b0c702d4a8a59d (diff) | |
download | wallabag-ebe0787e093f4f2934430033015d6ebad1c64dca.tar.gz wallabag-ebe0787e093f4f2934430033015d6ebad1c64dca.tar.zst wallabag-ebe0787e093f4f2934430033015d6ebad1c64dca.zip |
Moved Pocket token to user config
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
13 files changed, 35 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 4e5ed9ae..0a7c6e8c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | # 200_word: 'I read ~200 words per minute' | 68 | # 200_word: 'I read ~200 words per minute' |
69 | # 300_word: 'I read ~300 words per minute' | 69 | # 300_word: 'I read ~300 words per minute' |
70 | # 400_word: 'I read ~400 words per minute' | 70 | # 400_word: 'I read ~400 words per minute' |
71 | pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer | ||
71 | form_rss: | 72 | form_rss: |
72 | description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.' | 73 | description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.' |
73 | token_label: 'RSS-Token' | 74 | token_label: 'RSS-Token' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 107187bf..a400686e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | 200_word: 'Ich lese ~200 Wörter pro Minute' | 68 | 200_word: 'Ich lese ~200 Wörter pro Minute' |
69 | 300_word: 'Ich lese ~300 Wörter pro Minute' | 69 | 300_word: 'Ich lese ~300 Wörter pro Minute' |
70 | 400_word: 'Ich lese ~400 Wörter pro Minute' | 70 | 400_word: 'Ich lese ~400 Wörter pro Minute' |
71 | pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren | ||
71 | form_rss: | 72 | form_rss: |
72 | description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' | 73 | description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' |
73 | token_label: 'RSS-token' | 74 | token_label: 'RSS-token' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index ac60295f..2d097caf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | 200_word: 'I read ~200 words per minute' | 68 | 200_word: 'I read ~200 words per minute' |
69 | 300_word: 'I read ~300 words per minute' | 69 | 300_word: 'I read ~300 words per minute' |
70 | 400_word: 'I read ~400 words per minute' | 70 | 400_word: 'I read ~400 words per minute' |
71 | pocket_consumer_key_label: Consumer key for Pocket to import contents | ||
71 | form_rss: | 72 | form_rss: |
72 | description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.' | 73 | description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.' |
73 | token_label: 'RSS token' | 74 | token_label: 'RSS token' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 1082e6de..1dbff022 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | 200_word: 'Leo ~200 palabras por minuto' | 68 | 200_word: 'Leo ~200 palabras por minuto' |
69 | 300_word: 'Leo ~300 palabras por minuto' | 69 | 300_word: 'Leo ~300 palabras por minuto' |
70 | 400_word: 'Leo ~400 palabras por minuto' | 70 | 400_word: 'Leo ~400 palabras por minuto' |
71 | # pocket_consumer_key_label: Consumer key for Pocket to import contents | ||
71 | form_rss: | 72 | form_rss: |
72 | description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero' | 73 | description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero' |
73 | token_label: 'RSS token' | 74 | token_label: 'RSS token' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 78317a9c..ad13c940 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | 200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه میخوانم' | 68 | 200_word: 'من تقریباً ۲۰۰ واژه را در دقیقه میخوانم' |
69 | 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه میخوانم' | 69 | 300_word: 'من تقریباً ۳۰۰ واژه را در دقیقه میخوانم' |
70 | 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه میخوانم' | 70 | 400_word: 'من تقریباً ۴۰۰ واژه را در دقیقه میخوانم' |
71 | pocket_consumer_key_label: کلید کاربری Pocket برای درونریزی مطالب | ||
71 | form_rss: | 72 | form_rss: |
72 | description: 'با خوراک آر-اس-اس که wallabag در اختیارتان میگذارد، میتوانید مقالههای ذخیرهشده را در نرمافزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' | 73 | description: 'با خوراک آر-اس-اس که wallabag در اختیارتان میگذارد، میتوانید مقالههای ذخیرهشده را در نرمافزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' |
73 | token_label: 'کد آر-اس-اس' | 74 | token_label: 'کد آر-اس-اس' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 50515d80..35e5c9d0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | 200_word: 'Je lis environ 200 mots par minute' | 68 | 200_word: 'Je lis environ 200 mots par minute' |
69 | 300_word: 'Je lis environ 300 mots par minute' | 69 | 300_word: 'Je lis environ 300 mots par minute' |
70 | 400_word: 'Je lis environ 400 mots par minute' | 70 | 400_word: 'Je lis environ 400 mots par minute' |
71 | pocket_consumer_key_label: Clé d'authentification Pocket pour importer les données | ||
71 | form_rss: | 72 | form_rss: |
72 | description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d'abord créer un jeton." | 73 | description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d'abord créer un jeton." |
73 | token_label: 'Jeton RSS' | 74 | token_label: 'Jeton RSS' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 5badeffc..5bc896c3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | 200_word: 'Leggo ~200 parole al minuto' | 68 | 200_word: 'Leggo ~200 parole al minuto' |
69 | 300_word: 'Leggo ~300 parole al minuto' | 69 | 300_word: 'Leggo ~300 parole al minuto' |
70 | 400_word: 'Leggo ~400 parole al minuto' | 70 | 400_word: 'Leggo ~400 parole al minuto' |
71 | pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti | ||
71 | form_rss: | 72 | form_rss: |
72 | description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.' | 73 | description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.' |
73 | token_label: 'RSS token' | 74 | token_label: 'RSS token' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 2383886c..b0194c59 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | 200_word: "Legissi a l'entorn de 200 mots per minuta" | 68 | 200_word: "Legissi a l'entorn de 200 mots per minuta" |
69 | 300_word: "Legissi a l'entorn de 300 mots per minuta" | 69 | 300_word: "Legissi a l'entorn de 300 mots per minuta" |
70 | 400_word: "Legissi a l'entorn de 400 mots per minuta" | 70 | 400_word: "Legissi a l'entorn de 400 mots per minuta" |
71 | pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas | ||
71 | form_rss: | 72 | form_rss: |
72 | description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton." | 73 | description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton." |
73 | token_label: 'Geton RSS' | 74 | token_label: 'Geton RSS' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 40cd2b71..6412ad16 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | 200_word: 'Czytam ~200 słów na minutę' | 68 | 200_word: 'Czytam ~200 słów na minutę' |
69 | 300_word: 'Czytam ~300 słów na minutę' | 69 | 300_word: 'Czytam ~300 słów na minutę' |
70 | 400_word: 'Czytam ~400 słów na minutę' | 70 | 400_word: 'Czytam ~400 słów na minutę' |
71 | pocket_consumer_key_label: Klucz klienta Pocket do importu zawartości | ||
71 | form_rss: | 72 | form_rss: |
72 | description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.' | 73 | description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.' |
73 | token_label: 'Token RSS' | 74 | token_label: 'Token RSS' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index b18eab9e..11b744c7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | # 200_word: 'I read ~200 words per minute' | 68 | # 200_word: 'I read ~200 words per minute' |
69 | # 300_word: 'I read ~300 words per minute' | 69 | # 300_word: 'I read ~300 words per minute' |
70 | # 400_word: 'I read ~400 words per minute' | 70 | # 400_word: 'I read ~400 words per minute' |
71 | pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket | ||
71 | form_rss: | 72 | form_rss: |
72 | description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' | 73 | description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' |
73 | token_label: 'RSS-Token' | 74 | token_label: 'RSS-Token' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 82fa93af..d6aaacfe 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -68,6 +68,7 @@ config: | |||
68 | # 200_word: 'I read ~200 words per minute' | 68 | # 200_word: 'I read ~200 words per minute' |
69 | # 300_word: 'I read ~300 words per minute' | 69 | # 300_word: 'I read ~300 words per minute' |
70 | # 400_word: 'I read ~400 words per minute' | 70 | # 400_word: 'I read ~400 words per minute' |
71 | # pocket_consumer_key_label: Consumer key for Pocket to import contents | ||
71 | form_rss: | 72 | form_rss: |
72 | description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.' | 73 | description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.' |
73 | token_label: 'RSS belirteci (token)' | 74 | token_label: 'RSS belirteci (token)' |
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 f89265d4..6446cf2c 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 | |||
@@ -44,6 +44,18 @@ | |||
44 | </div> | 44 | </div> |
45 | </fieldset> | 45 | </fieldset> |
46 | 46 | ||
47 | <fieldset class="w500p inline"> | ||
48 | <div class="row"> | ||
49 | {{ form_label(form.config.pocket_consumer_key) }} | ||
50 | {{ form_errors(form.config.pocket_consumer_key) }} | ||
51 | {{ form_widget(form.config.pocket_consumer_key) }} | ||
52 | <p> | ||
53 | » | ||
54 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | ||
55 | </p> | ||
56 | </div> | ||
57 | </fieldset> | ||
58 | |||
47 | {{ form_rest(form.config) }} | 59 | {{ form_rest(form.config) }} |
48 | </form> | 60 | </form> |
49 | 61 | ||
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 bf390e89..5330c353 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 | |||
@@ -62,6 +62,18 @@ | |||
62 | </div> | 62 | </div> |
63 | </div> | 63 | </div> |
64 | 64 | ||
65 | <div class="row"> | ||
66 | <div class="input-field col s12"> | ||
67 | {{ form_label(form.config.pocket_consumer_key) }} | ||
68 | {{ form_errors(form.config.pocket_consumer_key) }} | ||
69 | {{ form_widget(form.config.pocket_consumer_key) }} | ||
70 | <p> | ||
71 | » | ||
72 | <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> | ||
73 | </p> | ||
74 | </div> | ||
75 | </div> | ||
76 | |||
65 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 77 | {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} |
66 | {{ form_rest(form.config) }} | 78 | {{ form_rest(form.config) }} |
67 | </form> | 79 | </form> |