From 8bb419259833277736816c241ed83e3c66327647 Mon Sep 17 00:00:00 2001 From: Marcel Huth Date: Sat, 30 Jul 2016 14:29:25 +0200 Subject: [PATCH 1/5] Added localization support for the theme --- babel.cfg | 1 + 1 file changed, 1 insertion(+) create mode 100644 babel.cfg diff --git a/babel.cfg b/babel.cfg new file mode 100644 index 0000000..2274808 --- /dev/null +++ b/babel.cfg @@ -0,0 +1 @@ +[jinja2: templates/**.html] From bda626352cb87cca86c8c32aaadbc4104ccddcdf Mon Sep 17 00:00:00 2001 From: Marcel Huth Date: Sat, 30 Jul 2016 14:34:54 +0200 Subject: [PATCH 2/5] Added the template files for localization --- templates/archives.html | 4 ++-- templates/article.html | 6 +++--- templates/author.html | 2 +- templates/authors.html | 4 ++-- templates/categories.html | 4 ++-- templates/category.html | 2 +- templates/index.html | 8 ++++---- templates/partial/disqus.html | 2 +- templates/partial/flex.html | 2 +- templates/partial/pagination.html | 4 ++-- templates/tag.html | 2 +- templates/tags.html | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/archives.html b/templates/archives.html index f7fc626..d1a4fc0 100644 --- a/templates/archives.html +++ b/templates/archives.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %} – Archives{% endblock %} +{% block title %} – {% trans %}Archives{% endtrans %}{% endblock %} {% block content %}
-

Archives

+

{% trans %}Archives{% endtrans %}

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

{{ article.title }}

-

Posted on {{ article.locale_date }} in {{ article.category }}

+

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

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

Related posts:

+

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

    {% for related_post in article.related_posts %}
  • {{ related_post.title }}
    • diff --git a/templates/author.html b/templates/author.html index d085831..3e2d0e9 100644 --- a/templates/author.html +++ b/templates/author.html @@ -1,3 +1,3 @@ {% extends "index.html" %} -{% block title %} – Posts by: {{ author }}{% endblock %} +{% block title %} – {% trans %}Posts by{% endtrans %}: {{ author }}{% endblock %} {% set summarise = True %} diff --git a/templates/authors.html b/templates/authors.html index 9e44872..b30a7bc 100644 --- a/templates/authors.html +++ b/templates/authors.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %} – Authors{% endblock %} +{% block title %} – {% trans %}Authors{% endtrans %}{% endblock %} {% block content %}
    -

    Authors

    +

    {% trans %}Authors{% endtrans %}

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

      Categories

      +

      {% trans %}Categories{% endtrans %}

        diff --git a/templates/category.html b/templates/category.html index 2828d49..4cbd632 100644 --- a/templates/category.html +++ b/templates/category.html @@ -1,3 +1,3 @@ {% extends "index.html" %} -{% block title %} – Category: {{ category }}{% endblock %} +{% block title %} – {% trans %}Category{% endtrans %}: {{ category }}{% endblock %} {% set summarise = True %} diff --git a/templates/index.html b/templates/index.html index 4abeb24..70e353d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,22 +6,22 @@

        {{ article.title }}

        - Posted on {{ article.locale_date }} in {{ article.category }} + {% trans %}Posted on{% endtrans %} {{ article.locale_date }} {% trans %}in{% endtrans %} {{ article.category }} {% if article.tags %} - • Tagged with + • {% trans %}Tagged with{% endtrans %} {% for tag in article.tags %} {{ tag }}{% if not loop.last %},{% endif %} {% endfor %} {% endif %} {% if DISQUS_SITENAME %} - • Leave a comment + • {% trans %}Leave a comment{% endtrans %} {% endif %}

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

        Built using Pelican - Flex theme by Alexandre Vicenzi

        +

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

        diff --git a/templates/partial/pagination.html b/templates/partial/pagination.html index cc097d5..7d95f2f 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 b95fbd0..2dfaa00 100644 --- a/templates/tag.html +++ b/templates/tag.html @@ -1,3 +1,3 @@ {% extends "index.html" %} -{% block title %} – Tag: {{ tag }}{% endblock %} +{% block title %} – {% trans %}Tag{% endtrans %}: {{ tag }}{% endblock %} {% set summarise = True %} diff --git a/templates/tags.html b/templates/tags.html index 22bb0ac..50ad46f 100644 --- a/templates/tags.html +++ b/templates/tags.html @@ -1,10 +1,10 @@ {% extends "base.html" %} -{% block title %} – Tags{% endblock %} +{% block title %} – {% trans %}Tags{% endtrans %}{% endblock %} {% block content %}
        -

        Tags

        +

        {% trans %}Tags{% endtrans %}

          From 3651eddec14eb049a8f4f1b43ac1a5337716b932 Mon Sep 17 00:00:00 2001 From: Marcel Huth Date: Sat, 30 Jul 2016 14:37:21 +0200 Subject: [PATCH 3/5] Added translation for German language --- translations/de/LC_MESSAGES/messages.po | 99 +++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 translations/de/LC_MESSAGES/messages.po diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po new file mode 100644 index 0000000..fab1824 --- /dev/null +++ b/translations/de/LC_MESSAGES/messages.po @@ -0,0 +1,99 @@ +# 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. +# Marcel Huth , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: 1.0\n" +"Report-Msgid-Bugs-To: marcelhuth@users.noreply.github.com\n" +"POT-Creation-Date: 2016-07-30 13:55+0200\n" +"PO-Revision-Date: 2016-07-30 13:56+0200\n" +"Last-Translator: Marcel Huth \n" +"Language: de\n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.1.1\n" + +#: templates/archives.html:2 templates/archives.html:7 +msgid "Archives" +msgstr "Archive" + +#: templates/article.html:16 templates/index.html:9 +msgid "Posted on" +msgstr "Online seit" + +#: templates/article.html:16 templates/index.html:9 +msgid "in" +msgstr "in" + +#: templates/article.html:32 +msgid "Like this article? Share it with your friends!" +msgstr "Gefällt dir der Artikel? Dann teile ihn mit Freunden!" + +#: templates/article.html:39 +msgid "Related posts" +msgstr "Ähnliche Artikel" + +#: templates/author.html:2 +msgid "Posts by" +msgstr "Geschrieben von" + +#: templates/authors.html:2 templates/authors.html:7 +msgid "Authors" +msgstr "Autoren" + +#: templates/categories.html:2 templates/categories.html:7 +msgid "Categories" +msgstr "Kategorien" + +#: templates/category.html:2 +msgid "Category" +msgstr "Kategorie" + +#: templates/index.html:11 +msgid "Tagged with" +msgstr "Stichwörter" + +#: templates/index.html:17 +msgid "Leave a comment" +msgstr "Schreib einen Kommentar" + +#: templates/index.html:24 +msgid "Continue reading" +msgstr "Weiterlesen" + +#: templates/tag.html:2 +msgid "Tag" +msgstr "Stichwört" + +#: 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: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/pagination.html:5 +msgid "Older Posts" +msgstr "Ältere Artikel" + +#: templates/partial/pagination.html:10 +msgid "Newer Posts" +msgstr "Neuere Artikel" From c6da147d3ee238ac9e8d12c669cfb5ae15f98b00 Mon Sep 17 00:00:00 2001 From: Marcel Huth Date: Sun, 31 Jul 2016 17:59:31 +0200 Subject: [PATCH 4/5] Tests include i18n enhancement now --- .travis.yml | 4 +++- tests/pelicanconf.py | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 89d08e2..863327a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ python: - "3.4" install: - pip install pelican markdown +before_script: + - git clone https://github.com/getpelican/pelican-plugins plugins script: pelican -s tests/pelicanconf.py notifications: - email: false \ No newline at end of file + email: false diff --git a/tests/pelicanconf.py b/tests/pelicanconf.py index c20b871..f98420b 100644 --- a/tests/pelicanconf.py +++ b/tests/pelicanconf.py @@ -3,6 +3,11 @@ from __future__ import unicode_literals +PLUGIN_PATHS = ['plugins'] +PLUGINS = ['i18n_subsites'] + +JINJA_EXTENSIONS = ['jinja2.ext.i18n'] + AUTHOR = u'Test' SITEURL = u'http://localhost:8000' SITENAME = u"Test Blog" From 36d06accb09db7704739767591fa717d730c1e7d Mon Sep 17 00:00:00 2001 From: Marcel Huth Date: Sun, 31 Jul 2016 18:14:57 +0200 Subject: [PATCH 5/5] Fixed problem with plugins folder during testing --- tests/pelicanconf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pelicanconf.py b/tests/pelicanconf.py index f98420b..070e8cc 100644 --- a/tests/pelicanconf.py +++ b/tests/pelicanconf.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals -PLUGIN_PATHS = ['plugins'] +PLUGIN_PATHS = ['../plugins'] PLUGINS = ['i18n_subsites'] JINJA_EXTENSIONS = ['jinja2.ext.i18n']