diff options
author | Florian Dold <florian.dold@gmail.com> | 2017-01-30 21:33:46 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2017-01-30 21:33:46 +0100 |
commit | d5f793bcd9f47392ee6e61c27f65fa85cbcc5176 (patch) | |
tree | 9b5d35c3b161f568928e3426360d09c1c11aa218 | |
parent | 6337e02d9dd8c7be92ffa168f67ab0de651664d0 (diff) | |
download | www-d5f793bcd9f47392ee6e61c27f65fa85cbcc5176.tar.gz www-d5f793bcd9f47392ee6e61c27f65fa85cbcc5176.tar.bz2 www-d5f793bcd9f47392ee6e61c27f65fa85cbcc5176.zip |
remove more ssi
-rw-r--r-- | about.html.j2 | 26 | ||||
-rw-r--r-- | citizens.html.j2 | 8 | ||||
-rw-r--r-- | common/footer.inc.j2 | 7 | ||||
-rw-r--r-- | common/header.j2.inc | 12 | ||||
-rw-r--r-- | common/navigation.j2.inc | 22 | ||||
-rw-r--r-- | developers.html.j2 | 6 | ||||
-rw-r--r-- | financial-news.html.j2 | 6 | ||||
-rw-r--r-- | governments.html.j2 | 6 | ||||
-rw-r--r-- | index.html.j2 | 2 | ||||
-rw-r--r-- | investors.html.j2 | 6 | ||||
-rw-r--r-- | locale/de/LC_MESSAGES/messages.po | 25 | ||||
-rw-r--r-- | locale/en/LC_MESSAGES/messages.po | 25 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/messages.po | 25 | ||||
-rw-r--r-- | locale/fr/LC_MESSAGES/messages.po | 25 | ||||
-rw-r--r-- | locale/it/LC_MESSAGES/messages.po | 25 | ||||
-rw-r--r-- | merchants.html.j2 | 6 | ||||
-rw-r--r-- | news.html.j2 | 6 | ||||
-rwxr-xr-x | template.py | 15 | ||||
-rwxr-xr-x | template.sh | 2 | ||||
-rw-r--r-- | wallet.html.j2 | 6 |
20 files changed, 134 insertions, 127 deletions
diff --git a/about.html.j2 b/about.html.j2 index 846046ff..7159fcaf 100644 --- a/about.html.j2 +++ b/about.html.j2 @@ -4,11 +4,11 @@ <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }} - {{ _("About us") }}</title> <meta name="description" content=""/> - <!--# include file="common/header.{{ _("en") }}.inc" --> + {% include "common/header.j2.inc" %} </head> <body> <div class="container"> - <!--# include file="common/navigation.{{ _("en") }}.inc" --> + {% include "common/navigation.j2.inc" %} <!-- Jumbotron --> <div class="jumbotron"> <h1>{{ _("About us") }}</h1> @@ -18,58 +18,58 @@ <div class="row"> <div class="col-lg-4"> <h2><a href="http://grothoff.org/christian/">Dr. Christian Grothoff</a></h2> - <img src="/team-images/christian-grothoff.jpg" height="240" alt="Christian Grothoff" align="middle"> + <img src="{{ url('team-images/christian-grothoff.jpg') }}" height="240" alt="Christian Grothoff" align="middle"> <p>{{ _("GNU maintainer. Network security & privacy researcher. Software architect.") }}</p> </div> <div class="col-lg-4"> <h2><a href="http://www.digitalekho.com/about-us/index.html">Leon Schumacher</a></h2> - <img src="/team-images/leon-schumacher.jpg" height="240" alt="Leon Schumacher" align="middle"> + <img src="{{ url('team-images/leon-schumacher.jpg') }}" height="240" alt="Leon Schumacher" align="middle"> <p>{{ _("Entrepreneur, Investor, Fortune 100 CIO, IT company director in different industries, ….") }}</p> </div> <div class="col-lg-4"> <h2>Robert Goldmann</h2> - <img src="/team-images/robert-goldmann.jpg" height="240" alt="Robert Goldmann" align="middle"> + <img src="{{ url('team-images/robert-goldmann.jpg') }}" height="240" alt="Robert Goldmann" align="middle"> <p>{{ _("CFO") }}</p> </div> </div> <div class="row"> <div class="col-lg-4"> <h2>Dr. Jeffrey Burdges</h2> - <img src="/team-images/jeff-burdges.jpg" height="240" alt="Jeffrey Burdges" align="middle"> + <img src="{{ url('team-images/jeff-burdges.jpg') }}" height="240" alt="Jeffrey Burdges" align="middle"> <p>{{ _("Applied cryptography. Contact to W3c & Tor.") }}</p> </div> <div class="col-lg-4"> <h2><a href="http://www.onete.net/">Dr. Cristina Onete</a></h2> - <img src="/team-images/cristina-onete.jpg" height="240" alt="Cristina Onete" align="middle"> + <img src="{{ url('team-images/cristina-onete.jpg') }}" height="240" alt="Cristina Onete" align="middle"> <p>{{ _("Theoretical foundations.") }}</p> </div> <div class="col-lg-4"> <h2><a href="https://www.stallman.org/">Dr. Richard M. Stallman</a></h2> - <img src="/team-images/richard-stallman.jpg" height="240" alt="Richard Stallman" align="middle"> + <img src="{{ url('team-images/richard-stallman.jpg') }}" height="240" alt="Richard Stallman" align="middle"> <p>{{ _("Founder of the GNU project. Ethical guidance and licensing.") }}</p> </div> </div> <div class="row"> <div class="col-lg-4"> <h2><a href="http://sreeharsha.totakura.in/">Sree Harsha Totakura</a></h2> - <img src="/team-images/sree-harsha-totakura.jpg" height="240" alt="Sree Harsha Totakura" align="middle"> + <img src="{{ url('team-images/sree-harsha-totakura.jpg') }}" height="240" alt="Sree Harsha Totakura" align="middle"> <p>{{ _("PhD Student, TU Munich. Currently teaching.") }}</p> </div> <div class="col-lg-4"> <h2><a href="https://fdold.eu">Florian Dold</a></h2> - <img src="/team-images/florian-dold.jpg" height="240" alt="Florian Dold" align="middle"> + <img src="{{ url('team-images/florian-dold.jpg') }}" height="240" alt="Florian Dold" align="middle"> <p>{{ _("PhD Student, Inria..") }}</p> </div> <div class="col-lg-4"> <h2>Marcello Stanisci</h2> - <img src="/team-images/marcello-stanisci.jpg" height="240" alt="Marcello Stanisci" align="middle"> + <img src="{{ url('team-images/marcello-stanisci.jpg') }}" height="240" alt="Marcello Stanisci" align="middle"> <p>{{ _("Software engineer.") }}</p> </div> </div> <div class="row"> <div class="col-lg-4"> <h2>Dr. Nana Karlstetter</h2> - <img src="/team-images/nana-karlstetter.jpg" height="240" alt="Nana Karlstetter" align="middle"> + <img src="{{ url('team-images/nana-karlstetter.jpg') }}" height="240" alt="Nana Karlstetter" align="middle"> <p>{{ _("Sustainable business development.") }}</p> </div> <div class="col-lg-4"> @@ -115,7 +115,7 @@ <p>{{ _("Software engineer. Works on Android wallet.") }}</p> </div> </div> - <!--# include file="common/footer.{{ _("en") }}.inc" --> + {% include "common/footer.j2.inc" %} </div> <!-- /container --> </body> </html> diff --git a/citizens.html.j2 b/citizens.html.j2 index 0f708f8b..0f5964b7 100644 --- a/citizens.html.j2 +++ b/citizens.html.j2 @@ -4,11 +4,11 @@ <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }} - {{ _("Citizens") }}</title> <meta name="description" content=""/> - <!--# include file="common/header.{{ _("en") }}.inc" --> + {% include "common/header.j2.inc" %} </head> <body> <div class="container"> - <!--# include file="common/navigation.{{ _("en") }}.inc" --> + {% include "common/navigation.j2.inc" %} <!-- Jumbotron --> <div class="jumbotron"> <h1>{{ _("Advantages for citizens") }}</h1> @@ -65,7 +65,7 @@ ") }}</p> <p> </p> - <img src="/images/customer.svg" alt="customer perspective" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> + <img src="{{ url('images/customer.svg') }}" alt="customer perspective" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> <ol> <li>{{ _("The customer selects an exchange (i.e. by visiting the respective website or selecting from a list of exchanges in the @@ -98,7 +98,7 @@ </ol> <p></p> </div> - <!--# include file="common/footer.{{ _("en") }}.inc" --> + {% include "common/footer.j2.inc" %} </div> <!-- /container --> </body> </html> diff --git a/common/footer.inc.j2 b/common/footer.inc.j2 deleted file mode 100644 index 6320e0d6..00000000 --- a/common/footer.inc.j2 +++ /dev/null @@ -1,7 +0,0 @@ - <div class="footer"> - <p>© <a href="https://gnunet.org/ev">GNUnet e.V.</a> and Inria 2015, 2016</p> - <p>{{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p> - </div> - <script type="text/javascript">//<![CDATA[ - activate_menu(); - //]]></script> diff --git a/common/header.j2.inc b/common/header.j2.inc index b71482d9..3087d23e 100644 --- a/common/header.j2.inc +++ b/common/header.j2.inc @@ -30,14 +30,14 @@ <!-- <link rel="icon" href="../../favicon.ico"> --> <!-- Bootstrap core CSS --> - <link href="/dist/css/bootstrap.min.css" rel="stylesheet"> + <link href="{{ url('dist/css/bootstrap.min.css') }}" rel="stylesheet"> <!-- Custom styles for this template --> - <link href="/justified-nav.css" rel="stylesheet"> - <link href="/styles.css" rel="stylesheet"> + <link href="{{ url('justified-nav.css') }}" rel="stylesheet"> + <link href="{{ url('styles.css') }}" rel="stylesheet"> - <script src="/menu.js"></script> - <script src="/dist/js/jquery-1.11.1.min.js"></script> - <script src="/dist/js/bootstrap.min.js"></script> + <script src="{{ url('menu.js') }}"></script> + <script src="{{ url('dist/js/jquery-1.11.1.min.js') }}"></script> + <script src="{{ url('dist/js/bootstrap.min.js') }}"></script> <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc index 90c328a5..fdf5ab56 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc @@ -11,21 +11,21 @@ <ul class="nav nav-justified"> <li class="m_index"><a href=".">{{ _("Home") }}</a></li> <li class="m_demo btn btn-outline-success"><a href="https://demo.taler.net/" target="_blank">{{ _("Demo") }}</a></li> - <li class="m_citizens"><a href='citizens'>{{ _("Citizens") }}</a></li> - <li class="m_merchants"><a href='merchants'>{{ _("Merchants") }}</a></li> - <li class="m_governments"><a href='governments'>{{ _("Governments") }}</a></li> - <li class="m_investors"><a href='investors'>{{ _("Operators") }}</a></li> - <li class="m_developers"><a href='developers'>{{ _("Developers") }}</a></li> - <li class="m_about"><a href='about'>{{ _("About us") }}</a></li> + <li class="m_citizens"><a href="{{ url_localized('citizens.html') }}">{{ _("Citizens") }}</a></li> + <li class="m_merchants"><a href="{{ url_localized('merchants.html') }}">{{ _("Merchants") }}</a></li> + <li class="m_governments"><a href="{{ url_localized('governments.html') }}">{{ _("Governments") }}</a></li> + <li class="m_investors"><a href="{{ url_localized('operators.html') }}">{{ _("Operators") }}</a></li> + <li class="m_developers"><a href="{{ url_localized('developers.html') }}">{{ _("Developers") }}</a></li> + <li class="m_about"><a href="{{ url_localized('about.html') }}">{{ _("About us") }}</a></li> </ul> </div> </div> <div class="navbar navbar-default navbar-fixed-bottom" role="navigation"> <div class="container lang-slector"> - <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/en')"><img src="/images/gb.png" height="15" width="23" alt="English"></a> - <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/de')"><img src="/images/de.png" height="15" width="25" alt="Deutsch"></a> - <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/fr')"><img src="/images/fr.png" height="15" width="22" alt="Français"></a> - <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/it')"><img src="/images/it.png" height="15" width="22" alt="Italiano"></a> - <a href="#" onclick="location.pathname=location.pathname.replace(/^.../, '/es')"><img src="/images/es.png" height="15" width="23" alt="Español"></a> + <a href="{{ self_localized('en') }}"><img src="{{ url('images/gb.png') }}" height="15" width="23" alt="English"></a> + <a href="{{ self_localized('de') }}"><img src="{{ url('images/de.png') }}" height="15" width="25" alt="Deutsch"></a> + <a href="{{ self_localized('fr') }}"><img src="{{ url('images/fr.png') }}" height="15" width="22" alt="Français"></a> + <a href="{{ self_localized('it') }}"><img src="{{ url('images/it.png') }}" height="15" width="22" alt="Italiano"></a> + <a href="{{ self_localized('es') }}"><img src="{{ url('images/es.png') }}" height="15" width="23" alt="Español"></a> </div> </div> diff --git a/developers.html.j2 b/developers.html.j2 index 899a500c..bc7fb327 100644 --- a/developers.html.j2 +++ b/developers.html.j2 @@ -4,11 +4,11 @@ <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }} - {{ _("Developers") }}</title> <meta name="description" content=""/> - <!--# include file="common/header.{{ _("en") }}.inc" --> + {% include "common/header.j2.inc" %} </head> <body> <div class="container"> - <!--# include file="common/navigation.{{ _("en") }}.inc" --> + {% include "common/navigation.j2.inc" %} <!-- Jumbotron --> <div class="jumbotron"> <h1>{{ _("Taler for developers") }}</h1> @@ -213,7 +213,7 @@ </ol> <p></p> </div> - <!--# include file="common/footer.{{ _("en") }}.inc" --> + {% include "common/footer.j2.inc" %}:w </div> <!-- /container --> </body> </html> diff --git a/financial-news.html.j2 b/financial-news.html.j2 index e424db87..878b1d9d 100644 --- a/financial-news.html.j2 +++ b/financial-news.html.j2 @@ -4,11 +4,11 @@ <meta charset="utf-8"> <title>{{ _("GNU Taler") }} - {{ _("Financial News") }}</title> <meta name="description" content=""> - <!--# include file="common/header.{{ _("en") }}.inc" --> + {% include "common/header.j2.inc" %} </head> <body> <div class="container"> - <!--# include file="common/navigation.{{ _("en") }}.inc" --> + {% include "common/navigation.j2.inc" %} <!-- Jumbotron --> <div class="jumbotron"> <h1 lang="en">{{ _("Financial News") }}</h1> @@ -200,7 +200,7 @@ <p><a class="btn btn-info" href="http://www.spiegel.de/international/world/spiegel-exclusive-nsa-spies-on-international-bank-transactions-a-922276.html" role="button">Source</a></p> </div> </div> - <!--# include file="common/footer.{{ _("en") }}.inc" --> + {% include "common/footer.j2.inc" %} </div> <!-- /container --> </body> </html> diff --git a/governments.html.j2 b/governments.html.j2 index 8a924e7d..0d48e455 100644 --- a/governments.html.j2 +++ b/governments.html.j2 @@ -4,11 +4,11 @@ <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }} - {{ _("Governments") }}</title> <meta name="description" content=""/> - <!--# include file="common/header.{{ _("en") }}.inc" --> + {% include "common/header.j2.inc" %} </head> <body> <div class="container"> - <!--# include file="common/navigation.{{ _("en") }}.inc" --> + {% include "common/navigation.j2.inc" %} <!-- Jumbotron --> <div class="jumbotron"> <h1>{{ _("Advantages for governments") }}</h1> @@ -98,7 +98,7 @@ </ul> <p></p> </div> - <!--# include file="common/footer.{{ _("en") }}.inc" --> + {% include "common/footer.j2.inc" %} </div> <!-- /container --> </body> </html> diff --git a/index.html.j2 b/index.html.j2 index 34c30d3b..58a869c8 100644 --- a/index.html.j2 +++ b/index.html.j2 @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="{{ _('en') }}"> +<html lang="{{ lang }}"> <head> <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }}</title> diff --git a/investors.html.j2 b/investors.html.j2 index 13bd3f61..2de7a57f 100644 --- a/investors.html.j2 +++ b/investors.html.j2 @@ -4,11 +4,11 @@ <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }} - {{ _("Investors") }}</title> <meta name="description" content=""/> - <!--# include file="common/header.{{ _("en") }}.inc" --> + {% include "common/header.j2.inc" %} </head> <body> <div class="container"> - <!--# include file="common/navigation.{{ _("en") }}.inc" --> + {% include "common/navigation.j2.inc" %} <!-- Jumbotron --> <div class="jumbotron"> <h1>{{ _("Operate a Taler exchange!") }}</h1> @@ -77,7 +77,7 @@ </ul> <p></p> </div> - <!--# include file="common/footer.{{ _("en") }}.inc" --> + {% include "common/footer.j2.inc" %} </div> <!-- /container --> </body> </html> diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po index da39dca1..9c02b0f4 100644 --- a/locale/de/LC_MESSAGES/messages.po +++ b/locale/de/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-01-30 19:48+0100\n" +"POT-Creation-Date: 2017-01-30 21:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language: de\n" @@ -14,17 +14,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.3.4\n" -#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118 -#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11 -#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7 -#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7 -#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2 -#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101 -#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11 -#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7 -#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7 -#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7 -#: wallet.html.j2:112 wallet.html.j2:194 +#: about.html.j2:2 about.html.j2:118 citizens.html.j2:2 developers.html.j2:2 +#: governments.html.j2:2 governments.html.j2:7 governments.html.j2:11 +#: governments.html.j2:101 investors.html.j2:2 investors.html.j2:7 +#: investors.html.j2:11 investors.html.j2:80 merchants.html.j2:2 +#: merchants.html.j2:7 merchants.html.j2:11 merchants.html.j2:137 +#: news.html.j2:2 wallet.html.j2:2 wallet.html.j2:7 wallet.html.j2:112 +#: wallet.html.j2:194 msgid "en" msgstr "de" @@ -1565,3 +1561,8 @@ msgstr "" #~ msgid "About us" #~ msgstr "Über uns" +#~ msgid "" +#~ "This page was created using <a " +#~ "href='https://www.gnu.org/'>Free Software</a> only." +#~ msgstr "" + diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po index 1837f597..4295c6b3 100644 --- a/locale/en/LC_MESSAGES/messages.po +++ b/locale/en/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-01-30 19:48+0100\n" +"POT-Creation-Date: 2017-01-30 21:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language: en\n" @@ -14,17 +14,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.3.4\n" -#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118 -#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11 -#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7 -#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7 -#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2 -#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101 -#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11 -#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7 -#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7 -#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7 -#: wallet.html.j2:112 wallet.html.j2:194 +#: about.html.j2:2 about.html.j2:118 citizens.html.j2:2 developers.html.j2:2 +#: governments.html.j2:2 governments.html.j2:7 governments.html.j2:11 +#: governments.html.j2:101 investors.html.j2:2 investors.html.j2:7 +#: investors.html.j2:11 investors.html.j2:80 merchants.html.j2:2 +#: merchants.html.j2:7 merchants.html.j2:11 merchants.html.j2:137 +#: news.html.j2:2 wallet.html.j2:2 wallet.html.j2:7 wallet.html.j2:112 +#: wallet.html.j2:194 msgid "en" msgstr "" @@ -1052,3 +1048,8 @@ msgstr "" #~ msgid "About us" #~ msgstr "" +#~ msgid "" +#~ "This page was created using <a " +#~ "href='https://www.gnu.org/'>Free Software</a> only." +#~ msgstr "" + diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index 84a36c3c..4bc2d89b 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-01-30 19:48+0100\n" +"POT-Creation-Date: 2017-01-30 21:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language: es\n" @@ -14,17 +14,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.3.4\n" -#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118 -#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11 -#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7 -#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7 -#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2 -#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101 -#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11 -#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7 -#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7 -#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7 -#: wallet.html.j2:112 wallet.html.j2:194 +#: about.html.j2:2 about.html.j2:118 citizens.html.j2:2 developers.html.j2:2 +#: governments.html.j2:2 governments.html.j2:7 governments.html.j2:11 +#: governments.html.j2:101 investors.html.j2:2 investors.html.j2:7 +#: investors.html.j2:11 investors.html.j2:80 merchants.html.j2:2 +#: merchants.html.j2:7 merchants.html.j2:11 merchants.html.j2:137 +#: news.html.j2:2 wallet.html.j2:2 wallet.html.j2:7 wallet.html.j2:112 +#: wallet.html.j2:194 msgid "en" msgstr "es" @@ -1575,3 +1571,8 @@ msgstr "" #~ msgid "About us" #~ msgstr "Quiénes somos" +#~ msgid "" +#~ "This page was created using <a " +#~ "href='https://www.gnu.org/'>Free Software</a> only." +#~ msgstr "" + diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index f5ef49d4..78bd85da 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-01-30 19:48+0100\n" +"POT-Creation-Date: 2017-01-30 21:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language: fr\n" @@ -14,17 +14,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.3.4\n" -#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118 -#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11 -#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7 -#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7 -#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2 -#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101 -#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11 -#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7 -#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7 -#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7 -#: wallet.html.j2:112 wallet.html.j2:194 +#: about.html.j2:2 about.html.j2:118 citizens.html.j2:2 developers.html.j2:2 +#: governments.html.j2:2 governments.html.j2:7 governments.html.j2:11 +#: governments.html.j2:101 investors.html.j2:2 investors.html.j2:7 +#: investors.html.j2:11 investors.html.j2:80 merchants.html.j2:2 +#: merchants.html.j2:7 merchants.html.j2:11 merchants.html.j2:137 +#: news.html.j2:2 wallet.html.j2:2 wallet.html.j2:7 wallet.html.j2:112 +#: wallet.html.j2:194 msgid "en" msgstr "fr" @@ -1561,3 +1557,8 @@ msgstr "" #~ msgid "About us" #~ msgstr "À propos" +#~ msgid "" +#~ "This page was created using <a " +#~ "href='https://www.gnu.org/'>Free Software</a> only." +#~ msgstr "" + diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index 88ee03e4..2df87084 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2017-01-30 19:48+0100\n" +"POT-Creation-Date: 2017-01-30 21:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language: it\n" @@ -14,17 +14,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.3.4\n" -#: about.html.j2:2 about.html.j2:7 about.html.j2:11 about.html.j2:118 -#: citizens.html.j2:2 citizens.html.j2:7 citizens.html.j2:11 -#: citizens.html.j2:101 developers.html.j2:2 developers.html.j2:7 -#: developers.html.j2:11 developers.html.j2:216 financial-news.html.j2:7 -#: financial-news.html.j2:11 financial-news.html.j2:203 governments.html.j2:2 -#: governments.html.j2:7 governments.html.j2:11 governments.html.j2:101 -#: index.html.j2:2 investors.html.j2:2 investors.html.j2:7 investors.html.j2:11 -#: investors.html.j2:80 merchants.html.j2:2 merchants.html.j2:7 -#: merchants.html.j2:11 merchants.html.j2:137 news.html.j2:2 news.html.j2:7 -#: news.html.j2:11 news.html.j2:117 wallet.html.j2:2 wallet.html.j2:7 -#: wallet.html.j2:112 wallet.html.j2:194 +#: about.html.j2:2 about.html.j2:118 citizens.html.j2:2 developers.html.j2:2 +#: governments.html.j2:2 governments.html.j2:7 governments.html.j2:11 +#: governments.html.j2:101 investors.html.j2:2 investors.html.j2:7 +#: investors.html.j2:11 investors.html.j2:80 merchants.html.j2:2 +#: merchants.html.j2:7 merchants.html.j2:11 merchants.html.j2:137 +#: news.html.j2:2 wallet.html.j2:2 wallet.html.j2:7 wallet.html.j2:112 +#: wallet.html.j2:194 msgid "en" msgstr "it" @@ -1573,3 +1569,8 @@ msgstr "" #~ msgid "About us" #~ msgstr "Chi siamo" +#~ msgid "" +#~ "This page was created using <a " +#~ "href='https://www.gnu.org/'>Free Software</a> only." +#~ msgstr "" + diff --git a/merchants.html.j2 b/merchants.html.j2 index 3ad6fe0c..48ea6019 100644 --- a/merchants.html.j2 +++ b/merchants.html.j2 @@ -4,11 +4,11 @@ <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }} - {{ _("Merchants") }}</title> <meta name="description" content=""/> - <!--# include file="common/header.{{ _("en") }}.inc" --> + {% include "common/header.j2.inc" %} </head> <body> <div class="container"> - <!--# include file="common/navigation.{{ _("en") }}.inc" --> + {% include "common/navigation.j2.inc" %} <!-- Jumbotron --> <div class="jumbotron"> <h1>{{ _("Advantages for merchants") }}</h1> @@ -134,7 +134,7 @@ </ul> <p></p> </div> - <!--# include file="common/footer.{{ _("en") }}.inc" --> + {% include "common/footer.j2.inc" %} </div> <!-- /container --> </body> </html> diff --git a/news.html.j2 b/news.html.j2 index 9c029d94..0063806c 100644 --- a/news.html.j2 +++ b/news.html.j2 @@ -4,11 +4,11 @@ <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }} - {{ _("News") }}</title> <meta name="description" content=""/> - <!--# include file="common/header.{{ _("en") }}.inc" --> + {% include "common/header.j2.inc" %} </head> <body> <div class="container"> - <!--# include file="common/navigation.{{ _("en") }}.inc" --> + {% include "common/navigation.j2.inc" %} <!-- Jumbotron --> <div class="jumbotron"> <h1>{{ _("News") }}</h1> @@ -114,7 +114,7 @@ </div> </div> - <!--# include file="common/footer.{{ _("en") }}.inc" --> + {% include "common/footer.j2.inc" %} </div> <!-- /container --> </body> </html> diff --git a/template.py b/template.py index aab6fddd..1fdf3b85 100755 --- a/template.py +++ b/template.py @@ -2,6 +2,7 @@ import os import sys +import re import gettext import jinja2 @@ -10,7 +11,8 @@ if len(sys.argv) < 3: in_file = sys.argv[1] locale = sys.argv[2] -out_file = sys.argv[3] + +name, ext = re.match(r"(.*)\.([^.]+)$", in_file.rstrip(".j2")).groups() tr = gettext.translation("messages", localedir="locale", @@ -23,12 +25,19 @@ env.install_gettext_translations(tr, newstyle=True) tmpl = env.get_template(in_file) +def self_localized(x): + return ".".join((name, x, ext)) + +def url_localized(my_file): + my_name, my_ext = re.match(r"(.*)\.([^.]+)$", my_file).groups() + return ".".join((my_name, locale, my_ext)) + def url(x): # TODO: look at the app root environment variable # TODO: check if file exists return x import codecs -f = codecs.open(out_file, "w", "utf-8") -f.write(tmpl.render(lang=locale, url=url)) +f = codecs.open(".".join((name, locale, ext)), "w", "utf-8") +f.write(tmpl.render(lang=locale, url=url, self_localized=self_localized, url_localized=url_localized)) f.close() diff --git a/template.sh b/template.sh index bc63b943..a33cefe8 100755 --- a/template.sh +++ b/template.sh @@ -4,6 +4,6 @@ for f in $(git ls-files *.j2); do for ld in locale/*/; do l=$(basename $ld) echo "$f: $l" - python template.py $f $l $(dirname $f)/$(basename $f .html.j2).$l.html + python template.py $f $l done done diff --git a/wallet.html.j2 b/wallet.html.j2 index b828091a..0e45b2c4 100644 --- a/wallet.html.j2 +++ b/wallet.html.j2 @@ -4,7 +4,7 @@ <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }} - {{ _("Wallet") }}</title> <meta name="description" content=""/> - <!--# include file="common/header.{{ _("en") }}.inc" --> + {% include "common/header.j2.inc" %} <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/millncjiddlpgdmkklmhfadpacifaonc" /> <script src="web-common/taler-wallet-lib.js" type="text/javascript"></script> @@ -109,7 +109,7 @@ document.addEventListener('DOMContentLoaded', onLoad); <body> <div class="container"> - <!--# include file="common/navigation.{{ _("en") }}.inc" --> + {% include "common/navigation.j2.inc" %} <!-- Jumbotron --> <div class="jumbotron"> <h1 lang="en">Taler Wallet</h1> @@ -191,7 +191,7 @@ document.addEventListener('DOMContentLoaded', onLoad); </div> <!-- /row --> - <!--# include file="common/footer.{{ _("en") }}.inc" --> + {% include "common/footer.j2.inc" %} </div> <!-- /container --> </body> </html> |