From c0586a906c2bee5f5be445e614696a7078a7c906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 14 Mar 2014 08:37:40 +0100 Subject: [PATCH] [fix] new import section in old themes #559 --- themes/baggy/config.twig | 4 ++-- themes/default/config.twig | 36 +++++++++++++++++++++++++++++------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 20ff9a000..a13af0c81 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -12,7 +12,7 @@
  • Chrome: {% trans "download the extension" %}
  • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
  • iOS: {% trans "download the application" %}
    • -
  • Windows Phone: {% trans "download the application" %}
    • +
  • Windows Phone: {% trans "download the application" %}
  • @@ -131,7 +131,7 @@ {% if token == '' %}

    {% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click here to generate it." %}

    {% else %} -

    3. {% trans "Finaly, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

    +

    3. {% trans "Finally, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

    {% trans "If you have console access to your server, you can also create a cron task:" %}

    0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1
    {% endif %} diff --git a/themes/default/config.twig b/themes/default/config.twig index 8121da3c8..5d20e0eac 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -12,7 +12,7 @@
  • Chrome: {% trans "download the extension" %}
  • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
  • iOS: {% trans "download the application" %}
    • -
  • Windows Phone: {% trans "download the application" %}
    • +
  • Windows Phone: {% trans "download the application" %}
  • @@ -104,15 +104,37 @@ {% endif %}

    {% trans "Import" %}

    -

    {% trans "Please execute the import script locally as it can take a very long time." %}

    -

    {% trans "More info in the official documentation:" %} wallabag.org

    +

    {% trans "Importing from other services can be quite long, and webservers default configuration often prevents long scripts execution time, so it must be done in multiple parts." %}

    +

    1. {% trans "First, select the export file on your computer and upload it." %}

    + +
    +
    + + +
    +
    + +
    +
    + + + +

    2. {% trans "Then, click on the right link below." %}

    + {% if token == '' %} +

    {% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click here to generate it." %}

    + {% else %} +

    3. {% trans "Finally, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

    +

    {% trans "If you have console access to your server, you can also create a cron task:" %}

    + 
    0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1
    + {% endif %} +

    {% trans "Export your wallabag data" %}

    {% if constant('STORAGE') == 'sqlite' %}

    {% trans "Click here" %} {% trans "to download your database." %}

    {% endif %}