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 /app/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 'app/Resources')
11 files changed, 51 insertions, 10 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml index 3478d638..85079330 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml | |||
@@ -8,7 +8,8 @@ export_csv: Aktiver eksport til CSV | |||
8 | export_json: Aktiver eksport til JSON | 8 | export_json: Aktiver eksport til JSON |
9 | export_txt: Aktiver eksport til TXT | 9 | export_txt: Aktiver eksport til TXT |
10 | export_xml: Aktiver eksport til XML | 10 | export_xml: Aktiver eksport til XML |
11 | pocket_consumer_key: Brugers nøgle til Pocket for at importere materialer (https://getpocket.com/developer/docs/authentication) | 11 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
12 | # import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: Shaarli-URL, hvis tjenesten er aktiv | 13 | shaarli_url: Shaarli-URL, hvis tjenesten er aktiv |
13 | share_diaspora: Aktiver deling til Diaspora | 14 | share_diaspora: Aktiver deling til Diaspora |
14 | share_mail: Aktiver deling med email | 15 | share_mail: Aktiver deling med email |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml index f655a27f..eaba14cd 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml | |||
@@ -8,7 +8,8 @@ export_csv: CSV-Export aktivieren | |||
8 | export_json: JSON-Export aktivieren | 8 | export_json: JSON-Export aktivieren |
9 | export_txt: TXT-Export aktivieren | 9 | export_txt: TXT-Export aktivieren |
10 | export_xml: XML-Export aktivieren | 10 | export_xml: XML-Export aktivieren |
11 | pocket_consumer_key: Consumer-Key für Pocket, um Inhalte zu importieren (https://getpocket.com/developer/docs/authentication) | 11 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
12 | # import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: Shaarli-URL, sofern der Service aktiviert ist | 13 | shaarli_url: Shaarli-URL, sofern der Service aktiviert ist |
13 | share_diaspora: Teilen zu Diaspora aktiveren | 14 | share_diaspora: Teilen zu Diaspora aktiveren |
14 | share_mail: Teilen via E-Mail aktiveren | 15 | share_mail: Teilen via E-Mail aktiveren |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index 48d0ec4b..8aaa27e7 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | |||
@@ -8,7 +8,8 @@ export_csv: Enable CSV export | |||
8 | export_json: Enable JSON export | 8 | export_json: Enable JSON export |
9 | export_txt: Enable TXT export | 9 | export_txt: Enable TXT export |
10 | export_xml: Enable XML export | 10 | export_xml: Enable XML export |
11 | pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) | 11 | import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
12 | import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: Shaarli URL, if the service is enabled | 13 | shaarli_url: Shaarli URL, if the service is enabled |
13 | share_diaspora: Enable share to Diaspora | 14 | share_diaspora: Enable share to Diaspora |
14 | share_mail: Enable share by email | 15 | share_mail: Enable share by email |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml index 7aac9adf..bf3a79af 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml | |||
@@ -8,7 +8,8 @@ export_csv: Activar exportación a CSV | |||
8 | export_json: Activar exportación a JSON | 8 | export_json: Activar exportación a JSON |
9 | export_txt: Activar exportación a TXT | 9 | export_txt: Activar exportación a TXT |
10 | export_xml: Activar exportación a XML | 10 | export_xml: Activar exportación a XML |
11 | pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) | 11 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
12 | # import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: Shaarli URL, si el servicio está activado | 13 | shaarli_url: Shaarli URL, si el servicio está activado |
13 | share_diaspora: Activar compartir con Diaspora | 14 | share_diaspora: Activar compartir con Diaspora |
14 | share_mail: Activar compartir con email | 15 | share_mail: Activar compartir con email |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml index 613cf86d..d86c4343 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml | |||
@@ -8,7 +8,8 @@ export_csv: فعالسازی برونسپاری به CSV | |||
8 | export_json: فعالسازی برونسپاری به JSON | 8 | export_json: فعالسازی برونسپاری به JSON |
9 | export_txt: فعالسازی برونسپاری به TXT | 9 | export_txt: فعالسازی برونسپاری به TXT |
10 | export_xml: فعالسازی برونسپاری به XML | 10 | export_xml: فعالسازی برونسپاری به XML |
11 | pocket_consumer_key: کلید کاربری Pocket برای درونریزی مطالب (https://getpocket.com/developer/docs/authentication) | 11 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
12 | # import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: نشانی Shaarli، اگر فعال بود | 13 | shaarli_url: نشانی Shaarli، اگر فعال بود |
13 | share_diaspora: فعالسازی همرسانی به Diaspora | 14 | share_diaspora: فعالسازی همرسانی به Diaspora |
14 | share_mail: فعالسازی همرسانی با ایمیل | 15 | share_mail: فعالسازی همرسانی با ایمیل |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml index f21f2439..5e1ecf26 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml | |||
@@ -8,7 +8,8 @@ export_csv: Activer l'export CSV | |||
8 | export_json: Activer l'export JSON | 8 | export_json: Activer l'export JSON |
9 | export_txt: Activer l'export TXT | 9 | export_txt: Activer l'export TXT |
10 | export_xml: Activer l'export XML | 10 | export_xml: Activer l'export XML |
11 | pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication) | 11 | import_with_rabbitmq: Activer RabbitMQ pour gérer les imports de façon asynchrone |
12 | import_with_redis: Activer Redis pour gérer les imports de façon asynchrone | ||
12 | shaarli_url: URL de Shaarli, si le service Shaarli est activé | 13 | shaarli_url: URL de Shaarli, si le service Shaarli est activé |
13 | share_diaspora: Activer le partage vers Diaspora | 14 | share_diaspora: Activer le partage vers Diaspora |
14 | share_mail: Activer le partage par email | 15 | share_mail: Activer le partage par email |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml index 1202edd5..9d820e4b 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml | |||
@@ -8,7 +8,8 @@ export_csv: Abilita esportazione CSV | |||
8 | export_json: Abilita esportazione JSON | 8 | export_json: Abilita esportazione JSON |
9 | export_txt: Abilita esportazione TXT | 9 | export_txt: Abilita esportazione TXT |
10 | export_xml: Abilita esportazione XML | 10 | export_xml: Abilita esportazione XML |
11 | pocket_consumer_key: Consumer key per Pocket per importare i contenuti (https://getpocket.com/developer/docs/authentication) | 11 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
12 | # import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: Shaarli URL, se il servizio è abilitato | 13 | shaarli_url: Shaarli URL, se il servizio è abilitato |
13 | share_diaspora: Abilita la condivisione con Diaspora | 14 | share_diaspora: Abilita la condivisione con Diaspora |
14 | share_mail: Abilita la condivisione per email | 15 | share_mail: Abilita la condivisione per email |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml index dd91ee49..49dc7732 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml | |||
@@ -8,7 +8,8 @@ export_csv: Activar l'expòrt CSV | |||
8 | export_json: Activar l'expòrt JSON | 8 | export_json: Activar l'expòrt JSON |
9 | export_txt: Activar l'expòrt TXT | 9 | export_txt: Activar l'expòrt TXT |
10 | export_xml: Activar l'expòrt XML | 10 | export_xml: Activar l'expòrt XML |
11 | pocket_consumer_key: Clau d'autentificacion Pocket per importar las donadas (https://getpocket.com/developer/docs/authentication) | 11 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
12 | # import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: URL de Shaarli, se lo servici Shaarli es activat | 13 | shaarli_url: URL de Shaarli, se lo servici Shaarli es activat |
13 | share_diaspora: Activar lo partatge cap a Diaspora | 14 | share_diaspora: Activar lo partatge cap a Diaspora |
14 | share_mail: Activar lo partatge per corrièl | 15 | share_mail: Activar lo partatge per corrièl |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml index 93b36c8f..2365f2b3 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml | |||
@@ -8,7 +8,8 @@ export_csv: Włącz eksport do CSV | |||
8 | export_json: Włącz eksport do JSON | 8 | export_json: Włącz eksport do JSON |
9 | export_txt: Włącz eksport do TXT | 9 | export_txt: Włącz eksport do TXT |
10 | export_xml: Włącz eksport do XML | 10 | export_xml: Włącz eksport do XML |
11 | pocket_consumer_key: Klucz klienta Pocket do importu zawartości (https://getpocket.com/developer/docs/authentication) | 11 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
12 | # import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona | 13 | shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona |
13 | share_diaspora: Włącz udostępnianie dla Diaspora | 14 | share_diaspora: Włącz udostępnianie dla Diaspora |
14 | share_mail: Włącz udostępnianie przez email | 15 | share_mail: Włącz udostępnianie przez email |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml index 326c9f90..20d664f7 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml | |||
@@ -8,7 +8,8 @@ export_csv: Permite exportare CSV | |||
8 | export_json: Permite exportare JSON | 8 | export_json: Permite exportare JSON |
9 | export_txt: Permite exportare TXT | 9 | export_txt: Permite exportare TXT |
10 | export_xml: Permite exportare XML | 10 | export_xml: Permite exportare XML |
11 | pocket_consumer_key: Cheie consumator pentru importarea contentului din Pocket (https://getpocket.com/developer/docs/authentication) | 11 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
12 | # import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: Shaarli URL, dacă serviciul este permis | 13 | shaarli_url: Shaarli URL, dacă serviciul este permis |
13 | share_diaspora: Permite share către Diaspora | 14 | share_diaspora: Permite share către Diaspora |
14 | share_mail: Permite share prin email | 15 | share_mail: Permite share prin email |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml new file mode 100644 index 00000000..4b4d3edb --- /dev/null +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml | |||
@@ -0,0 +1,31 @@ | |||
1 | # download_pictures: Download pictures on your server | ||
2 | # carrot: Enable share to Carrot | ||
3 | # diaspora_url: Diaspora URL, if the service is enabled | ||
4 | # export_epub: Enable ePub export | ||
5 | # export_mobi: Enable .mobi export | ||
6 | # export_pdf: Enable PDF export | ||
7 | # export_csv: Enable CSV export | ||
8 | # export_json: Enable JSON export | ||
9 | # export_txt: Enable TXT export | ||
10 | # export_xml: Enable XML export | ||
11 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously | ||
12 | # import_with_redis: Enable Redis to import data asynchronously | ||
13 | # shaarli_url: Shaarli URL, if the service is enabled | ||
14 | # share_diaspora: Enable share to Diaspora | ||
15 | # share_mail: Enable share by email | ||
16 | # share_shaarli: Enable share to Shaarli | ||
17 | # share_twitter: Enable share to Twitter | ||
18 | # show_printlink: Display a link to print content | ||
19 | # wallabag_support_url: Support URL for wallabag | ||
20 | # wallabag_url: URL of *your* wallabag instance | ||
21 | # entry: "article" | ||
22 | # export: "export" | ||
23 | # import: "import" | ||
24 | # misc: "misc" | ||
25 | # modify_settings: "apply" | ||
26 | # piwik_host: Host of your website in Piwik | ||
27 | # piwik_site_id: ID of your website in Piwik | ||
28 | # piwik_enabled: Enable Piwik | ||
29 | # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" | ||
30 | # demo_mode_username: "Demo user" | ||
31 | # share_public: Allow public url for entries | ||