diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-09-19 07:15:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-19 07:15:40 +0200 |
commit | da18a4682f124b02278860d23ac1d59dee995277 (patch) | |
tree | eabbe9da7203eea41e0cb0ec3c26b9b6599cf58f /src/Wallabag/CoreBundle/Resources | |
parent | 0ed8ce55b5caf2c88e8330afa83abef6c4aac9a4 (diff) | |
parent | 59b97fae996d8307b9d957d210d46200f6d206bf (diff) | |
download | wallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.gz wallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.zst wallabag-da18a4682f124b02278860d23ac1d59dee995277.zip |
Merge pull request #1941 from wallabag/v2-asynchronous-jobs
Use asynchronous jobs for imports
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
15 files changed, 109 insertions, 31 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index e95ef452..23e6d3ca 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -125,3 +125,11 @@ services: | |||
125 | arguments: | 125 | arguments: |
126 | - "@security.token_storage" | 126 | - "@security.token_storage" |
127 | - "@router" | 127 | - "@router" |
128 | |||
129 | wallabag_core.redis.client: | ||
130 | class: Predis\Client | ||
131 | arguments: | ||
132 | - | ||
133 | host: '%redis_host%' | ||
134 | port: '%redis_port%' | ||
135 | schema: tcp | ||
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 073dee28..9f051edb 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' |
@@ -346,6 +347,8 @@ import: | |||
346 | # page_title: 'Import > Readability' | 347 | # page_title: 'Import > Readability' |
347 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' | 348 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' |
348 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 349 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
350 | worker: | ||
351 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | # page_title: 'Developer' | 354 | # page_title: 'Developer' |
@@ -411,10 +414,10 @@ flashes: | |||
411 | notice: | 414 | notice: |
412 | # entry_already_saved: 'Entry already saved on %date%' | 415 | # entry_already_saved: 'Entry already saved on %date%' |
413 | # entry_saved: 'Entry saved' | 416 | # entry_saved: 'Entry saved' |
414 | # entry_saved_failed: 'Failed to save entry' | 417 | # entry_saved_failed: 'Entry saved but fetching content failed' |
415 | # entry_updated: 'Entry updated' | 418 | # entry_updated: 'Entry updated' |
416 | # entry_reloaded: 'Entry reloaded' | 419 | # entry_reloaded: 'Entry reloaded' |
417 | # entry_reload_failed: 'Failed to reload entry' | 420 | # entry_reload_failed: 'Entry reloaded but fetching content failed' |
418 | entry_archived: 'Artikel arkiveret' | 421 | entry_archived: 'Artikel arkiveret' |
419 | entry_unarchived: 'Artikel ikke længere arkiveret' | 422 | entry_unarchived: 'Artikel ikke længere arkiveret' |
420 | entry_starred: 'Artikel markeret som favorit' | 423 | entry_starred: 'Artikel markeret som favorit' |
@@ -428,6 +431,7 @@ flashes: | |||
428 | # failed: 'Import failed, please try again.' | 431 | # failed: 'Import failed, please try again.' |
429 | # failed_on_file: 'Error while processing import. Please verify your import file.' | 432 | # failed_on_file: 'Error while processing import. Please verify your import file.' |
430 | # summary: 'Import summary: %imported% imported, %skipped% already saved.' | 433 | # summary: 'Import summary: %imported% imported, %skipped% already saved.' |
434 | # summary_with_queue: 'Import summary: %queued% queued.' | ||
431 | developer: | 435 | developer: |
432 | notice: | 436 | notice: |
433 | # client_created: 'New client created.' | 437 | # client_created: 'New client created.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 4cfd240f..cbfacd55 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' |
@@ -346,6 +347,8 @@ import: | |||
346 | page_title: 'Aus Readability importieren' | 347 | page_title: 'Aus Readability importieren' |
347 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' | 348 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' |
348 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 349 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
350 | worker: | ||
351 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | page_title: 'Entwickler' | 354 | page_title: 'Entwickler' |
@@ -411,10 +414,10 @@ flashes: | |||
411 | notice: | 414 | notice: |
412 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' | 415 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' |
413 | entry_saved: 'Eintrag gespeichert' | 416 | entry_saved: 'Eintrag gespeichert' |
414 | # entry_saved_failed: 'Failed to save entry' | 417 | # entry_saved_failed: 'Entry saved but fetching content failed' |
415 | entry_updated: 'Eintrag aktualisiert' | 418 | entry_updated: 'Eintrag aktualisiert' |
416 | entry_reloaded: 'Eintrag neugeladen' | 419 | entry_reloaded: 'Eintrag neugeladen' |
417 | entry_reload_failed: 'Neuladen des Eintrags fehlgeschlagen' | 420 | # entry_reload_failed: 'Entry reloaded but fetching content failed' |
418 | entry_archived: 'Artikel archiviert' | 421 | entry_archived: 'Artikel archiviert' |
419 | entry_unarchived: 'Artikel dearchiviert' | 422 | entry_unarchived: 'Artikel dearchiviert' |
420 | entry_starred: 'Artikel favorisiert' | 423 | entry_starred: 'Artikel favorisiert' |
@@ -428,6 +431,7 @@ flashes: | |||
428 | failed: 'Import fehlgeschlagen, bitte erneut probieren.' | 431 | failed: 'Import fehlgeschlagen, bitte erneut probieren.' |
429 | failed_on_file: 'Fehler während des Imports. Bitte überprüfe deine Import-Datei.' | 432 | failed_on_file: 'Fehler während des Imports. Bitte überprüfe deine Import-Datei.' |
430 | summary: 'Import-Zusammenfassung: %imported% importiert, %skipped% bereits gespeichert.' | 433 | summary: 'Import-Zusammenfassung: %imported% importiert, %skipped% bereits gespeichert.' |
434 | # summary_with_queue: 'Import summary: %queued% queued.' | ||
431 | developer: | 435 | developer: |
432 | notice: | 436 | notice: |
433 | client_created: 'Neuer Client erstellt.' | 437 | client_created: 'Neuer Client erstellt.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 42374b40..21e2405c 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' |
@@ -346,6 +347,8 @@ import: | |||
346 | page_title: 'Import > Readability' | 347 | page_title: 'Import > Readability' |
347 | description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' | 348 | description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' |
348 | how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 349 | how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
350 | worker: | ||
351 | enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | page_title: 'Developer' | 354 | page_title: 'Developer' |
@@ -413,10 +416,10 @@ flashes: | |||
413 | notice: | 416 | notice: |
414 | entry_already_saved: 'Entry already saved on %date%' | 417 | entry_already_saved: 'Entry already saved on %date%' |
415 | entry_saved: 'Entry saved' | 418 | entry_saved: 'Entry saved' |
416 | entry_saved_failed: 'Failed to save entry' | 419 | entry_saved_failed: 'Entry saved but fetching content failed' |
417 | entry_updated: 'Entry updated' | 420 | entry_updated: 'Entry updated' |
418 | entry_reloaded: 'Entry reloaded' | 421 | entry_reloaded: 'Entry reloaded' |
419 | entry_reload_failed: 'Failed to reload entry' | 422 | entry_reload_failed: 'Entry reloaded but fetching content failed' |
420 | entry_archived: 'Entry archived' | 423 | entry_archived: 'Entry archived' |
421 | entry_unarchived: 'Entry unarchived' | 424 | entry_unarchived: 'Entry unarchived' |
422 | entry_starred: 'Entry starred' | 425 | entry_starred: 'Entry starred' |
@@ -430,6 +433,7 @@ flashes: | |||
430 | failed: 'Import failed, please try again.' | 433 | failed: 'Import failed, please try again.' |
431 | failed_on_file: 'Error while processing import. Please verify your import file.' | 434 | failed_on_file: 'Error while processing import. Please verify your import file.' |
432 | summary: 'Import summary: %imported% imported, %skipped% already saved.' | 435 | summary: 'Import summary: %imported% imported, %skipped% already saved.' |
436 | summary_with_queue: 'Import summary: %queued% queued.' | ||
433 | developer: | 437 | developer: |
434 | notice: | 438 | notice: |
435 | client_created: 'New client %name% created.' | 439 | client_created: 'New client %name% created.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index ee84cc62..43f376d4 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' |
@@ -346,6 +347,8 @@ import: | |||
346 | page_title: 'Importar > Readability' | 347 | page_title: 'Importar > Readability' |
347 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' | 348 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' |
348 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 349 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
350 | worker: | ||
351 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | page_title: 'Promotor' | 354 | page_title: 'Promotor' |
@@ -411,10 +414,10 @@ flashes: | |||
411 | notice: | 414 | notice: |
412 | entry_already_saved: 'Entrada ya guardada por %fecha%' | 415 | entry_already_saved: 'Entrada ya guardada por %fecha%' |
413 | entry_saved: 'Entrada guardada' | 416 | entry_saved: 'Entrada guardada' |
414 | # entry_saved_failed: 'Failed to save entry' | 417 | # entry_saved_failed: 'Entry saved but fetching content failed' |
415 | entry_updated: 'Entrada actualizada' | 418 | entry_updated: 'Entrada actualizada' |
416 | entry_reloaded: 'Entrada recargada' | 419 | entry_reloaded: 'Entrada recargada' |
417 | entry_reload_failed: 'Entrada recargada reprobada' | 420 | # entry_reload_failed: 'Entry reloaded but fetching content failed' |
418 | entry_archived: 'Artículo archivado' | 421 | entry_archived: 'Artículo archivado' |
419 | entry_unarchived: 'Artículo desarchivado' | 422 | entry_unarchived: 'Artículo desarchivado' |
420 | entry_starred: 'Artículo guardado en los favoritos' | 423 | entry_starred: 'Artículo guardado en los favoritos' |
@@ -425,9 +428,10 @@ flashes: | |||
425 | tag_added: 'Etiqueta añadida' | 428 | tag_added: 'Etiqueta añadida' |
426 | import: | 429 | import: |
427 | notice: | 430 | notice: |
428 | failed: 'Importación reprobada, por favor inténtelo de nuevo.' | 431 | failed: 'Importación reprobada, por favor inténtelo de nuevo.' |
429 | failed_on_file: 'Se ocurre un error por procesar importación. Por favor verifique su archivo importado.' | 432 | failed_on_file: 'Se ocurre un error por procesar importación. Por favor verifique su archivo importado.' |
430 | summary: 'Resúmen importado: %importado% importado, %saltados% ya guardado.' | 433 | summary: 'Resúmen importado: %importado% importado, %saltados% ya guardado.' |
434 | # summary_with_queue: 'Import summary: %queued% queued.' | ||
431 | developer: | 435 | developer: |
432 | notice: | 436 | notice: |
433 | client_created: 'Nuevo cliente creado.' | 437 | client_created: 'Nuevo cliente creado.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index e9af1e8d..56418ef9 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: 'کد آر-اس-اس' |
@@ -344,8 +345,10 @@ import: | |||
344 | description: 'این برنامه همهٔ دادههای شما را در نسخهٔ ۲ wallabag درونریزی میکند. به بخش «همهٔ مقالهها» بروید و در بخش «برونریزی» روی "JSON" کلیک کنید. با این کار شما پروندهای به شکل "All articles.json" دریافت خواهید کرد.' | 345 | description: 'این برنامه همهٔ دادههای شما را در نسخهٔ ۲ wallabag درونریزی میکند. به بخش «همهٔ مقالهها» بروید و در بخش «برونریزی» روی "JSON" کلیک کنید. با این کار شما پروندهای به شکل "All articles.json" دریافت خواهید کرد.' |
345 | readability: | 346 | readability: |
346 | page_title: 'درونریزی > Readability' | 347 | page_title: 'درونریزی > Readability' |
347 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' | 348 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' |
348 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 349 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
350 | worker: | ||
351 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | # page_title: 'Developer' | 354 | # page_title: 'Developer' |
@@ -411,10 +414,10 @@ flashes: | |||
411 | notice: | 414 | notice: |
412 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' | 415 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' |
413 | entry_saved: 'مقاله ذخیره شد' | 416 | entry_saved: 'مقاله ذخیره شد' |
414 | # entry_saved_failed: 'Failed to save entry' | 417 | # entry_saved_failed: 'Entry saved but fetching content failed' |
415 | entry_updated: 'مقاله بهروز شد' | 418 | entry_updated: 'مقاله بهروز شد' |
416 | entry_reloaded: 'مقاله بهروز شد' | 419 | entry_reloaded: 'مقاله بهروز شد' |
417 | entry_reload_failed: 'بهروزرسانی مقاله شکست خورد' | 420 | # entry_reload_failed: 'Entry reloaded but fetching content failed' |
418 | entry_archived: 'مقاله بایگانی شد' | 421 | entry_archived: 'مقاله بایگانی شد' |
419 | entry_unarchived: 'مقاله از بایگانی درآمد' | 422 | entry_unarchived: 'مقاله از بایگانی درآمد' |
420 | entry_starred: 'مقاله برگزیده شد' | 423 | entry_starred: 'مقاله برگزیده شد' |
@@ -428,6 +431,7 @@ flashes: | |||
428 | failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.' | 431 | failed: 'درونریزی شکست خورد. لطفاً دوباره تلاش کنید.' |
429 | failed_on_file: 'خطا هنگام پردازش پروندهٔ ورودی. آیا پروندهٔ درونریزی شده سالم است؟' | 432 | failed_on_file: 'خطا هنگام پردازش پروندهٔ ورودی. آیا پروندهٔ درونریزی شده سالم است؟' |
430 | summary: 'گزارش درونریزی: %imported% وارد شد, %skipped% از قبل ذخیره شده بود.' | 433 | summary: 'گزارش درونریزی: %imported% وارد شد, %skipped% از قبل ذخیره شده بود.' |
434 | # summary_with_queue: 'Import summary: %queued% queued.' | ||
431 | developer: | 435 | developer: |
432 | notice: | 436 | notice: |
433 | # client_created: 'New client created.' | 437 | # client_created: 'New client created.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 402cdf4a..bde21866 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' |
@@ -346,6 +347,8 @@ import: | |||
346 | page_title: 'Importer > Readability' | 347 | page_title: 'Importer > Readability' |
347 | description: 'Cet outil va importer toutes vos données de Readability. Sur la page des outils (https://www.readability.com/tools/), cliquez sur "Export your data" dans la section "Data Export". Vous allez recevoir un email avec un lien pour télécharger le json.' | 348 | description: 'Cet outil va importer toutes vos données de Readability. Sur la page des outils (https://www.readability.com/tools/), cliquez sur "Export your data" dans la section "Data Export". Vous allez recevoir un email avec un lien pour télécharger le json.' |
348 | how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l'importer." | 349 | how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l'importer." |
350 | worker: | ||
351 | enabled: "Les imports sont asynchrones. Une fois l'import commencé un worker externe traitera les messages un par un. Le service activé est :" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | page_title: 'Développeur' | 354 | page_title: 'Développeur' |
@@ -413,10 +416,10 @@ flashes: | |||
413 | notice: | 416 | notice: |
414 | entry_already_saved: 'Article déjà sauvergardé le %date%' | 417 | entry_already_saved: 'Article déjà sauvergardé le %date%' |
415 | entry_saved: 'Article enregistré' | 418 | entry_saved: 'Article enregistré' |
416 | entry_saved_failed: "L'enregistrement a échoué" | 419 | entry_saved_failed: 'Article enregistré mais impossible de récupérer le contenu' |
417 | entry_updated: 'Article mis à jour' | 420 | entry_updated: 'Article mis à jour' |
418 | entry_reloaded: 'Article rechargé' | 421 | entry_reloaded: 'Article rechargé' |
419 | entry_reload_failed: "Le rechargement de l'article a échoué" | 422 | entry_reload_failed: "Article mis à jour mais impossible de récupérer le contenu" |
420 | entry_archived: 'Article marqué comme lu' | 423 | entry_archived: 'Article marqué comme lu' |
421 | entry_unarchived: 'Article marqué comme non lu' | 424 | entry_unarchived: 'Article marqué comme non lu' |
422 | entry_starred: 'Article ajouté dans les favoris' | 425 | entry_starred: 'Article ajouté dans les favoris' |
@@ -430,6 +433,7 @@ flashes: | |||
430 | failed: "L'import a échoué, veuillez ré-essayer" | 433 | failed: "L'import a échoué, veuillez ré-essayer" |
431 | failed_on_file: "Erreur lors du traitement de l'import. Vérifier votre fichier." | 434 | failed_on_file: "Erreur lors du traitement de l'import. Vérifier votre fichier." |
432 | summary: "Rapport d'import: %imported% importés, %skipped% déjà présent." | 435 | summary: "Rapport d'import: %imported% importés, %skipped% déjà présent." |
436 | summary_with_queue: "Rapport d'import: %queued% en cours de traitement." | ||
433 | developer: | 437 | developer: |
434 | notice: | 438 | notice: |
435 | client_created: 'Nouveau client %name% créé' | 439 | client_created: 'Nouveau client %name% créé' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 3aee4816..26bb31ba 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' |
@@ -343,8 +344,10 @@ import: | |||
343 | description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella sidebar di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json".' | 344 | description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella sidebar di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json".' |
344 | readability: | 345 | readability: |
345 | page_title: 'Importa da > Readability' | 346 | page_title: 'Importa da > Readability' |
346 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' | 347 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' |
347 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 348 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
349 | worker: | ||
350 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
348 | 351 | ||
349 | developer: | 352 | developer: |
350 | page_title: 'Sviluppatori' | 353 | page_title: 'Sviluppatori' |
@@ -410,10 +413,10 @@ flashes: | |||
410 | notice: | 413 | notice: |
411 | entry_already_saved: 'Contenuto già salvato in data %date%' | 414 | entry_already_saved: 'Contenuto già salvato in data %date%' |
412 | entry_saved: 'Contenuto salvato' | 415 | entry_saved: 'Contenuto salvato' |
413 | # entry_saved_failed: 'Failed to save entry' | 416 | # entry_saved_failed: 'Entry saved but fetching content failed' |
414 | entry_updated: 'Contenuto aggiornato' | 417 | entry_updated: 'Contenuto aggiornato' |
415 | entry_reloaded: 'Contenuto ricaricato' | 418 | entry_reloaded: 'Contenuto ricaricato' |
416 | entry_reload_failed: 'Errore nel ricaricamento del contenuto' | 419 | # entry_reload_failed: 'Entry reloaded but fetching content failed' |
417 | entry_archived: 'Contenuto archiviato' | 420 | entry_archived: 'Contenuto archiviato' |
418 | entry_unarchived: 'Contenuto dis-archiviato' | 421 | entry_unarchived: 'Contenuto dis-archiviato' |
419 | entry_starred: 'Contenuto segnato come preferito' | 422 | entry_starred: 'Contenuto segnato come preferito' |
@@ -427,6 +430,7 @@ flashes: | |||
427 | failed: 'Importazione fallita, riprova.' | 430 | failed: 'Importazione fallita, riprova.' |
428 | failed_on_file: 'Errore durante la processazione dei dati da importare. Verifica il tuo file di import.' | 431 | failed_on_file: 'Errore durante la processazione dei dati da importare. Verifica il tuo file di import.' |
429 | summary: 'Sommario di importazione: %imported% importati, %skipped% già salvati.' | 432 | summary: 'Sommario di importazione: %imported% importati, %skipped% già salvati.' |
433 | # summary_with_queue: 'Import summary: %queued% queued.' | ||
430 | developer: | 434 | developer: |
431 | notice: | 435 | notice: |
432 | client_created: 'Nuovo client creato.' | 436 | client_created: 'Nuovo client creato.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 7d9d4e24..c6818449 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' |
@@ -346,6 +347,8 @@ import: | |||
346 | page_title: 'Importer > Readability' | 347 | page_title: 'Importer > Readability' |
347 | description: "Aquesta aisina importarà totas vòstres articles de Readability. Sus la pagina de l'aisina (https://www.readability.com/tools/), clicatz sus \"Export your data\" dins la seccion \"Data Export\". Recebretz un corrièl per telecargar un json (qu'acaba pas amb un .json de fach)." | 348 | description: "Aquesta aisina importarà totas vòstres articles de Readability. Sus la pagina de l'aisina (https://www.readability.com/tools/), clicatz sus \"Export your data\" dins la seccion \"Data Export\". Recebretz un corrièl per telecargar un json (qu'acaba pas amb un .json de fach)." |
348 | how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar." | 349 | how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar." |
350 | worker: | ||
351 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | page_title: 'Desvolopador' | 354 | page_title: 'Desvolopador' |
@@ -411,10 +414,10 @@ flashes: | |||
411 | notice: | 414 | notice: |
412 | entry_already_saved: 'Article ja salvargardat lo %date%' | 415 | entry_already_saved: 'Article ja salvargardat lo %date%' |
413 | entry_saved: 'Article enregistrat' | 416 | entry_saved: 'Article enregistrat' |
414 | entry_saved_failed: "Fracàs de l'enregistrament de l'entrada" | 417 | # entry_saved_failed: 'Entry saved but fetching content failed' |
415 | entry_updated: 'Article mes a jorn' | 418 | entry_updated: 'Article mes a jorn' |
416 | entry_reloaded: 'Article recargat' | 419 | entry_reloaded: 'Article recargat' |
417 | entry_reload_failed: "Fracàs de l'actualizacion de l'article" | 420 | # entry_reload_failed: 'Entry reloaded but fetching content failed' |
418 | entry_archived: 'Article marcat coma legit' | 421 | entry_archived: 'Article marcat coma legit' |
419 | entry_unarchived: 'Article marcat coma pas legit' | 422 | entry_unarchived: 'Article marcat coma pas legit' |
420 | entry_starred: 'Article apondut dins los favorits' | 423 | entry_starred: 'Article apondut dins los favorits' |
@@ -428,6 +431,7 @@ flashes: | |||
428 | failed: "L'importacion a fracassat, mercés de tornar ensajar" | 431 | failed: "L'importacion a fracassat, mercés de tornar ensajar" |
429 | failed_on_file: "Errorr pendent du tractament de l'import. Mercés de verificar vòstre fichièr." | 432 | failed_on_file: "Errorr pendent du tractament de l'import. Mercés de verificar vòstre fichièr." |
430 | summary: "Rapòrt d'import: %imported% importats, %skipped% ja presents." | 433 | summary: "Rapòrt d'import: %imported% importats, %skipped% ja presents." |
434 | # summary_with_queue: 'Import summary: %queued% queued.' | ||
431 | developer: | 435 | developer: |
432 | notice: | 436 | notice: |
433 | client_created: 'Novèl client creat' | 437 | client_created: 'Novèl client creat' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index da50cd4c..fb821966 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' |
@@ -346,6 +347,8 @@ import: | |||
346 | page_title: 'Import > Readability' | 347 | page_title: 'Import > Readability' |
347 | description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Readability. Na stronie narzędzi (https://www.readability.com/tools/), kliknij na "Export your data" w sekcji "Data Export". Otrzymach email z plikiem JSON (plik nie będzie zawierał rozszerzenia .json).' | 348 | description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Readability. Na stronie narzędzi (https://www.readability.com/tools/), kliknij na "Export your data" w sekcji "Data Export". Otrzymach email z plikiem JSON (plik nie będzie zawierał rozszerzenia .json).' |
348 | how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.' | 349 | how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.' |
350 | worker: | ||
351 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | page_title: 'Deweloper' | 354 | page_title: 'Deweloper' |
@@ -411,10 +414,10 @@ flashes: | |||
411 | notice: | 414 | notice: |
412 | entry_already_saved: 'Wpis już został dodany %date%' | 415 | entry_already_saved: 'Wpis już został dodany %date%' |
413 | entry_saved: 'Wpis zapisany' | 416 | entry_saved: 'Wpis zapisany' |
414 | entry_saved_failed: 'Zapis artykułu się nie powiódł' | 417 | # entry_saved_failed: 'Entry saved but fetching content failed' |
415 | entry_updated: 'Wpis zaktualizowany' | 418 | entry_updated: 'Wpis zaktualizowany' |
416 | entry_reloaded: 'Wpis ponownie załadowany' | 419 | entry_reloaded: 'Wpis ponownie załadowany' |
417 | entry_reload_failed: 'Błąd ponownego załadowania' | 420 | # entry_reload_failed: 'Entry reloaded but fetching content failed' |
418 | entry_archived: 'Wpis dodany do archiwum' | 421 | entry_archived: 'Wpis dodany do archiwum' |
419 | entry_unarchived: 'Wpis usunięty z archiwum' | 422 | entry_unarchived: 'Wpis usunięty z archiwum' |
420 | entry_starred: 'Wpis oznaczony gwiazdką' | 423 | entry_starred: 'Wpis oznaczony gwiazdką' |
@@ -428,6 +431,7 @@ flashes: | |||
428 | failed: 'Nieudany import, prosimy spróbować ponownie.' | 431 | failed: 'Nieudany import, prosimy spróbować ponownie.' |
429 | failed_on_file: 'Błąd podczas ptrzetwarzania pliku. Sprawdż swój importowany plik.' | 432 | failed_on_file: 'Błąd podczas ptrzetwarzania pliku. Sprawdż swój importowany plik.' |
430 | summary: 'Podsumowanie importu: %imported% zaimportowane, %skipped% już zapisane.' | 433 | summary: 'Podsumowanie importu: %imported% zaimportowane, %skipped% już zapisane.' |
434 | # summary_with_queue: 'Import summary: %queued% queued.' | ||
431 | developer: | 435 | developer: |
432 | notice: | 436 | notice: |
433 | client_created: 'Nowy klient utworzony.' | 437 | client_created: 'Nowy klient utworzony.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index f41609d0..3d22e29d 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' |
@@ -346,6 +347,8 @@ import: | |||
346 | # page_title: 'Import > Readability' | 347 | # page_title: 'Import > Readability' |
347 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' | 348 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' |
348 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 349 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
350 | worker: | ||
351 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | # page_title: 'Developer' | 354 | # page_title: 'Developer' |
@@ -411,10 +414,10 @@ flashes: | |||
411 | notice: | 414 | notice: |
412 | # entry_already_saved: 'Entry already saved on %date%' | 415 | # entry_already_saved: 'Entry already saved on %date%' |
413 | # entry_saved: 'Entry saved' | 416 | # entry_saved: 'Entry saved' |
414 | # entry_saved_failed: 'Failed to save entry' | 417 | # entry_saved_failed: 'Entry saved but fetching content failed' |
415 | # entry_updated: 'Entry updated' | 418 | # entry_updated: 'Entry updated' |
416 | # entry_reloaded: 'Entry reloaded' | 419 | # entry_reloaded: 'Entry reloaded' |
417 | # entry_reload_failed: 'Failed to reload entry' | 420 | # entry_reload_failed: 'Entry reloaded but fetching content failed' |
418 | entry_archived: 'Articol arhivat' | 421 | entry_archived: 'Articol arhivat' |
419 | entry_unarchived: 'Articol dezarhivat' | 422 | entry_unarchived: 'Articol dezarhivat' |
420 | entry_starred: 'Articol adăugat la favorite' | 423 | entry_starred: 'Articol adăugat la favorite' |
@@ -428,6 +431,7 @@ flashes: | |||
428 | # failed: 'Import failed, please try again.' | 431 | # failed: 'Import failed, please try again.' |
429 | # failed_on_file: 'Error while processing import. Please verify your import file.' | 432 | # failed_on_file: 'Error while processing import. Please verify your import file.' |
430 | # summary: 'Import summary: %imported% imported, %skipped% already saved.' | 433 | # summary: 'Import summary: %imported% imported, %skipped% already saved.' |
434 | # summary_with_queue: 'Import summary: %queued% queued.' | ||
431 | developer: | 435 | developer: |
432 | notice: | 436 | notice: |
433 | # client_created: 'New client created.' | 437 | # client_created: 'New client created.' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 6dfbfa89..5099b002 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)' |
@@ -344,8 +345,10 @@ import: | |||
344 | # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.' | 345 | # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.' |
345 | readability: | 346 | readability: |
346 | page_title: 'İçe Aktar > Readability' | 347 | page_title: 'İçe Aktar > Readability' |
347 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' | 348 | # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' |
348 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' | 349 | # how_to: 'Please select your Readability export and click on the below button to upload and import it.' |
350 | worker: | ||
351 | # enabled: "Import is made asynchronously. Once the import task is started, an external worker will handle jobs one at a time. The current service is:" | ||
349 | 352 | ||
350 | developer: | 353 | developer: |
351 | # page_title: 'Developer' | 354 | # page_title: 'Developer' |
@@ -411,10 +414,10 @@ flashes: | |||
411 | notice: | 414 | notice: |
412 | entry_already_saved: 'Entry already saved on %date%' | 415 | entry_already_saved: 'Entry already saved on %date%' |
413 | entry_saved: 'Makale kaydedildi' | 416 | entry_saved: 'Makale kaydedildi' |
414 | # entry_saved_failed: 'Failed to save entry' | 417 | # entry_saved_failed: 'Entry saved but fetching content failed' |
415 | # entry_updated: 'Entry updated' | 418 | # entry_updated: 'Entry updated' |
416 | entry_reloaded: 'Makale içeriği yenilendi' | 419 | entry_reloaded: 'Makale içeriği yenilendi' |
417 | # entry_reload_failed: 'Failed to reload entry' | 420 | # entry_reload_failed: 'Entry reloaded but fetching content failed' |
418 | entry_archived: 'Makale arşivlendi' | 421 | entry_archived: 'Makale arşivlendi' |
419 | entry_unarchived: 'Makale arşivden çıkartıldı' | 422 | entry_unarchived: 'Makale arşivden çıkartıldı' |
420 | entry_starred: 'Makale favorilere eklendi' | 423 | entry_starred: 'Makale favorilere eklendi' |
@@ -428,6 +431,7 @@ flashes: | |||
428 | # failed: 'Import failed, please try again.' | 431 | # failed: 'Import failed, please try again.' |
429 | # failed_on_file: 'Error while processing import. Please verify your import file.' | 432 | # failed_on_file: 'Error while processing import. Please verify your import file.' |
430 | # summary: 'Import summary: %imported% imported, %skipped% already saved.' | 433 | # summary: 'Import summary: %imported% imported, %skipped% already saved.' |
434 | # summary_with_queue: 'Import summary: %queued% queued.' | ||
431 | developer: | 435 | developer: |
432 | notice: | 436 | notice: |
433 | # client_created: 'New client created.' | 437 | # client_created: 'New client created.' |
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> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 72becfa4..df05e2a4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
@@ -19,6 +19,8 @@ | |||
19 | Materialize.toast('{{ flashMessage|trans }}', 4000); | 19 | Materialize.toast('{{ flashMessage|trans }}', 4000); |
20 | </script> | 20 | </script> |
21 | {% endfor %} | 21 | {% endfor %} |
22 | |||
23 | {{ render(controller("WallabagImportBundle:Import:checkQueue")) }} | ||
22 | {% endblock %} | 24 | {% endblock %} |
23 | 25 | ||
24 | {% block menu %} | 26 | {% block menu %} |