From 5497850c517bcb0c08652c7a90feab34efc8d022 Mon Sep 17 00:00:00 2001 From: Marcel Huth Date: Wed, 10 Aug 2016 19:28:32 +0200 Subject: [PATCH] Reworked to newstyle gettext and named vars --- babel.cfg | 1 + templates/archives.html | 4 +- templates/article.html | 12 +++- templates/author.html | 2 +- templates/authors.html | 4 +- templates/categories.html | 4 +- templates/category.html | 2 +- templates/index.html | 12 ++-- templates/partial/disqus.html | 8 ++- templates/partial/flex.html | 7 ++- templates/partial/pagination.html | 4 +- templates/tag.html | 2 +- templates/tags.html | 4 +- translations/de/LC_MESSAGES/messages.po | 77 +++++++++++++------------ 14 files changed, 83 insertions(+), 60 deletions(-) diff --git a/babel.cfg b/babel.cfg index 2274808..cbbbc92 100644 --- a/babel.cfg +++ b/babel.cfg @@ -1 +1,2 @@ [jinja2: templates/**.html] +extensions=jinja2.ext.autoescape,jinja2.ext.with_ diff --git a/templates/archives.html b/templates/archives.html index d1a4fc0..c92ba57 100644 --- a/templates/archives.html +++ b/templates/archives.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %} – {% trans %}Archives{% endtrans %}{% endblock %} +{% block title %} – {{ _('Archives') }}{% endblock %} {% block content %}
-

{% trans %}Archives{% endtrans %}

+

{{ _('Archives') }}

diff --git a/templates/article.html b/templates/article.html index a3c3a0f..4896ca5 100644 --- a/templates/article.html +++ b/templates/article.html @@ -13,7 +13,13 @@

{{ article.title }}

-

{% trans %}Posted on{% endtrans %} {{ article.locale_date }} {% trans %}in{% endtrans %} {{ article.category }}

+

+ {% autoescape false %} + {{ _('Posted on %(when)s in %(category)s', + when=article.locale_date, + category='%s' % (SITEURL, article.category.url, article.category)) }} + {% endautoescape %} +

{{ article.content }} @@ -29,14 +35,14 @@
{% if ADD_THIS_ID %} {% endif %} {% if article.related_posts %}
-

{% trans %}Related posts{% endtrans %}:

+

{{ _('Related posts') }}:

    {% for related_post in article.related_posts %}
  • {{ related_post.title }}
    • diff --git a/templates/author.html b/templates/author.html index 3e2d0e9..8de5722 100644 --- a/templates/author.html +++ b/templates/author.html @@ -1,3 +1,3 @@ {% extends "index.html" %} -{% block title %} – {% trans %}Posts by{% endtrans %}: {{ author }}{% endblock %} +{% block title %} – {{ _('Posts by %(name)s', name=author) }}:{% endblock %} {% set summarise = True %} diff --git a/templates/authors.html b/templates/authors.html index b30a7bc..96f2edc 100644 --- a/templates/authors.html +++ b/templates/authors.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %} – {% trans %}Authors{% endtrans %}{% endblock %} +{% block title %} – {{ _('Authors') }}{% endblock %} {% block content %}
    -

    {% trans %}Authors{% endtrans %}

    +

    {{ _('Authors') }}

      diff --git a/templates/categories.html b/templates/categories.html index 0898b1f..aa1c44b 100644 --- a/templates/categories.html +++ b/templates/categories.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %} – {% trans %}Categories{% endtrans %}{% endblock %} +{% block title %} – {{ _('Categories') }}{% endblock %} {% block content %}
      -

      {% trans %}Categories{% endtrans %}

      +

      {{ _('Categories') }}

        diff --git a/templates/category.html b/templates/category.html index 4cbd632..dbeee84 100644 --- a/templates/category.html +++ b/templates/category.html @@ -1,3 +1,3 @@ {% extends "index.html" %} -{% block title %} – {% trans %}Category{% endtrans %}: {{ category }}{% endblock %} +{% block title %} – {{ _('Category: %(name)s', name=category) }}{% endblock %} {% set summarise = True %} diff --git a/templates/index.html b/templates/index.html index 70e353d..14cc071 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,22 +6,26 @@

        {{ article.title }}

        - {% trans %}Posted on{% endtrans %} {{ article.locale_date }} {% trans %}in{% endtrans %} {{ article.category }} + {% autoescape false %} + {{ _('Posted on %(when)s in %(category)s', + when=article.locale_date, + category='%s' % (SITEURL, article.category.url, article.category)) }} + {% endautoescape %} {% if article.tags %} - • {% trans %}Tagged with{% endtrans %} + • {{ ngettext('Tag', 'Tags', article.tags|count) }}: {% for tag in article.tags %} {{ tag }}{% if not loop.last %},{% endif %} {% endfor %} {% endif %} {% if DISQUS_SITENAME %} - • {% trans %}Leave a comment{% endtrans %} + • {{ _('Leave a comment') }} {% endif %}

        {% if summarise or article.metadata['summary'] or SUMMARY_MAX_LENGTH %} {{ article.summary }} - {% trans %}Continue reading{% endtrans %} + {{ _('Continue reading') }} {% else %} {{ article.content }} {% endif %} diff --git a/templates/partial/disqus.html b/templates/partial/disqus.html index 878edab..45c1420 100644 --- a/templates/partial/disqus.html +++ b/templates/partial/disqus.html @@ -8,5 +8,11 @@ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); })(); - + {% endif %} diff --git a/templates/partial/flex.html b/templates/partial/flex.html index c89880b..23369a1 100644 --- a/templates/partial/flex.html +++ b/templates/partial/flex.html @@ -1 +1,6 @@ -

        {% trans %}Built using{% endtrans %} Pelican - Flex {% trans %}theme by{% endtrans %} Alexandre Vicenzi

        +{% autoescape false %} +

        {{ _('Build using %(pelican)s - %(flex)s theme by %(alexandrevicenzi)s', + pelican='Pelican', + flex='Flex', + alexandrevicenzi='Alexandre Vicenzi') }}

        +{% endautoescape %} diff --git a/templates/partial/pagination.html b/templates/partial/pagination.html index 7d95f2f..4f7857f 100644 --- a/templates/partial/pagination.html +++ b/templates/partial/pagination.html @@ -2,12 +2,12 @@ diff --git a/templates/tag.html b/templates/tag.html index 2dfaa00..0641902 100644 --- a/templates/tag.html +++ b/templates/tag.html @@ -1,3 +1,3 @@ {% extends "index.html" %} -{% block title %} – {% trans %}Tag{% endtrans %}: {{ tag }}{% endblock %} +{% block title %} – {{ _('Tag: %(name)s', name=tag) }}{% endblock %} {% set summarise = True %} diff --git a/templates/tags.html b/templates/tags.html index 50ad46f..99bd5d7 100644 --- a/templates/tags.html +++ b/templates/tags.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %} – {% trans %}Tags{% endtrans %}{% endblock %} +{% block title %} – {{ _('Tags') }}{% endblock %} {% block content %}
        -

        {% trans %}Tags{% endtrans %}

        +

        {{ _('Tags') }}

          diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po index fab1824..7403188 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -1,13 +1,14 @@ # German translations for pelican Flex theme by Alexandre Vicenzi. # Copyright (C) 2016 Marcel Huth -# This file is distributed under the same license as the Flex theme by Alexandre Vicenzi project. +# This file is distributed under the same license as the Flex theme by +# Alexandre Vicenzi project. # Marcel Huth , 2016. # msgid "" msgstr "" -"Project-Id-Version: 1.0\n" +"Project-Id-Version: 1.1\n" "Report-Msgid-Bugs-To: marcelhuth@users.noreply.github.com\n" -"POT-Creation-Date: 2016-07-30 13:55+0200\n" +"POT-Creation-Date: 2016-08-10 18:20+0200\n" "PO-Revision-Date: 2016-07-30 13:56+0200\n" "Last-Translator: Marcel Huth \n" "Language: de\n" @@ -22,25 +23,23 @@ msgstr "" msgid "Archives" msgstr "Archive" -#: templates/article.html:16 templates/index.html:9 -msgid "Posted on" -msgstr "Online seit" +#: templates/article.html:18 templates/index.html:10 +#, python-format +msgid "Posted on %(when)s in %(category)s" +msgstr "Online seit %(when)s in %(category)s" -#: templates/article.html:16 templates/index.html:9 -msgid "in" -msgstr "in" - -#: templates/article.html:32 +#: templates/article.html:38 msgid "Like this article? Share it with your friends!" msgstr "Gefällt dir der Artikel? Dann teile ihn mit Freunden!" -#: templates/article.html:39 +#: templates/article.html:45 msgid "Related posts" msgstr "Ähnliche Artikel" #: templates/author.html:2 -msgid "Posts by" -msgstr "Geschrieben von" +#, python-format +msgid "Posts by %(name)s" +msgstr "Artikel von %(name)s" #: templates/authors.html:2 templates/authors.html:7 msgid "Authors" @@ -51,44 +50,46 @@ msgid "Categories" msgstr "Kategorien" #: templates/category.html:2 -msgid "Category" -msgstr "Kategorie" +#, python-format +msgid "Category: %(name)s" +msgstr "Kategorie: %(name)s" -#: templates/index.html:11 -msgid "Tagged with" -msgstr "Stichwörter" +#: templates/index.html:15 +msgid "Tag" +msgid_plural "Tags" +msgstr[0] "Stichwort" +msgstr[1] "Stichwörter" -#: templates/index.html:17 +#: templates/index.html:21 msgid "Leave a comment" -msgstr "Schreib einen Kommentar" +msgstr "Hinterlasse ein Kommentar" -#: templates/index.html:24 +#: templates/index.html:28 msgid "Continue reading" msgstr "Weiterlesen" #: templates/tag.html:2 -msgid "Tag" -msgstr "Stichwört" +#, python-format +msgid "Tag: %(name)s" +msgstr "Stichwort: %(name)s" #: templates/tags.html:2 templates/tags.html:7 msgid "Tags" msgstr "Stichwörter" -#: templates/partial/disqus.html:11 -msgid "Please enable JavaScript to view the" -msgstr "Bitte aktiviere JavaScript um die" +#: templates/partial/disqus.html:13 +#, python-format +msgid "" +"Please enable JavaScript to view the %(link)scomments powered by " +"Disqus%(endlink)s" +msgstr "" +"Bitte JavaScript aktivieren um die %(link)sKommentare von " +"Disqus%(endlink)s zu lesen" -#: templates/partial/disqus.html:11 -msgid "comments powered by Disqus" -msgstr "Kommentare von Disqus anzuzeigen" - -#: templates/partial/flex.html:1 -msgid "Built using" -msgstr "Erstellt mit" - -#: templates/partial/flex.html:1 -msgid "theme by" -msgstr "Theme von" +#: templates/partial/flex.html:2 +#, python-format +msgid "Build using %(pelican)s - %(flex)s theme by %(alexandrevicenzi)s" +msgstr "Erstellt mit %(pelican)s - %(flex)s Design von %(alexandrevicenzi)s" #: templates/partial/pagination.html:5 msgid "Older Posts"