[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-www] branch master updated (eb007f7 -> 0d3bdc8)
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-www] branch master updated (eb007f7 -> 0d3bdc8) |
|
Date: |
Sun, 16 May 2021 19:12:24 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository anastasis-www.
from eb007f7 Merge branch 'master' of git+ssh://git.taler.net/anastasis-www
new c23c928 add rss template
new 0d3bdc8 fix link
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
locale/de/LC_MESSAGES/messages.po | 4 ++--
locale/it/LC_MESSAGES/messages.po | 21 +++++++++---------
locale/messages.pot | 4 ++--
template/docs_news.html.j2 | 2 +-
template/index.html.j2 | 6 ++---
template/rss.xml.j2 | 46 +++++++++++++++++++++++++++++++++++++++
6 files changed, 65 insertions(+), 18 deletions(-)
create mode 100644 template/rss.xml.j2
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 8a03413..97e1470 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: contact@anastasis.lu\n"
-"POT-Creation-Date: 2021-05-07 14:38+0200\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2021-05-16 19:06+0200\n"
"PO-Revision-Date: 2021-05-14 08:07+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: German <http://weblate.taler.net/projects/anastasis/website/";
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 4f63476..5a55c7e 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: contact@anastasis.lu\n"
-"POT-Creation-Date: 2021-04-30 09:51+0200\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2021-05-16 19:06+0200\n"
"PO-Revision-Date: 2021-05-14 20:51+0000\n"
"Last-Translator: Stefan <eintritt@hotmail.com>\n"
"Language-Team: Italian <http://weblate.taler.net/projects/anastasis/website/";
@@ -270,8 +270,8 @@ msgstr ""
"svizzera di professionisti della sicurezza ICT, presentò il premio "
"d'eccellenza ISSS per la settima volta nel 2020. Uno dei vincitori del "
"premio d'eccellenza fu Anastasi: <br> <a href=\"https://www.isss.ch/de/";
-"agenda/isss-excellence-award/\" target=\"_blank\" rel=\"noopener noreferrer\""
-">Storia completa</a>"
+"agenda/isss-excellence-award/\" target=\"_blank\" rel=\"noopener noreferrer"
+"\">Storia completa</a>"
#: template/docs_news.html.j2:58 template/news.html.j2:64
#, fuzzy
@@ -423,9 +423,9 @@ msgid ""
"lost).</li> <li>Not assume consumers are able to remember or securely "
"preserve key material."
msgstr ""
-"Gli emittenti europei delle e-monete che usano portafogli elettronici "
-"devono:</p> <ul> <li>Autorizzare i consumatori a recuperare sempre i loro "
-"fondi elettronici (es. se i device sono perduti).</li> <li>Non pensare che i "
+"Gli emittenti europei delle e-monete che usano portafogli elettronici devono:"
+"</p> <ul> <li>Autorizzare i consumatori a recuperare sempre i loro fondi "
+"elettronici (es. se i device sono perduti).</li> <li>Non pensare che i "
"consumatori possano ricordare o preservare in maniera sicura il materiale "
"delle chiavi."
@@ -580,7 +580,8 @@ msgstr ""
#: template/index.html.j2:279
msgid "Step 2 - <span>The system derives the same keys as per the upload"
-msgstr "Secondo passo - <span>Il sistema trae le stesse chiavi che per
l'upload"
+msgstr ""
+"Secondo passo - <span>Il sistema trae le stesse chiavi che per l'upload"
#: template/index.html.j2:285
msgid ""
@@ -703,8 +704,8 @@ msgstr ""
"Dominik Meister e Dennis Neufeld hanno completato con successo il loro "
"percorso di laurea triennale in Sicurezza-IT. Il tema della loro tesi è "
"stato lo sviluppo di Anastasi. La tesi include lo sviluppo di una prova "
-"pratica. Puoi visionare la tesi <a href=\"..\\..\\papers\\thesis"
-"-anastasis-2020.pdf\">qui</a>"
+"pratica. Puoi visionare la tesi <a href=\"..\\..\\papers\\thesis-"
+"anastasis-2020.pdf\">qui</a>"
#: template/news.html.j2:53
msgid ""
diff --git a/locale/messages.pot b/locale/messages.pot
index 2b4c0b3..536d049 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-07 18:05+0200\n"
+"POT-Creation-Date: 2021-05-16 19:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.6.0\n"
#: common/base.j2:5 common/news.j2:5
msgid "Anastasis"
diff --git a/template/docs_news.html.j2 b/template/docs_news.html.j2
index 02ac4e5..46f97ba 100644
--- a/template/docs_news.html.j2
+++ b/template/docs_news.html.j2
@@ -9,7 +9,7 @@
<div class="banner_Itm_Txt">
<h1><em>{% trans
%}News{% endtrans %} &</em>{% trans %}documentation{% endtrans %}</h1>
<p>{% trans %}This is
an overview of news, documentation<br>and other helpful resources for
Anastasis.{% endtrans %}</p>
- <div class="banpic"><img src="{{
url_static('images/XXX.png') }}" alt="">
+ <div class="banpic"><img src="{{
url_static('images/banicon6.png') }}" alt="FIXME - XXX">
</div>
<div class="absicon"><img src="{{
url_static('images/banicon6.png') }}" alt="">
</div>
diff --git a/template/index.html.j2 b/template/index.html.j2
index 9fca56d..f2b4f34 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -7,8 +7,8 @@
<div class="banner_Itm_Inn">
<div class="container">
<div class="banner_Itm_Txt">
- <h1><em>{% trans %}Welcome to</em> Anastasis{%
endtrans %}</h1>
- <p>{% trans %}Password-less key recovery via
multi-factor <br/>multi-party authentication.{% endtrans %}</p>
+ <h1><em>{% trans %}Welcome to</em> Anastasis{%
endtrans %}</h1>
+ <p>{% trans %}Password-less key recovery via
multi-factor <br/>multi-party authentication.{% endtrans %}</p>
<div class="banpic"><img src="{{
url_static('images/mob.png') }}" alt="">
</div>
<div class="absicon"><img src="{{
url_static('images/banicon6.png') }}" alt="">
@@ -114,7 +114,7 @@
<div class="solutionBoxes">
<div class="row">
<!-- <div class="col-sm-6">
- <img src="{{
url_static('images/pic3.jpg') }}" alt="" />
+ <img src="{{
url_static('images/pic3.png') }}" alt="" />
</div> -->
<div class="col-sm-6">
<div class="solutionBoxRt">
diff --git a/template/rss.xml.j2 b/template/rss.xml.j2
new file mode 100644
index 0000000..3ffe6d3
--- /dev/null
+++ b/template/rss.xml.j2
@@ -0,0 +1,46 @@
+{#
+# Copyright (C) 2019, 2020 GNUnet e.V.
+#
+# This code is derived from code contributed to GNUnet eV
+# by nikita <nikita@n0.is>.
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+# SPDX-License-Identifier: 0BSD
+#}
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom";>
+ <channel>
+ <atom:link href="{{ siteconf['baseurl'] }}{{ lang }}/rss.xml" rel="self"
type="application/rss+xml" />
+ <title>{{ siteconf['rsstitle'] }}</title>
+ <language>{{ lang }}</language>
+ <description>{{ siteconf['rssdescr']|e }}</description>
+ <link>{{ siteconf['baseurl'] }}/</link>
+ <lastBuildDate>{{ now }}</lastBuildDate>
+ {% for newspostitem in newsposts %}
+ <item>
+ <guid>{{ siteconf['baseurl'] }}{{ lang }}{{ siteconf['newsloc'] }}{{
newspostitem['page'] }}</guid>
+ <link>{{ siteconf['baseurl'] }}{{ lang }}{{ siteconf['newsloc'] }}{{
newspostitem['page'] }}</link>
+ <pubDate>{{ conv_date_rfc822(newspostitem["date"]) }}</pubDate>
+ <title>{{ newspostitem['title']|e }}</title>
+ <description>
+ <![CDATA[
+ <article>
+ {{ get_abstract(newspostitem['page'], 1000) }}
+ </article>
+ ]]>
+ </description>
+ </item>
+ {% endfor %}
+ </channel>
+</rss>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-anastasis-www] branch master updated (eb007f7 -> 0d3bdc8),
gnunet <=