Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature simplify ui #6

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Feature simplify ui #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00f6a95
Update CSS and template for simpler aesthetics
saxtouri Feb 17, 2017
c4d7c2e
Add the InAcademia Logo
saxtouri Feb 21, 2017
b22de41
Update translatable phrases and their positions
saxtouri Feb 21, 2017
c8d54ca
Hide locked information in consent screen
saxtouri Feb 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file modified src/cmservice/service/data/i18n/locales/en/LC_MESSAGES/messages.mo
View file
Open in desktop
Binary file not shown.
39 changes: 18 additions & 21 deletions src/cmservice/service/data/i18n/locales/en/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,35 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"

#: src/cmservice/service/templates/consent.mako:12
msgid "Consent - Your consent is required to continue."
msgstr "Consent - Your consent is required to continue."
#: src/cmservice/service/templates/consent.mako:20
msgid "Your consent is required to continue."
msgstr "Your consent is required to continue."

#: src/cmservice/service/templates/consent.mako:22
#: src/cmservice/service/templates/consent.mako:30
msgid "would like to access the following attributes:"
msgstr "would like to access the following attributes:"

#: src/cmservice/service/templates/consent.mako:44
msgid "Locked attributes"
msgstr "Locked attributes"
#: src/cmservice/service/templates/consent.mako:49
msgid "Click to see what else you sent with your consent"
msgstr "Click to see what else you sent with your consent"

#: src/cmservice/service/templates/consent.mako:45
msgid ""
"The following attributes is not optional. If you don't want to send these"
" you need to abort."
msgstr "The following attributes is not optional. If you don't want to send these"
" you need to abort."
#: src/cmservice/service/templates/consent.mako:62
msgid "For how long do you give consent for this service?"
msgstr "For how long do you give consent for this service?"

#: src/cmservice/service/templates/consent.mako:58
msgid "For how many month do you want to give consent for this particular service:"
msgstr "For how many month do you want to give consent for this particular service:"
#: src/cmservice/service/templates/consent.mako:70
msgid "months"
msgstr "months"

#: src/cmservice/service/templates/consent.mako:71
msgid "Ok, accept"
msgstr "Ok, accept"
#: src/cmservice/service/templates/consent.mako:79
msgid "OK, accept"
msgstr "OK, accept"

#: src/cmservice/service/templates/consent.mako:72
#: src/cmservice/service/templates/consent.mako:81
msgid "No, cancel"
msgstr "No, cancel"

#: src/cmservice/service/templates/consent.mako:104
#: src/cmservice/service/templates/consent.mako:112
msgid "No attributes where selected which equals no consent where given"
msgstr "No attributes where selected which equals no consent where given"

Expand Down
Binary file modified src/cmservice/service/data/i18n/locales/sv/LC_MESSAGES/messages.mo
View file
Open in desktop
Binary file not shown.
35 changes: 18 additions & 17 deletions src/cmservice/service/data/i18n/locales/sv/LC_MESSAGES/messages.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,36 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"

#: src/cmservice/service/templates/consent.mako:12
msgid "Consent - Your consent is required to continue."
msgstr "Samtycke - Ditt medgivande krävs för att fortsätta."
#: src/cmservice/service/templates/consent.mako:20
msgid "Your consent is required to continue."
msgstr "Ditt medgivande krävs för att fortsätta."

#: src/cmservice/service/templates/consent.mako:22
#: src/cmservice/service/templates/consent.mako:30
msgid "would like to access the following attributes:"
msgstr "vill få tillgång till följande attribut:"

#: src/cmservice/service/templates/consent.mako:44
msgid "Locked attributes"
msgstr "Låsta attribut"
#: src/cmservice/service/templates/consent.mako:49
msgid "Click to see what else is sent with your consent"
msgstr "Klicka för att se vad är också skickas med ditt medgivande"

#: src/cmservice/service/templates/consent.mako:45
msgid "The following attributes is not optional. If you don't want to send these you need to abort."
msgstr "Följande attribut går inte att välja bort. Om du inte vill skicka dessa måste du avbrya."
#: src/cmservice/service/templates/consent.mako:62
msgid "For how long do you give consent for this service?"
msgstr "För hur länge vill du ge samtycke for den angivna tjänsten:"
Hur länge tror du ger tillstånd till den angivna tjänsten

#: src/cmservice/service/templates/consent.mako:58
msgid "For how many month do you want to give consent for this particular service:"
msgstr "För hur många månader vill du ge samtycke for den angivna tjänsten:"
#: src/cmservice/service/templates/consent.mako:70
msgid "months"
msgstr "månader"

#: src/cmservice/service/templates/consent.mako:71
msgid "Ok, accept"
#: src/cmservice/service/templates/consent.mako:79
msgid "OK, accept"
msgstr "Ja, acceptera"

#: src/cmservice/service/templates/consent.mako:72
#: src/cmservice/service/templates/consent.mako:81
msgid "No, cancel"
msgstr "Nej, avbryt"

#: src/cmservice/service/templates/consent.mako:104
#: src/cmservice/service/templates/consent.mako:112
msgid "No attributes where selected which equals no consent where given"
msgstr "Inga attribut har angets, vilket är equivalent med att inte ge samtycke överhuvudtaget"

Expand Down
39 changes: 18 additions & 21 deletions src/cmservice/service/data/i18n/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Translations template for CMservice.
# Copyright (C) 2016 ORGANIZATION
# Copyright (C) 2017 ORGANIZATION
# This file is distributed under the same license as the CMservice project.
# Rebecka Gulliksson <rebecka.gulliksson@umu.se>, 2016.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: CMservice 1.0.0\n"
"Project-Id-Version: CMservice 2.0.2\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2016-08-23 08:10+0200\n"
"POT-Creation-Date: 2017-02-21 18:27+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"
Expand All @@ -16,39 +17,35 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"

#: src/cmservice/service/templates/consent.mako:12
msgid "Consent - Your consent is required to continue."
#: src/cmservice/service/templates/consent.mako:20
msgid "Your consent is required to continue."
msgstr ""

#: src/cmservice/service/templates/consent.mako:22
#: src/cmservice/service/templates/consent.mako:30
msgid "would like to access the following attributes:"
msgstr ""

#: src/cmservice/service/templates/consent.mako:44
msgid "Locked attributes"
#: src/cmservice/service/templates/consent.mako:49
msgid "Click to see what else is sent with your consent"
msgstr ""

#: src/cmservice/service/templates/consent.mako:45
msgid ""
"The following attributes is not optional. If you don't want to send these"
" you need to abort."
#: src/cmservice/service/templates/consent.mako:62
msgid "For how long you give consent for this service?"
msgstr ""

#: src/cmservice/service/templates/consent.mako:58
msgid ""
"For how many month do you want to give consent for this particular "
"service:"
#: src/cmservice/service/templates/consent.mako:70
msgid "months"
msgstr ""

#: src/cmservice/service/templates/consent.mako:71
msgid "Ok, accept"
#: src/cmservice/service/templates/consent.mako:79
msgid "OK, accept"
msgstr ""

#: src/cmservice/service/templates/consent.mako:72
#: src/cmservice/service/templates/consent.mako:81
msgid "No, cancel"
msgstr ""

#: src/cmservice/service/templates/consent.mako:104
#: src/cmservice/service/templates/consent.mako:112
msgid "No attributes where selected which equals no consent where given"
msgstr ""

Expand Down
Binary file added src/cmservice/service/site/static/InAcademia.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.