Implement new consent screen

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='svs',
-    version='1.0.0',
+    version='1.0.1',
     description='The InAcademia Simple validation Service allows for the easy validation of affiliation (Student,'
                 'Faculty, Staff) of a user in Academia',
     license='Apache 2.0',
@@ -33,7 +33,7 @@
         ]
     },
     install_requires=[
-        'satosa==3.3.1',
+        'satosa==3.4.8',
         'Mako',
         'gunicorn',
         'Werkzeug'

src/svs/data/i18n/locale/el/LC_MESSAGES/messages.po

@@ -1,51 +1,58 @@
-
 msgid ""
 msgstr ""
 "Project-Id-Version: InAcademia 0.1.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-09-20 08:24+0200\n"
-"PO-Revision-Date: 2016-06-14 11:25+0300\n"
-"Last-Translator: Ioannis Kakavas <ikakavas@noc.grnet.gr>\n"
-"Language: el\n"
-"Language-Team: InAcademia<tech@inacademia.org>\n"
+"POT-Creation-Date: 2017-04-30 18:24+0200\n"
+"PO-Revision-Date: 2017-04-30 11:19+0100\n"
+"Last-Translator: Stavros Sachtouris <saxtouri@grnet.gr>\n"
+"Language: en\n"
+"Language-Team: InAcademia <tech@inacademia.org>\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.3.4\n"
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:44
 msgid "Affiliation"
-msgstr "Affiliation"
+msgstr "Συσχέτιση (affiliation)"
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:45
 msgid "Identifier"
 msgstr "Αναγνωριστικό"
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:46
 msgid "Authentication time"
-msgstr "Χρόνος αυθεντικοποίησης"
+msgstr "Στιγμή αυθνετικοποίησης"
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:49
 msgid "Domain"
-msgstr "Domain"
+msgstr "Tομέας (domain)"
+
+#: src/svs/templates/consent.mako:20
+msgid "Your consent is required to continue."
+msgstr "Η συγκατάθεσή σας είναι αναγκαία προκειμένου να συνεχίσετε"
 
-#: src/svs/templates/consent.mako:27
-msgid "Consent - Your consent is required to continue."
-msgstr "Συγκατάθεση - Η συγκατάθεση σας είναι αναγκαία για να συνεχίσετε."
+#: src/svs/templates/consent.mako:34
+msgid "is about to receive the following information"
+msgstr "θα λάβει τις ακόλουθες πληροφορίες"
 
 #: src/svs/templates/consent.mako:53
-msgid "{client_name} requires the information below to be transferred:"
-msgstr "{client_name} απαιτεί να μεταφερθούν οι ακόλουθες πληροφορίες:"
+msgid "Click here to see what information is stored by InAcadamia as part of this transaction"
+msgstr "Κλικ για τις πληροφορίες που διατηρεί το InAcademia στο πλαίσιο αυτής της συναλλαγής"
 
-#: src/svs/templates/consent.mako:60
-msgid "Ok, accept"
-msgstr "Ναι, αποδοχή"
+#: src/svs/templates/consent.mako:66
+msgid "Data send and stored by InAcademia is subject to our"
+msgstr "Τα δεδομένα που διατηρεί το InAcademia σύμφωνα με αυτή την"
 
-#: src/svs/templates/consent.mako:64
-msgid "No, cancel"
-msgstr "Όχι, ακύρωση"
+#: src/svs/templates/consent.mako:68
+msgid "Privacy Policy"
+msgstr "Πολιτική Ιδιωτικότητας"
 
-#: src/svs/templates/consent.mako:81
-msgid "Terms of service"
-msgstr "Όροι χρήσης"
+#: src/svs/templates/consent.mako:86
+msgid "OK, accept"
+msgstr "Αποδοχή"
+
+#: src/svs/templates/consent.mako:88
+msgid "No, cancel"
+msgstr "Ακύρωση"

src/svs/data/i18n/locale/en/LC_MESSAGES/messages.po

@@ -1,51 +1,113 @@
-
+# Translations template for svs.
+# Copyright (C) 2017 ORGANIZATION
+# This file is distributed under the same license as the svs project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: InAcademia 0.1.0\n"
+"Project-Id-Version: svs 1.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-09-20 08:24+0200\n"
-"PO-Revision-Date: 2015-03-03 11:19+0100\n"
-"Last-Translator: Rebecka Gulliksson <rebecka.gulliksson@umu.se>\n"
-"Language: en\n"
-"Language-Team: InAcademia <tech@inacademia.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"POT-Creation-Date: 2017-05-10 16:57+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Stavros Sachtouris <saxtouri@grnet.gr>\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.3.4\n"
+"Generated-By: Babel 1.3\n"
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:44
 msgid "Affiliation"
 msgstr ""
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:45
 msgid "Identifier"
 msgstr ""
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:46
 msgid "Authentication time"
 msgstr ""
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:49
 msgid "Domain"
 msgstr ""
 
-#: src/svs/templates/consent.mako:27
-msgid "Consent - Your consent is required to continue."
+#: src/svs/templates/consent.mako:20
+msgid "Your consent is required to continue."
+msgstr ""
+
+#: src/svs/templates/consent.mako:34
+msgid "is about to receive the following information:"
 msgstr ""
 
 #: src/svs/templates/consent.mako:53
-msgid "{client_name} requires the information below to be transferred:"
+msgid ""
+"Click here to see what information is stored by InAcadamia as part of "
+"this transaction"
+msgstr ""
+
+#: src/svs/templates/consent.mako:66
+msgid "Data send and stored by InAcademia is subject to our"
+msgstr ""
+
+#: src/svs/templates/consent.mako:68
+msgid "Privacy Policy"
 msgstr ""
 
-#: src/svs/templates/consent.mako:60
-msgid "Ok, accept"
+#: src/svs/templates/consent.mako:77
+msgid "months"
 msgstr ""
 
-#: src/svs/templates/consent.mako:64
+#: src/svs/templates/consent.mako:86
+msgid "OK, accept"
+msgstr ""
+
+#: src/svs/templates/consent.mako:88
 msgid "No, cancel"
 msgstr ""
 
-#: src/svs/templates/consent.mako:81
-msgid "Terms of service"
+#: src/svs/templates/consent.mako:119
+msgid "No attributes where selected which equals no consent where given"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:1
+msgid "mail"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:2
+msgid "address"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:3
+msgid "name"
 msgstr ""
+
+#: src/svs/templates/list_values.mako:4
+msgid "surname"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:5
+msgid "givenname"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:6
+msgid "displayname"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:7
+msgid "edupersontargetedid"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:9
+msgid "year"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:10
+msgid "month"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:11
+msgid "never"
+msgstr ""
+

src/svs/data/i18n/messages.pot

@@ -1,55 +1,113 @@
 # Translations template for svs.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2017 ORGANIZATION
 # This file is distributed under the same license as the svs project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: svs 1.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-09-20 08:24+0200\n"
+"POT-Creation-Date: 2017-05-10 16:57+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Stavros Sachtouris <saxtouri@grnet.gr>\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.3.4\n"
+"Generated-By: Babel 1.3\n"
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:44
 msgid "Affiliation"
 msgstr ""
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:45
 msgid "Identifier"
 msgstr ""
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:46
 msgid "Authentication time"
 msgstr ""
 
-#: src/svs/user_consent.py:57
+#: src/svs/user_consent.py:49
 msgid "Domain"
 msgstr ""
 
-#: src/svs/templates/consent.mako:27
-msgid "Consent - Your consent is required to continue."
+#: src/svs/templates/consent.mako:20
+msgid "Your consent is required to continue."
+msgstr ""
+
+#: src/svs/templates/consent.mako:34
+msgid "is about to receive the following information:"
 msgstr ""
 
 #: src/svs/templates/consent.mako:53
-msgid "{client_name} requires the information below to be transferred:"
+msgid ""
+"Click here to see what information is stored by InAcadamia as part of "
+"this transaction"
+msgstr ""
+
+#: src/svs/templates/consent.mako:66
+msgid "Data send and stored by InAcademia is subject to our"
+msgstr ""
+
+#: src/svs/templates/consent.mako:68
+msgid "Privacy Policy"
 msgstr ""
 
-#: src/svs/templates/consent.mako:60
-msgid "Ok, accept"
+#: src/svs/templates/consent.mako:77
+msgid "months"
 msgstr ""
 
-#: src/svs/templates/consent.mako:64
+#: src/svs/templates/consent.mako:86
+msgid "OK, accept"
+msgstr ""
+
+#: src/svs/templates/consent.mako:88
 msgid "No, cancel"
 msgstr ""
 
-#: src/svs/templates/consent.mako:81
-msgid "Terms of service"
+#: src/svs/templates/consent.mako:119
+msgid "No attributes where selected which equals no consent where given"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:1
+msgid "mail"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:2
+msgid "address"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:3
+msgid "name"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:4
+msgid "surname"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:5
+msgid "givenname"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:6
+msgid "displayname"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:7
+msgid "edupersontargetedid"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:9
+msgid "year"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:10
+msgid "month"
+msgstr ""
+
+#: src/svs/templates/list_values.mako:11
+msgid "never"
 msgstr ""