mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 19:11:07 +00:00
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
parent
e46fdf3096
commit
ca08d02f2f
19 changed files with 81 additions and 4 deletions
|
|
@ -367,6 +367,7 @@ import:
|
|||
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
|
||||
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:"
|
||||
# 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:
|
||||
# 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."
|
||||
|
|
@ -504,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
# client_created: 'New client created.'
|
||||
# client_deleted: 'Client deleted'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
|
|
|
|||
|
|
@ -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.'
|
||||
worker:
|
||||
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:
|
||||
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."
|
||||
|
|
@ -504,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
client_created: 'Neuer Client erstellt.'
|
||||
client_deleted: 'Client gelöscht'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
|
|
|
|||
|
|
@ -367,6 +367,7 @@ import:
|
|||
how_to: 'Please select your Readability export and click on the below button to upload and import it.'
|
||||
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:"
|
||||
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:
|
||||
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."
|
||||
|
|
@ -470,6 +471,7 @@ flashes:
|
|||
rss_updated: 'RSS information updated'
|
||||
tagging_rules_updated: 'Tagging rules updated'
|
||||
tagging_rules_deleted: 'Tagging rule deleted'
|
||||
# user_added: 'User "%username%" added'
|
||||
rss_token_updated: 'RSS token updated'
|
||||
annotations_reset: Annotations reset
|
||||
tags_reset: Tags reset
|
||||
|
|
|
|||
|
|
@ -367,6 +367,7 @@ import:
|
|||
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
|
||||
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:"
|
||||
# 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:
|
||||
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."
|
||||
|
|
@ -504,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
client_created: 'Nuevo cliente creado.'
|
||||
client_deleted: 'Cliente suprimido'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
|
|
|
|||
|
|
@ -284,6 +284,7 @@ quickstart:
|
|||
paragraph_2: 'ادامه دهید!'
|
||||
configure:
|
||||
title: 'برنامه را تنظیم کنید'
|
||||
# description: 'In order to have an application which suits you, have a look into the configuration of wallabag.'
|
||||
language: 'زبان و نمای برنامه را تغییر دهید'
|
||||
rss: 'خوراک آر-اس-اس را فعال کنید'
|
||||
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.'
|
||||
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:"
|
||||
# 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:
|
||||
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."
|
||||
|
|
@ -503,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
# client_created: 'New client created.'
|
||||
# client_deleted: 'Client deleted'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
|
|
|
|||
|
|
@ -367,6 +367,7 @@ import:
|
|||
how_to: "Choisissez le fichier de votre export Readability et cliquez sur le bouton ci-dessous pour l'importer."
|
||||
worker:
|
||||
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:
|
||||
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>"
|
||||
|
|
@ -504,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
client_created: 'Nouveau client %name% créé'
|
||||
client_deleted: 'Client %name% supprimé'
|
||||
user:
|
||||
notice:
|
||||
added: 'Utilisateur "%username%" ajouté'
|
||||
updated: 'Utilisateur "%username%" mis à jour'
|
||||
deleted: 'Utilisateur "%username%" supprimé'
|
||||
|
|
|
|||
|
|
@ -367,6 +367,7 @@ import:
|
|||
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
|
||||
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:"
|
||||
# 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:
|
||||
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."
|
||||
|
|
@ -504,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
client_created: 'Nuovo client creato.'
|
||||
client_deleted: 'Client eliminato'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
|
|
|
|||
|
|
@ -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."
|
||||
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 : "
|
||||
# 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:
|
||||
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."
|
||||
|
|
@ -504,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
client_created: 'Novèl client creat'
|
||||
client_deleted: 'Client suprimit'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
|
|
|
|||
|
|
@ -367,6 +367,7 @@ import:
|
|||
how_to: 'Wybierz swój plik eksportu z Readability i kliknij poniższy przycisk, aby go załadować.'
|
||||
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:"
|
||||
# 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:
|
||||
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."
|
||||
|
|
@ -504,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
client_created: 'Nowy klient utworzony.'
|
||||
client_deleted: 'Klient usunięty'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
|
|
|
|||
|
|
@ -367,6 +367,7 @@ import:
|
|||
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
|
||||
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:"
|
||||
# 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:
|
||||
# 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."
|
||||
|
|
@ -504,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
# client_created: 'New client created.'
|
||||
# client_deleted: 'Client deleted'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
|
|
|
|||
|
|
@ -108,6 +108,7 @@ config:
|
|||
# if_label: 'if'
|
||||
# then_tag_as_label: 'then tag as'
|
||||
# delete_rule_label: 'delete'
|
||||
# edit_rule_label: 'edit'
|
||||
rule_label: 'Kural'
|
||||
tags_label: 'Etiketler'
|
||||
faq:
|
||||
|
|
@ -366,6 +367,7 @@ import:
|
|||
# how_to: 'Please select your Readability export and click on the below button to upload and import it.'
|
||||
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:"
|
||||
# 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:
|
||||
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."
|
||||
|
|
@ -503,3 +505,8 @@ flashes:
|
|||
notice:
|
||||
# client_created: 'New client created.'
|
||||
# client_deleted: 'Client deleted'
|
||||
user:
|
||||
notice:
|
||||
# added: 'User "%username%" added'
|
||||
# updated: 'User "%username%" updated'
|
||||
# deleted: 'User "%username%" deleted'
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
<div class="row">
|
||||
<div class="col s12">
|
||||
<div class="card-panel settings">
|
||||
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
|
||||
|
||||
<div class="row">
|
||||
<blockquote>{{ import.description|trans|raw }}</blockquote>
|
||||
<p>{{ 'import.chrome.how_to'|trans }}</p>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
<div class="row">
|
||||
<div class="col s12">
|
||||
<div class="card-panel settings">
|
||||
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
|
||||
|
||||
<div class="row">
|
||||
<blockquote>{{ import.description|trans|raw }}</blockquote>
|
||||
<p>{{ 'import.firefox.how_to'|trans }}</p>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,15 @@
|
|||
{% set redis = craue_setting('import_with_redis') %}
|
||||
{% set rabbit = craue_setting('import_with_rabbitmq') %}
|
||||
{% set downloadImages = craue_setting('download_images_enabled') %}
|
||||
|
||||
{% if redis or rabbit %}
|
||||
<div class="card-panel yellow darken-1 black-text">
|
||||
{{ 'import.worker.enabled'|trans }} <strong>{% if rabbit %}RabbitMQ{% elseif redis %}Redis{% endif %}</strong>
|
||||
</div>
|
||||
{% 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 %}
|
||||
|
|
@ -6,6 +6,8 @@
|
|||
<div class="row">
|
||||
<div class="col s12">
|
||||
<div class="card-panel settings">
|
||||
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
|
||||
|
||||
{{ 'import.page_description'|trans }}
|
||||
<ul>
|
||||
{% for import in imports %}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<div class="row">
|
||||
<div class="col s12">
|
||||
<div class="card-panel settings">
|
||||
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %}
|
||||
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
|
||||
|
||||
<div class="row">
|
||||
<blockquote>{{ import.description|trans }}</blockquote>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<div class="row">
|
||||
<div class="col s12">
|
||||
<div class="card-panel settings">
|
||||
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %}
|
||||
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
|
||||
|
||||
{% if not has_consumer_key %}
|
||||
<div class="card-panel red white-text">
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<div class="row">
|
||||
<div class="col s12">
|
||||
<div class="card-panel settings">
|
||||
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %}
|
||||
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
|
||||
|
||||
<div class="row">
|
||||
<blockquote>{{ import.description|trans }}</blockquote>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<div class="row">
|
||||
<div class="col s12">
|
||||
<div class="card-panel settings">
|
||||
{% include 'WallabagImportBundle:Import:_workerEnabled.html.twig' %}
|
||||
{% include 'WallabagImportBundle:Import:_information.html.twig' %}
|
||||
|
||||
<div class="row">
|
||||
<blockquote>{{ import.description|trans }}</blockquote>
|
||||
|
|
|
|||
Loading…
Reference in a new issue