Update plugins that use JINJA_ENTENSIONS to the Pelican 3.7 setting JINJA_ENVIRONMENT
Plugins that were affected: - assets - i18n_subsites - jinja2content
This commit is contained in:
parent
806ae893e7
commit
cc0dd7f2d3
@ -270,7 +270,13 @@ def install_templates_translations(generator):
|
||||
Only if the 'jinja2.ext.i18n' jinja2 extension is enabled
|
||||
the translations for the current DEFAULT_LANG are installed.
|
||||
'''
|
||||
if 'jinja2.ext.i18n' in generator.settings['JINJA_EXTENSIONS']:
|
||||
if 'JINJA_ENVIRONMENT' in generator.settings: # pelican 3.7+
|
||||
jinja_extensions = generator.settings['JINJA_ENVIRONMENT'].get(
|
||||
'extensions', [])
|
||||
else:
|
||||
jinja_extensions = generator.settings['JINJA_EXTENSIONS']
|
||||
|
||||
if 'jinja2.ext.i18n' in jinja_extensions:
|
||||
domain = generator.settings.get('I18N_GETTEXT_DOMAIN', 'messages')
|
||||
localedir = generator.settings.get('I18N_GETTEXT_LOCALEDIR')
|
||||
if localedir is None:
|
||||
|
@ -9,7 +9,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
</head>
|
||||
|
||||
<body id="index" class="home">
|
||||
@ -27,9 +26,9 @@
|
||||
|
||||
</header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-07-14T00:00:00+00:00">
|
||||
<time class="published" datetime="2014-07-14T00:00:00+00:00">
|
||||
Mon 14 July 2014
|
||||
</abbr>
|
||||
</time>
|
||||
<address class="vcard author">
|
||||
By <a class="url fn" href="http://example.com/test/author/the-tester.html">The Tester</a>
|
||||
</address>
|
||||
|
@ -9,7 +9,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
</head>
|
||||
|
||||
<body id="index" class="home">
|
||||
@ -26,9 +25,9 @@
|
||||
|
||||
</header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-07-14T00:00:00+00:00">
|
||||
<time class="published" datetime="2014-07-14T00:00:00+00:00">
|
||||
Mon 14 July 2014
|
||||
</abbr>
|
||||
</time>
|
||||
<address class="vcard author">
|
||||
By <a class="url fn" href="http://example.com/test/cz/author/test-testovic.html">Test Testovič</a>
|
||||
</address>
|
||||
|
@ -1,10 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<feed xmlns="http://www.w3.org/2005/Atom"><title>Testovací stránka</title><link href="http://example.com/test/cz/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/cz/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><updated>2014-09-15T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-15:test/cz/translated-article.html</id><summary type="html"><p>Jednoduchý článek s překlady.
|
||||
<feed xmlns="http://www.w3.org/2005/Atom"><title>Testovací stránka</title><link href="http://example.com/test/cz/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/cz/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><summary type="html"><p>Jednoduchý článek s překlady.
|
||||
Zde je odkaz na <a class="reference external" href="http://example.com/test/cz/../images/img.png">nějaký obrázek</a>.</p>
|
||||
</summary></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/cz/../de/translated-article.html" rel="alternate"></link><updated>2014-09-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-14:test/cz/../de/translated-article.html</id><summary type="html"><p>Ein einfacher Artikel mit einer Übersetzung.
|
||||
</summary><content type="html"><p>Jednoduchý článek s překlady.
|
||||
Zde je odkaz na <a class="reference external" href="http://example.com/test/cz/../images/img.png">nějaký obrázek</a>.</p>
|
||||
</content></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/cz/../de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-14:/test/cz/../de/translated-article.html</id><summary type="html"><p>Ein einfacher Artikel mit einer Übersetzung.
|
||||
Hier ist ein Link zur <a class="reference external" href="http://example.com/test/cz/../images/img.png">einigem Bild</a>.</p>
|
||||
</summary></entry><entry><title>A translated article</title><link href="http://example.com/test/cz/../translated-article.html" rel="alternate"></link><updated>2014-09-13T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-13:test/cz/../translated-article.html</id><summary type="html"><p>A simple article with a translation.
|
||||
</summary><content type="html"><p>Ein einfacher Artikel mit einer Übersetzung.
|
||||
Hier ist ein Link zur <a class="reference external" href="http://example.com/test/cz/../images/img.png">einigem Bild</a>.</p>
|
||||
</content></entry><entry><title>A translated article</title><link href="http://example.com/test/cz/../translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-09-13:/test/cz/../translated-article.html</id><summary type="html"><p>A simple article with a translation.
|
||||
Here is a link to <a class="reference external" href="http://example.com/test/cz/../images/img.png">some image</a>.</p>
|
||||
</summary></entry><entry><title>An untranslated article</title><link href="http://example.com/test/cz/an-untranslated-article-en.html" rel="alternate"></link><updated>2014-07-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-07-14:test/cz/an-untranslated-article-en.html</id><summary type="html"><p>An article without a translation.
|
||||
</summary><content type="html"><p>A simple article with a translation.
|
||||
Here is a link to <a class="reference external" href="http://example.com/test/cz/../images/img.png">some image</a>.</p>
|
||||
</content></entry><entry><title>An untranslated article</title><link href="http://example.com/test/cz/an-untranslated-article-en.html" rel="alternate"></link><published>2014-07-14T00:00:00+00:00</published><updated>2014-07-14T00:00:00+00:00</updated><author><name>Test Testovič</name></author><id>tag:example.com,2014-07-14:/test/cz/an-untranslated-article-en.html</id><summary type="html"><p>An article without a translation.
|
||||
Here is a link to an <a class="reference external" href="http://example.com/test/cz/../pages/untranslated-page.html">untranslated page</a></p>
|
||||
</summary></entry></feed>
|
||||
</summary><content type="html"><p>An article without a translation.
|
||||
Here is a link to an <a class="reference external" href="http://example.com/test/cz/../pages/untranslated-page.html">untranslated page</a></p>
|
||||
</content></entry></feed>
|
@ -21,7 +21,7 @@
|
||||
<li><article class="hentry">
|
||||
<header> <h2 class="entry-title"><a href="http://example.com/test/cz/translated-article.html" rel="bookmark" title="Permalink to Přeložený článek">Přeložený článek</a></h2> </header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-09-15T00:00:00+00:00"> Mon 15 September 2014 </abbr>
|
||||
<time class="published" datetime="2014-09-15T00:00:00+00:00"> Mon 15 September 2014 </time>
|
||||
<address class="vcard author">By
|
||||
<a class="url fn" href="http://example.com/test/cz/author/test-testovic.html">Test Testovič</a>
|
||||
</address>
|
||||
@ -33,7 +33,7 @@ Zde je odkaz na <a class="reference external" href="http://example.com/test/cz/.
|
||||
<li><article class="hentry">
|
||||
<header> <h2 class="entry-title"><a href="http://example.com/test/cz/an-untranslated-article-en.html" rel="bookmark" title="Permalink to An untranslated article">An untranslated article</a></h2> </header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-07-14T00:00:00+00:00"> Mon 14 July 2014 </abbr>
|
||||
<time class="published" datetime="2014-07-14T00:00:00+00:00"> Mon 14 July 2014 </time>
|
||||
<address class="vcard author">By
|
||||
<a class="url fn" href="http://example.com/test/cz/author/test-testovic.html">Test Testovič</a>
|
||||
</address>
|
||||
|
@ -9,7 +9,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
</head>
|
||||
|
||||
<body id="index" class="home">
|
||||
@ -29,9 +28,9 @@
|
||||
|
||||
</header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-09-15T00:00:00+00:00">
|
||||
<time class="published" datetime="2014-09-15T00:00:00+00:00">
|
||||
Mon 15 September 2014
|
||||
</abbr>
|
||||
</time>
|
||||
<address class="vcard author">
|
||||
By <a class="url fn" href="http://example.com/test/cz/author/test-testovic.html">Test Testovič</a>
|
||||
</address>
|
||||
|
@ -9,7 +9,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
</head>
|
||||
|
||||
<body id="index" class="home">
|
||||
@ -26,9 +25,9 @@
|
||||
|
||||
</header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-07-14T00:00:00+00:00">
|
||||
Mo 14 Juli 2014
|
||||
</abbr>
|
||||
<time class="published" datetime="2014-07-14T00:00:00+00:00">
|
||||
Mon 14 July 2014
|
||||
</time>
|
||||
<address class="vcard author">
|
||||
By <a class="url fn" href="http://example.com/test/de/author/der-tester.html">Der Tester</a>
|
||||
</address>
|
||||
|
@ -1,8 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<feed xmlns="http://www.w3.org/2005/Atom"><title>Testseite</title><link href="http://example.com/test/de/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/de/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/de/../cz/translated-article.html" rel="alternate"></link><updated>2014-09-15T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-15:test/de/../cz/translated-article.html</id><summary type="html"><p>Jednoduchý článek s překlady.
|
||||
<feed xmlns="http://www.w3.org/2005/Atom"><title>Testseite</title><link href="http://example.com/test/de/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/de/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/de/../cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-15:/test/de/../cz/translated-article.html</id><summary type="html"><p>Jednoduchý článek s překlady.
|
||||
Zde je odkaz na <a class="reference external" href="http://example.com/test/de/../images/img.png">nějaký obrázek</a>.</p>
|
||||
</summary></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><updated>2014-09-14T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-14:test/de/translated-article.html</id><summary type="html"><p>Ein einfacher Artikel mit einer Übersetzung.
|
||||
</summary><content type="html"><p>Jednoduchý článek s překlady.
|
||||
Zde je odkaz na <a class="reference external" href="http://example.com/test/de/../images/img.png">nějaký obrázek</a>.</p>
|
||||
</content></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><summary type="html"><p>Ein einfacher Artikel mit einer Übersetzung.
|
||||
Hier ist ein Link zur <a class="reference external" href="http://example.com/test/de/../images/img.png">einigem Bild</a>.</p>
|
||||
</summary></entry><entry><title>A translated article</title><link href="http://example.com/test/de/../translated-article.html" rel="alternate"></link><updated>2014-09-13T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-13:test/de/../translated-article.html</id><summary type="html"><p>A simple article with a translation.
|
||||
</summary><content type="html"><p>Ein einfacher Artikel mit einer Übersetzung.
|
||||
Hier ist ein Link zur <a class="reference external" href="http://example.com/test/de/../images/img.png">einigem Bild</a>.</p>
|
||||
</content></entry><entry><title>A translated article</title><link href="http://example.com/test/de/../translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>Der Tester</name></author><id>tag:example.com,2014-09-13:/test/de/../translated-article.html</id><summary type="html"><p>A simple article with a translation.
|
||||
Here is a link to <a class="reference external" href="http://example.com/test/de/../images/img.png">some image</a>.</p>
|
||||
</summary></entry></feed>
|
||||
</summary><content type="html"><p>A simple article with a translation.
|
||||
Here is a link to <a class="reference external" href="http://example.com/test/de/../images/img.png">some image</a>.</p>
|
||||
</content></entry></feed>
|
@ -21,7 +21,7 @@
|
||||
<li><article class="hentry">
|
||||
<header> <h2 class="entry-title"><a href="http://example.com/test/de/translated-article.html" rel="bookmark" title="Permalink to Ein übersetzter Artikel">Ein übersetzter Artikel</a></h2> </header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-09-14T00:00:00+00:00"> So 14 September 2014 </abbr>
|
||||
<time class="published" datetime="2014-09-14T00:00:00+00:00"> Sun 14 September 2014 </time>
|
||||
<address class="vcard author">By
|
||||
<a class="url fn" href="http://example.com/test/de/author/der-tester.html">Der Tester</a>
|
||||
</address>
|
||||
|
@ -9,7 +9,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
</head>
|
||||
|
||||
<body id="index" class="home">
|
||||
@ -29,9 +28,9 @@
|
||||
|
||||
</header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-09-14T00:00:00+00:00">
|
||||
So 14 September 2014
|
||||
</abbr>
|
||||
<time class="published" datetime="2014-09-14T00:00:00+00:00">
|
||||
Sun 14 September 2014
|
||||
</time>
|
||||
<address class="vcard author">
|
||||
By <a class="url fn" href="http://example.com/test/de/author/der-tester.html">Der Tester</a>
|
||||
</address>
|
||||
|
@ -1,10 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<feed xmlns="http://www.w3.org/2005/Atom"><title>Testing site</title><link href="http://example.com/test/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><updated>2014-09-15T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-15:test/cz/translated-article.html</id><summary type="html"><p>Jednoduchý článek s překlady.
|
||||
<feed xmlns="http://www.w3.org/2005/Atom"><title>Testing site</title><link href="http://example.com/test/" rel="alternate"></link><link href="http://example.com/test/feeds_all.atom.xml" rel="self"></link><id>http://example.com/test/</id><updated>2014-09-15T00:00:00+00:00</updated><entry><title>Přeložený článek</title><link href="http://example.com/test/cz/translated-article.html" rel="alternate"></link><published>2014-09-15T00:00:00+00:00</published><updated>2014-09-15T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-15:/test/cz/translated-article.html</id><summary type="html"><p>Jednoduchý článek s překlady.
|
||||
Zde je odkaz na <a class="reference external" href="http://example.com/test/images/img.png">nějaký obrázek</a>.</p>
|
||||
</summary></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><updated>2014-09-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-14:test/de/translated-article.html</id><summary type="html"><p>Ein einfacher Artikel mit einer Übersetzung.
|
||||
</summary><content type="html"><p>Jednoduchý článek s překlady.
|
||||
Zde je odkaz na <a class="reference external" href="http://example.com/test/images/img.png">nějaký obrázek</a>.</p>
|
||||
</content></entry><entry><title>Ein übersetzter Artikel</title><link href="http://example.com/test/de/translated-article.html" rel="alternate"></link><published>2014-09-14T00:00:00+00:00</published><updated>2014-09-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-14:/test/de/translated-article.html</id><summary type="html"><p>Ein einfacher Artikel mit einer Übersetzung.
|
||||
Hier ist ein Link zur <a class="reference external" href="http://example.com/test/images/img.png">einigem Bild</a>.</p>
|
||||
</summary></entry><entry><title>A translated article</title><link href="http://example.com/test/translated-article.html" rel="alternate"></link><updated>2014-09-13T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-13:test/translated-article.html</id><summary type="html"><p>A simple article with a translation.
|
||||
</summary><content type="html"><p>Ein einfacher Artikel mit einer Übersetzung.
|
||||
Hier ist ein Link zur <a class="reference external" href="http://example.com/test/images/img.png">einigem Bild</a>.</p>
|
||||
</content></entry><entry><title>A translated article</title><link href="http://example.com/test/translated-article.html" rel="alternate"></link><published>2014-09-13T00:00:00+00:00</published><updated>2014-09-13T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-09-13:/test/translated-article.html</id><summary type="html"><p>A simple article with a translation.
|
||||
Here is a link to <a class="reference external" href="http://example.com/test/images/img.png">some image</a>.</p>
|
||||
</summary></entry><entry><title>An untranslated article</title><link href="http://example.com/test/an-untranslated-article.html" rel="alternate"></link><updated>2014-07-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-07-14:test/an-untranslated-article.html</id><summary type="html"><p>An article without a translation.
|
||||
</summary><content type="html"><p>A simple article with a translation.
|
||||
Here is a link to <a class="reference external" href="http://example.com/test/images/img.png">some image</a>.</p>
|
||||
</content></entry><entry><title>An untranslated article</title><link href="http://example.com/test/an-untranslated-article.html" rel="alternate"></link><published>2014-07-14T00:00:00+00:00</published><updated>2014-07-14T00:00:00+00:00</updated><author><name>The Tester</name></author><id>tag:example.com,2014-07-14:/test/an-untranslated-article.html</id><summary type="html"><p>An article without a translation.
|
||||
Here is a link to an <a class="reference external" href="http://example.com/test/pages/untranslated-page.html">untranslated page</a></p>
|
||||
</summary></entry></feed>
|
||||
</summary><content type="html"><p>An article without a translation.
|
||||
Here is a link to an <a class="reference external" href="http://example.com/test/pages/untranslated-page.html">untranslated page</a></p>
|
||||
</content></entry></feed>
|
@ -22,7 +22,7 @@
|
||||
<li><article class="hentry">
|
||||
<header> <h2 class="entry-title"><a href="http://example.com/test/translated-article.html" rel="bookmark" title="Permalink to A translated article">A translated article</a></h2> </header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-09-13T00:00:00+00:00"> Sat 13 September 2014 </abbr>
|
||||
<time class="published" datetime="2014-09-13T00:00:00+00:00"> Sat 13 September 2014 </time>
|
||||
<address class="vcard author">By
|
||||
<a class="url fn" href="http://example.com/test/author/the-tester.html">The Tester</a>
|
||||
</address>
|
||||
@ -34,7 +34,7 @@ Here is a link to <a class="reference external" href="http://example.com/test/im
|
||||
<li><article class="hentry">
|
||||
<header> <h2 class="entry-title"><a href="http://example.com/test/an-untranslated-article.html" rel="bookmark" title="Permalink to An untranslated article">An untranslated article</a></h2> </header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-07-14T00:00:00+00:00"> Mon 14 July 2014 </abbr>
|
||||
<time class="published" datetime="2014-07-14T00:00:00+00:00"> Mon 14 July 2014 </time>
|
||||
<address class="vcard author">By
|
||||
<a class="url fn" href="http://example.com/test/author/the-tester.html">The Tester</a>
|
||||
</address>
|
||||
|
@ -9,7 +9,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
</head>
|
||||
|
||||
<body id="index" class="home">
|
||||
@ -30,9 +29,9 @@
|
||||
|
||||
</header>
|
||||
<footer class="post-info">
|
||||
<abbr class="published" title="2014-09-13T00:00:00+00:00">
|
||||
<time class="published" datetime="2014-09-13T00:00:00+00:00">
|
||||
Sat 13 September 2014
|
||||
</abbr>
|
||||
</time>
|
||||
<address class="vcard author">
|
||||
By <a class="url fn" href="http://example.com/test/author/the-tester.html">The Tester</a>
|
||||
</address>
|
||||
|
@ -32,7 +32,7 @@ PLUGIN_PATHS = ['../../']
|
||||
PLUGINS = ['i18n_subsites']
|
||||
|
||||
THEME = 'localized_theme'
|
||||
JINJA_EXTENSIONS = ['jinja2.ext.i18n']
|
||||
JINJA_ENVIRONMENT = {'extensions': ['jinja2.ext.i18n']}
|
||||
|
||||
from blinker import signal
|
||||
tmpsig = signal('tmpsig')
|
||||
|
Loading…
x
Reference in New Issue
Block a user