Add warning message for import + download images

When import isn't async and downloading images is enabled, we warn the user that import can fail.
Also, added missing translations
This commit is contained in:
Jeremy Benoist 2016-11-03 15:59:18 +01:00
parent e46fdf3096
commit ca08d02f2f
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
19 changed files with 81 additions and 4 deletions

View file

@ -367,6 +367,7 @@ import:
# how_to: 'Please select your Readability export and click on the below button to upload and import it.' # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker: worker:
# 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:" # 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:"
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
# firefox: # firefox:
# page_title: 'Import > Firefox' # page_title: 'Import > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@ -504,3 +505,8 @@ flashes:
notice: notice:
# client_created: 'New client created.' # client_created: 'New client created.'
# client_deleted: 'Client deleted' # client_deleted: 'Client deleted'
user:
notice:
# added: 'User "%username%" added'
# updated: 'User "%username%" updated'
# deleted: 'User "%username%" deleted'

View file

@ -367,6 +367,7 @@ import:
how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.' how_to: 'Bitte wähle deinen Readability Export aus und klicke den unteren Button für das Hochladen und Importieren dessen.'
worker: worker:
enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:" enabled: "Der Import erfolgt asynchron. Sobald der Import gestartet ist, wird diese Aufgabe extern abgearbeitet. Der aktuelle Service dafür ist:"
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
firefox: firefox:
page_title: 'Aus Firefox importieren' page_title: 'Aus Firefox importieren'
description: "Dieser Import wird all deine Lesezeichen aus Firefox importieren. Gehe zu deinen Lesezeichen (Strg+Shift+O), dann auf \"Importen und Sichern\", wähle \"Sichern…\". Du erhälst eine .json Datei." description: "Dieser Import wird all deine Lesezeichen aus Firefox importieren. Gehe zu deinen Lesezeichen (Strg+Shift+O), dann auf \"Importen und Sichern\", wähle \"Sichern…\". Du erhälst eine .json Datei."
@ -504,3 +505,8 @@ flashes:
notice: notice:
client_created: 'Neuer Client erstellt.' client_created: 'Neuer Client erstellt.'
client_deleted: 'Client gelöscht' client_deleted: 'Client gelöscht'
user:
notice:
# added: 'User "%username%" added'
# updated: 'User "%username%" updated'
# deleted: 'User "%username%" deleted'

View file

@ -367,6 +367,7 @@ import:
how_to: 'Please select your Readability export and click on the below button to upload and import it.' how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker: worker:
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:" 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:"
download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
firefox: firefox:
page_title: 'Import > Firefox' page_title: 'Import > Firefox'
description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@ -470,6 +471,7 @@ flashes:
rss_updated: 'RSS information updated' rss_updated: 'RSS information updated'
tagging_rules_updated: 'Tagging rules updated' tagging_rules_updated: 'Tagging rules updated'
tagging_rules_deleted: 'Tagging rule deleted' tagging_rules_deleted: 'Tagging rule deleted'
# user_added: 'User "%username%" added'
rss_token_updated: 'RSS token updated' rss_token_updated: 'RSS token updated'
annotations_reset: Annotations reset annotations_reset: Annotations reset
tags_reset: Tags reset tags_reset: Tags reset

View file

@ -367,6 +367,7 @@ import:
# how_to: 'Please select your Readability export and click on the below button to upload and import it.' # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker: worker:
# 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:" # 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:"
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
firefox: firefox:
page_title: 'Importar > Firefox' page_title: 'Importar > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@ -504,3 +505,8 @@ flashes:
notice: notice:
client_created: 'Nuevo cliente creado.' client_created: 'Nuevo cliente creado.'
client_deleted: 'Cliente suprimido' client_deleted: 'Cliente suprimido'
user:
notice:
# added: 'User "%username%" added'
# updated: 'User "%username%" updated'
# deleted: 'User "%username%" deleted'

View file

@ -284,6 +284,7 @@ quickstart:
paragraph_2: 'ادامه دهید!' paragraph_2: 'ادامه دهید!'
configure: configure:
title: 'برنامه را تنظیم کنید' title: 'برنامه را تنظیم کنید'
# description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
language: 'زبان و نمای برنامه را تغییر دهید' language: 'زبان و نمای برنامه را تغییر دهید'
rss: 'خوراک آر-اس-اس را فعال کنید' rss: 'خوراک آر-اس-اس را فعال کنید'
tagging_rules: 'قانون‌های برچسب‌گذاری خودکار مقاله‌هایتان را تعریف کنید' tagging_rules: 'قانون‌های برچسب‌گذاری خودکار مقاله‌هایتان را تعریف کنید'
@ -366,6 +367,7 @@ import:
# how_to: 'Please select your Readability export and click on the below button to upload and import it.' # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker: worker:
# 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:" # 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:"
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
firefox: firefox:
page_title: 'درون‌ریزی > Firefox' page_title: 'درون‌ریزی > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@ -503,3 +505,8 @@ flashes:
notice: notice:
# client_created: 'New client created.' # client_created: 'New client created.'
# client_deleted: 'Client deleted' # client_deleted: 'Client deleted'
user:
notice:
# added: 'User "%username%" added'
# updated: 'User "%username%" updated'
# deleted: 'User "%username%" deleted'

View file

@ -367,6 +367,7 @@ import:
how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l'importer." how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l'importer."
worker: worker:
enabled: "Les imports sont asynchrones. Une fois l'import commencé un worker externe traitera les messages un par un. Le service activé est :" enabled: "Les imports sont asynchrones. Une fois l'import commencé un worker externe traitera les messages un par un. Le service activé est :"
download_images_warning: "Vous avez configuré le téléchagement des images pour vos articles. Combiné à l'import classique, cette opération peut être très très longue (voire échouer). Nous vous conseillons <strong>vivement</strong> d'activer les imports asynchrones."
firefox: firefox:
page_title: 'Import > Firefox' page_title: 'Import > Firefox'
description: "Cet outil va vous permettre d'importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde... ». Vous allez récupérer un fichier .json. </p>" description: "Cet outil va vous permettre d'importer tous vos marques-pages de Firefox. Ouvrez le panneau des marques-pages (Ctrl+Maj+O), puis dans « Importation et sauvegarde », choisissez « Sauvegarde... ». Vous allez récupérer un fichier .json. </p>"
@ -504,3 +505,8 @@ flashes:
notice: notice:
client_created: 'Nouveau client %name% créé' client_created: 'Nouveau client %name% créé'
client_deleted: 'Client %name% supprimé' client_deleted: 'Client %name% supprimé'
user:
notice:
added: 'Utilisateur "%username%" ajouté'
updated: 'Utilisateur "%username%" mis à jour'
deleted: 'Utilisateur "%username%" supprimé'

View file

@ -367,6 +367,7 @@ import:
# how_to: 'Please select your Readability export and click on the below button to upload and import it.' # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker: worker:
# 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:" # 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:"
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
firefox: firefox:
page_title: 'Importa da > Firefox' page_title: 'Importa da > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@ -504,3 +505,8 @@ flashes:
notice: notice:
client_created: 'Nuovo client creato.' client_created: 'Nuovo client creato.'
client_deleted: 'Client eliminato' client_deleted: 'Client eliminato'
user:
notice:
# added: 'User "%username%" added'
# updated: 'User "%username%" updated'
# deleted: 'User "%username%" deleted'

View file

@ -367,6 +367,7 @@ import:
how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar." how_to: "Mercés de seleccionar vòstre Readability fichièr e de clicar sul boton dejós per lo telecargar e l'importar."
worker: worker:
enabled: "L'importacion se fa de manièra asincròna. Un còp l'importacion lançada, una aisina externa s'ocuparà dels messatges un per un. Lo servici actual es : " enabled: "L'importacion se fa de manièra asincròna. Un còp l'importacion lançada, una aisina externa s'ocuparà dels messatges un per un. Lo servici actual es : "
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
firefox: firefox:
page_title: 'Importar > Firefox' page_title: 'Importar > Firefox'
description: "Aquesta aisina importarà totas vòstres favorits de Firefox. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." description: "Aquesta aisina importarà totas vòstres favorits de Firefox. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@ -504,3 +505,8 @@ flashes:
notice: notice:
client_created: 'Novèl client creat' client_created: 'Novèl client creat'
client_deleted: 'Client suprimit' client_deleted: 'Client suprimit'
user:
notice:
# added: 'User "%username%" added'
# updated: 'User "%username%" updated'
# deleted: 'User "%username%" deleted'

View file

@ -367,6 +367,7 @@ import:
how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.' how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.'
worker: worker:
enabled: "Import jest wykonywany asynchronicznie. Od momentu rozpoczęcia importu, zewnętrzna usługa może zajmować się na raz tylko jednym zadaniem. Bieżącą usługą jest:" enabled: "Import jest wykonywany asynchronicznie. Od momentu rozpoczęcia importu, zewnętrzna usługa może zajmować się na raz tylko jednym zadaniem. Bieżącą usługą jest:"
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
firefox: firefox:
page_title: 'Import > Firefox' page_title: 'Import > Firefox'
description: "Ten importer zaimportuje wszystkie twoje zakładki z Firefoksa. Idź do twoich zakładek (Ctrl+Shift+O), następnie w \"Import i kopie zapasowe\", wybierz \"Utwórz kopię zapasową...\". Uzyskasz plik .json." description: "Ten importer zaimportuje wszystkie twoje zakładki z Firefoksa. Idź do twoich zakładek (Ctrl+Shift+O), następnie w \"Import i kopie zapasowe\", wybierz \"Utwórz kopię zapasową...\". Uzyskasz plik .json."
@ -504,3 +505,8 @@ flashes:
notice: notice:
client_created: 'Nowy klient utworzony.' client_created: 'Nowy klient utworzony.'
client_deleted: 'Klient usunięty' client_deleted: 'Klient usunięty'
user:
notice:
# added: 'User "%username%" added'
# updated: 'User "%username%" updated'
# deleted: 'User "%username%" deleted'

View file

@ -367,6 +367,7 @@ import:
# how_to: 'Please select your Readability export and click on the below button to upload and import it.' # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker: worker:
# 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:" # 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:"
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
# firefox: # firefox:
# page_title: 'Import > Firefox' # page_title: 'Import > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@ -504,3 +505,8 @@ flashes:
notice: notice:
# client_created: 'New client created.' # client_created: 'New client created.'
# client_deleted: 'Client deleted' # client_deleted: 'Client deleted'
user:
notice:
# added: 'User "%username%" added'
# updated: 'User "%username%" updated'
# deleted: 'User "%username%" deleted'

View file

@ -108,6 +108,7 @@ config:
# if_label: 'if' # if_label: 'if'
# then_tag_as_label: 'then tag as' # then_tag_as_label: 'then tag as'
# delete_rule_label: 'delete' # delete_rule_label: 'delete'
# edit_rule_label: 'edit'
rule_label: 'Kural' rule_label: 'Kural'
tags_label: 'Etiketler' tags_label: 'Etiketler'
faq: faq:
@ -366,6 +367,7 @@ import:
# how_to: 'Please select your Readability export and click on the below button to upload and import it.' # how_to: 'Please select your Readability export and click on the below button to upload and import it.'
worker: worker:
# 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:" # 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:"
# download_images_warning: "You enabled downloading images for your articles. Combined with classic import it can take ages to proceed (or maybe failed). We <strong>strongly recommend</strong> to enable asynchronous import to avoid errors."
firefox: firefox:
page_title: 'İçe Aktar > Firefox' page_title: 'İçe Aktar > Firefox'
# description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file." # description: "This importer will import all your Firefox bookmarks. Just go to your bookmarks (Ctrl+Maj+O), then into \"Import and backup\", choose \"Backup...\". You will obtain a .json file."
@ -503,3 +505,8 @@ flashes:
notice: notice:
# client_created: 'New client created.' # client_created: 'New client created.'
# client_deleted: 'Client deleted' # client_deleted: 'Client deleted'
user:
notice:
# added: 'User "%username%" added'
# updated: 'User "%username%" updated'
# deleted: 'User "%username%" deleted'

View file

@ -6,6 +6,8 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote> <blockquote>{{ import.description|trans|raw }}</blockquote>
<p>{{ 'import.chrome.how_to'|trans }}</p> <p>{{ 'import.chrome.how_to'|trans }}</p>

View file

@ -6,6 +6,8 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote> <blockquote>{{ import.description|trans|raw }}</blockquote>
<p>{{ 'import.firefox.how_to'|trans }}</p> <p>{{ 'import.firefox.how_to'|trans }}</p>

View file

@ -1,8 +1,15 @@
{% set redis = craue_setting('import_with_redis') %} {% set redis = craue_setting('import_with_redis') %}
{% set rabbit = craue_setting('import_with_rabbitmq') %} {% set rabbit = craue_setting('import_with_rabbitmq') %}
{% set downloadImages = craue_setting('download_images_enabled') %}
{% if redis or rabbit %} {% if redis or rabbit %}
<div class="card-panel yellow darken-1 black-text"> <div class="card-panel yellow darken-1 black-text">
{{ 'import.worker.enabled'|trans }} <strong>{% if rabbit %}RabbitMQ{% elseif redis %}Redis{% endif %}</strong> {{ 'import.worker.enabled'|trans }} <strong>{% if rabbit %}RabbitMQ{% elseif redis %}Redis{% endif %}</strong>
</div> </div>
{% endif %} {% endif %}
{% if not redis and not rabbit and downloadImages %}
<div class="card-panel orange darken-1 black-text">
{{ 'import.worker.download_images_warning'|trans|raw }}
</div>
{% endif %}

View file

@ -6,6 +6,8 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
{{ 'import.page_description'|trans }} {{ 'import.page_description'|trans }}
<ul> <ul>
{% for import in imports %} {% for import in imports %}

View file

@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %} {% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans }}</blockquote> <blockquote>{{ import.description|trans }}</blockquote>

View file

@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %} {% include 'WallabagImportBundle:Import:_information.html.twig' %}
{% if not has_consumer_key %} {% if not has_consumer_key %}
<div class="card-panel red white-text"> <div class="card-panel red white-text">

View file

@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %} {% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans }}</blockquote> <blockquote>{{ import.description|trans }}</blockquote>

View file

@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %} {% include 'WallabagImportBundle:Import:_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans }}</blockquote> <blockquote>{{ import.description|trans }}</blockquote>