[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[www] branch master updated: ev: generate list of protocols.
|
From: |
gnunet |
|
Subject: |
[www] branch master updated: ev: generate list of protocols. |
|
Date: |
Mon, 04 Nov 2019 22:58:28 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new b19673a ev: generate list of protocols.
b19673a is described below
commit b19673a947c94eb4febc929182c3a565bd3b5852
Author: ng0 <address@hidden>
AuthorDate: Mon Nov 4 21:55:28 2019 +0000
ev: generate list of protocols.
---
locale/de/LC_MESSAGES/messages.po | 13 ++++-----
locale/en/LC_MESSAGES/messages.po | 8 ++----
locale/es/LC_MESSAGES/messages.po | 10 ++-----
locale/fr/LC_MESSAGES/messages.po | 10 ++-----
locale/it/LC_MESSAGES/messages.po | 10 ++-----
template.py | 59 ++++++++-------------------------------
template/ev.html.j2 | 27 ++++--------------
7 files changed, 35 insertions(+), 102 deletions(-)
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 7e91052..38c3fce 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-11-04 21:36+0000\n"
+"POT-Creation-Date: 2019-11-04 21:53+0000\n"
"PO-Revision-Date: 2018-02-24 17:42\n"
"Last-Translator: Torsten Grothoff <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -627,15 +627,11 @@ msgstr ""
msgid "Official Meeting Notes"
msgstr "Offizielle Protokolle"
-#: template/ev.html.j2:74
-msgid "2013-12 (constitutional meeting)"
-msgstr "2013-12 (Gründungstreffen)"
-
-#: template/ev.html.j2:99
+#: template/ev.html.j2:84
msgid "Support Us!"
msgstr "Unterstützung anbieten!"
-#: template/ev.html.j2:101
+#: template/ev.html.j2:86
msgid ""
"Everybody is welcome to support us via donations. For financial "
"contributions, Europeans are able to donate via SEPA. We hope to setup "
@@ -1985,6 +1981,9 @@ msgstr ""
msgid "Videos related to GNUnet"
msgstr ""
+#~ msgid "2013-12 (constitutional meeting)"
+#~ msgstr "2013-12 (Gründungstreffen)"
+
#, fuzzy
#~| msgid "IRC Archive"
#~ msgid "IRC archive"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 0965904..c10ac14 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -584,15 +584,11 @@ msgstr ""
msgid "Official Meeting Notes"
msgstr ""
-#: template/ev.html.j2:74
-msgid "2013-12 (constitutional meeting)"
-msgstr ""
-
-#: template/ev.html.j2:99
+#: template/ev.html.j2:84
msgid "Support Us!"
msgstr ""
-#: template/ev.html.j2:101
+#: template/ev.html.j2:86
msgid ""
"Everybody is welcome to support us via donations. For financial "
"contributions, Europeans are able to donate via SEPA. We hope to setup "
diff --git a/locale/es/LC_MESSAGES/messages.po
b/locale/es/LC_MESSAGES/messages.po
index dd8bd2c..10c7a34 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-11-04 21:36+0000\n"
+"POT-Creation-Date: 2019-11-04 21:53+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -610,15 +610,11 @@ msgstr ""
msgid "Official Meeting Notes"
msgstr ""
-#: template/ev.html.j2:74
-msgid "2013-12 (constitutional meeting)"
-msgstr ""
-
-#: template/ev.html.j2:99
+#: template/ev.html.j2:84
msgid "Support Us!"
msgstr ""
-#: template/ev.html.j2:101
+#: template/ev.html.j2:86
msgid ""
"Everybody is welcome to support us via donations. For financial "
"contributions, Europeans are able to donate via SEPA. We hope to setup "
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index caeafa9..287614d 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-11-04 21:36+0000\n"
+"POT-Creation-Date: 2019-11-04 21:53+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -604,15 +604,11 @@ msgstr ""
msgid "Official Meeting Notes"
msgstr ""
-#: template/ev.html.j2:74
-msgid "2013-12 (constitutional meeting)"
-msgstr ""
-
-#: template/ev.html.j2:99
+#: template/ev.html.j2:84
msgid "Support Us!"
msgstr ""
-#: template/ev.html.j2:101
+#: template/ev.html.j2:86
msgid ""
"Everybody is welcome to support us via donations. For financial "
"contributions, Europeans are able to donate via SEPA. We hope to setup "
diff --git a/locale/it/LC_MESSAGES/messages.po
b/locale/it/LC_MESSAGES/messages.po
index 7392708..5e8c71d 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-11-04 21:36+0000\n"
+"POT-Creation-Date: 2019-11-04 21:53+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -604,15 +604,11 @@ msgstr ""
msgid "Official Meeting Notes"
msgstr ""
-#: template/ev.html.j2:74
-msgid "2013-12 (constitutional meeting)"
-msgstr ""
-
-#: template/ev.html.j2:99
+#: template/ev.html.j2:84
msgid "Support Us!"
msgstr ""
-#: template/ev.html.j2:101
+#: template/ev.html.j2:86
msgid ""
"Everybody is welcome to support us via donations. For financial "
"contributions, Europeans are able to donate via SEPA. We hope to setup "
diff --git a/template.py b/template.py
index 87dbcb3..5cae5bd 100755
--- a/template.py
+++ b/template.py
@@ -191,12 +191,19 @@ def copy_static(locale, indict):
print(locale + "/" + key + " ...to... " + locale + "/" + value)
-# fileop(in, out, "copy")
+# TODO: Move the lists elsewhere?
+
+meetingnotes = [
+ { "year": "2013", "date": "2013-12-27" },
+ { "year": "2014", "date": "2014-12-28" },
+ { "year": "2015", "date": "2015-12-29" },
+ { "year": "2016", "date": "2016-12-28" },
+ { "year": "2017", "date": "2017-12-27" },
+ { "year": "2018", "date": "2018-12-27" },
+]
# At this moment in time, constructing this list dynamically would be
-# too much pointless code. In fact all of what we use in jinja is
-# no real use of jinja yet and furthermore we would be better off
-# just using static html + css + some awk and other base tools.
+# too much pointless code.
newsposts = [
{
"page": "2019-0.11.8.html",
@@ -718,6 +725,7 @@ def generate_site(root):
content = tmpl.render(lang=locale,
lang_full=langs_full[locale],
url=url,
+ meetingnotesdata=meetingnotes,
newsdata=newsposts,
videosdata=videoslist,
self_localized=self_localized,
@@ -764,46 +772,3 @@ def main():
if __name__ == "__main__":
main()
-
-# for in_file in glob.glob("news/*.j2"):
-# name, ext = re.match(r"(.*)\.([^.]+)$", in_file.rstrip(".j2")).groups()
-# tmpl = env.get_template(in_file)
-
-# def self_localized(other_locale):
-# """
-# Return URL for the current page in another locale.
-# """
-# return "../" + other_locale + "/" + in_file.replace('news/',
-# '').rstrip(".j2")
-
-# def url_localized(filename):
-# return "../" + locale + "/" + filename
-
-# def svg_localized(filename):
-# lf = filename + "." + locale + ".svg"
-# if locale == "en" or not os.path.isfile(lf):
-# return "../" + filename + ".svg"
-# else:
-# return "../" + lf
-
-# def url(x):
-# # TODO: look at the app root environment variable
-# # TODO: check if file exists
-# return "../" + x
-
-# for f in glob.glob("locale/*/"):
-# locale = os.path.basename(f[:-1])
-# content = tmpl.render(lang=locale,
-# lang_full=langs_full[locale],
-# url=url,
-# self_localized=self_localized,
-# url_localized=url_localized,
-# svg_localized=svg_localized,
-# filename=name + "." + ext)
-# out_name = "./rendered/" + locale + "/news/" +
in_file.replace('news/', '').rstrip(".j2")
-# outdir = Path("rendered")
-# langdir = outdir / locale / "news"
-# langdir.mkdir(parents=True, exist_ok=True)
-# # os.makedirs("./rendered/" + locale + "/news/", exist_ok=True)
-# with codecs.open(out_name, "w", encoding='utf-8') as f:
-# f.write(content)
diff --git a/template/ev.html.j2 b/template/ev.html.j2
index 70c2ad8..ba138df 100644
--- a/template/ev.html.j2
+++ b/template/ev.html.j2
@@ -69,28 +69,13 @@
</div>
<div class="col-md">
<h3>{{ _("Official Meeting Notes") }}</h3>
- <p>
- <ul>
- <li>{{ _("2013-12 (constitutional meeting)") }}
- (<a
href="https://git.gnunet.org/gnunet-ev.git/tree/minutes/2013-12-27.txt";>txt</a>)
- </li>
- <li>2014-12
- (<a
href="https://git.gnunet.org/gnunet-ev.git/tree/minutes/2014-12-28.txt";>txt</a>)
- </li>
- <li>2015-12
- (<a
href="https://git.gnunet.org/gnunet-ev.git/tree/minutes/2015-12-29.txt";>txt</a>)
- </li>
- <li>2016-12
- (<a
href="https://git.gnunet.org/gnunet-ev.git/tree/minutes/2016-12-28.txt";>txt</a>)
+ <ul>
+ {% for item in meetingnotesdata %}
+ <li>
+ {{ item['year'] }}: (Protocol: <a
href="https://git.gnunet.org/gnunet-ev.git/tree/minutes/{{ item['date']
}}.txt">txt</a>)
</li>
- <li>2017-12
- (<a
href="https://git.gnunet.org/gnunet-ev.git/tree/minutes/2017-12-27.txt";>txt</a>)
- </li>
- <li>2018-12
- (<a
href="https://git.gnunet.org/gnunet-ev.git/tree/minutes/2018-12-27.txt";>txt</a>)
- </li>
- </ul>
- </p>
+ {% endfor %}
+ </ul>
</div>
</div><!-- END:row -->
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [www] branch master updated: ev: generate list of protocols.,
gnunet <=