From fb9df0c269f36703909b8b259abbdbed29881ecd Mon Sep 17 00:00:00 2001 From: tcit Date: Thu, 24 Jul 2014 21:56:04 +0200 Subject: use directly MOBIClass --- themes/baggy/config.twig | 10 ++++++++-- themes/baggy/home.twig | 20 +++++++++++++++----- themes/baggy/view.twig | 2 ++ 3 files changed, 25 insertions(+), 7 deletions(-) (limited to 'themes') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 46735f07..cd86a4fd 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -20,7 +20,7 @@ -
  • {% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %} {% trans "bag it!" %}
    • +
  • {% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %} {% trans "bag it!" %}

    • {% trans "Upgrading wallabag" %}

    @@ -126,7 +126,13 @@

    {% trans "Click here" %} {% trans "to export your wallabag data." %}

    {% trans "Fancy an E-Book ?" %}

    -

    {% trans "Click on this link to get all your articles in one ebook (ePub 3 format)." %} +

    {% trans "Click to get all your articles in one ebook :" %} +

    +
    {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    {% trans "Cache" %}

    diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index e788b588..4f415220 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -43,7 +43,7 @@ {% if entry.content| getReadingTime > 0 %}
    {% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
    {% else %} -
    {% trans "estimated reading time :" %} < 1 min
    +
    {% trans "estimated reading time :" %} 1 min
    {% endif %} -- cgit v1.2.3 From 8492f37323c63ac4caed3246077c11bb2c5be79b Mon Sep 17 00:00:00 2001 From: tcit Date: Sat, 26 Jul 2014 12:22:33 +0200 Subject: translation stuff (en & fr done) --- themes/baggy/config.twig | 6 +++--- themes/baggy/view.twig | 6 +++--- themes/courgette/config.twig | 8 +++++++- themes/default/config.twig | 17 ++++++++++++----- 4 files changed, 25 insertions(+), 12 deletions(-) (limited to 'themes') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index cd86a4fd..dda05c29 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -128,9 +128,9 @@

    {% trans "Fancy an E-Book ?" %}

    {% trans "Click to get all your articles in one ebook :" %}


    {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 85e3ddf1..3f151592 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -16,9 +16,9 @@ {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numflattrs }})
    • {% endif %}{% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
    • {% endif %} -
  • EPUB
    • -
  • MOBI
    • -
  • PDF
    • +
  • EPUB
    • +
  • MOBI
    • +
  • PDF
  • {% trans "Does this article appear wrong?" %}
    • diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig index 9ab58461..6b0fa308 100755 --- a/themes/courgette/config.twig +++ b/themes/courgette/config.twig @@ -82,7 +82,13 @@

    {% trans "Click here" %} {% trans "to export your wallabag data." %}

    {% trans "Fancy an E-Book ?" %}

    -

    {% trans "Click on this link to get all your articles in one ebook (ePub 3 format)." %} +

    {% trans "Click to get all your articles in one ebook :" %} +

    +
    {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    {% trans 'Add user' %}

    diff --git a/themes/default/config.twig b/themes/default/config.twig index 160f6046..a65d2b2c 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -124,13 +124,20 @@

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

    {% endif %}

    {% trans "Click here" %} {% trans "to export your wallabag data." %}

    -

    {% trans "Cache" %}

    -

    {% trans "Click here" %} {% trans "to delete cache." %}

    -

    {% trans "Fancy an E-Book ?" %}

    -

    {% trans "Click on this link to get all your articles in one ebook (ePub 3 format)." %} +

    {% trans "Click to get all your articles in one ebook :" %} +

    +
    {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    - + + +

    {% trans "Cache" %}

    +

    {% trans "Click here" %} {% trans "to delete cache." %}

    +

    {% trans 'Add user' %}

    {% trans 'Add a new user :' %}

    -- cgit v1.2.3 From 5ea5310ab450035143e2f5637f9fa69773f7879b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 14 Dec 2014 15:17:39 +0100 Subject: enable showing or not for epub/mobi/pdf export buttons --- themes/baggy/home.twig | 18 +++++++++--------- themes/baggy/view.twig | 6 +++--- themes/default/home.twig | 18 +++++++++--------- themes/default/view.twig | 4 +++- 4 files changed, 24 insertions(+), 22 deletions(-) (limited to 'themes') diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 426ead1d..abebe455 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -61,17 +61,17 @@ {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %}
    {% if tag %} - {% trans "Download as ePub3" %} - {% trans "Download as Mobi" %} - {% trans "Download as PDF" %} + {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} + {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} + {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} {% elseif searchterm is defined %} - {% trans "Download as ePub3" %} - {% trans "Download as Mobi" %} - {% trans "Download as PDF" %} + {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} + {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} + {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} {% else %} - {% trans "Download as ePub3" %} - {% trans "Download as Mobi" %} - {% trans "Download as PDF" %} + {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} + {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} + {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} {% endif %} {% endif %} {% endblock %} diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index dd274327..1afd9df6 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -19,9 +19,9 @@ {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numFlattrs }})
    • {% endif %}{% endif %} {% if constant('CARROT') == 1 %}
  • Carrot
    • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
    • {% endif %} -
  • EPUB
    • -
  • MOBI
    • -
  • PDF
    • + {% if constant('EPUB') == 1 %}
  • EPUB
    • {% endif %} + {% if constant('MOBI') == 1 %}
  • MOBI
    • {% endif %} + {% if constant('PDF') == 1 %}
  • PDF
    • {% endif %}
  • {% trans "Does this article appear wrong?" %}
    • diff --git a/themes/default/home.twig b/themes/default/home.twig index 59615691..c5db5802 100755 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -61,17 +61,17 @@ {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %}
    {% if tag %} - {% trans "Download as ePub3" %} - {% trans "Download as Mobi" %} - {% trans "Download as PDF" %} + {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} + {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} + {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} {% elseif searchterm is defined %} - {% trans "Download as ePub3" %} - {% trans "Download as Mobi" %} - {% trans "Download as PDF" %} + {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} + {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} + {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} {% else %} - {% trans "Download as ePub3" %} - {% trans "Download as Mobi" %} - {% trans "Download as PDF" %} + {% if constant('EPUB') == 1 %}{% trans "Download as ePub3" %}{% endif %} + {% if constant('MOBI') == 1 %}{% trans "Download as Mobi" %}{% endif %} + {% if constant('PDF') == 1 %}{% trans "Download as PDF" %}{% endif %} {% endif %} {% endif %} diff --git a/themes/default/view.twig b/themes/default/view.twig index 181e1284..8f3a26c3 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -18,7 +18,9 @@ {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numFlattrs }}
    • {% endif %}{% endif %} {% if constant('CARROT') == 1 %}
  • {% trans "carrot" %}
    • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
    • {% endif %} -
  • EPUB
    • + {% if constant('EPUB') == 1 %}
  • EPUB
    • {% endif %} + {% if constant('MOBI') == 1 %}
  • MOBI
    • {% endif %} + {% if constant('PDF') == 1 %}
  • PDF
    • {% endif %}
  • {% trans "Does this article appear wrong?" %}
    • {% if constant('SHOW_READPERCENT') == 1 %}
  • 0%
    • {% endif %} -- cgit v1.2.3 From a50d7f0f20e7160f1a4dd736c225a9565454a9d5 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 17 Dec 2014 22:55:33 +0100 Subject: link to doc inside wallabag:about --- themes/baggy/about.twig | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'themes') diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig index 7e19a900..110196a6 100755 --- a/themes/baggy/about.twig +++ b/themes/baggy/about.twig @@ -9,7 +9,7 @@
    {% trans "Project website" %}
    -
    http://www.wallabag.org
    +
    https://www.wallabag.org
    {% trans "Main developer" %}
    Nicolas Lœuillet — {% trans "website" %}
    @@ -18,7 +18,7 @@
    {% trans "on Github" %}
    {% trans "Bug reports" %}
    -
    {% trans "On our support website" %} {% trans "or" %} {% trans "on Github" %}
    +
    {% trans "On our support website" %} {% trans "or" %} {% trans "on Github" %}
    {% trans "License" %}
    MIT
    @@ -29,14 +29,24 @@

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    +

    {% trans "Getting help" %}

    + +
    +
    {% trans "Documentation" %}
    +
    Offline documentation and online documentation (up to date)
    + +
    {% trans "Support" %}
    +
    http://support.wallabag.org/
    +
    +

    {% trans "Helping wallabag" %}

    {% trans "wallabag is free and opensource. You can help us:" %}

    -
    {% trans "via Paypal" %}
    +
    {% trans "via Paypal" %}
    -
    {% trans "via Flattr" %}
    +
    {% trans "via Flattr" %}

    {% trans "Credits" %}

    -- cgit v1.2.3