# HG changeset patch
# User jbe
# Date 1611681553 -3600
# Node ID 202876945a6c25842d553aa37538d3874f938031
# Parent  c6883a7dce6146c65cc2db6cd84523a4b589d778# Parent  b4a377306a34af08549cb3c21f0dc59622b52e8e
merge

diff -r c6883a7dce61 -r 202876945a6c app/main/_layout/default.html
--- a/app/main/_layout/default.html	Mon Dec 14 18:06:06 2020 +0100
+++ b/app/main/_layout/default.html	Tue Jan 26 18:19:13 2021 +0100
@@ -161,6 +161,11 @@
       overflow: visible;
       display: block;
       margin-bottom: 16px;
+      border-radius: 5px;
+    }
+
+    .mdl-card__title {
+      border-radius: 5px 5px 0 0;
     }
 
     .mdl-card__fullwidth {
@@ -198,7 +203,7 @@
     .mdl-special-card {
       background: #fff;
       margin-bottom: 16px;
-      border-radius: 2px;
+      border-radius: 5px;
     }
 
     .mdl-navigation__head {
diff -r c6883a7dce61 -r 202876945a6c app/main/oauth2/token.lua
--- a/app/main/oauth2/token.lua	Mon Dec 14 18:06:06 2020 +0100
+++ b/app/main/oauth2/token.lua	Tue Jan 26 18:19:13 2021 +0100
@@ -254,8 +254,8 @@
   r.real_member_id = token.real_member_id  
 end
 
-if param.get("include_member", atom.boolean) then
-  if allowed_scopes.identification or allowed_scopes.authentication then
+if allowed_scopes.identification or allowed_scopes.authentication then
+  if param.get("include_member", atom.boolean) then
     local member = token.member
     r.member = json.object{
       id = member.id,
@@ -273,6 +273,14 @@
         r.real_member.identification = token.session.real_member.identification
       end
     end
+    if unit.attr.role and param.get("include_roles") then
+      r.roles = json.object()
+      if not unit.attr.only_visible_for_role 
+        or member:has_role(unit.attr.only_visible_for_role)
+      then
+        r.roles[unit.attr.role] = true
+      end
+    end
   end
 end
 
diff -r c6883a7dce61 -r 202876945a6c locale/translations.de.lua
--- a/locale/translations.de.lua	Mon Dec 14 18:06:06 2020 +0100
+++ b/locale/translations.de.lua	Tue Jan 26 18:19:13 2021 +0100
@@ -449,7 +449,7 @@
 ["Not a member"] = "Kein Mitglied";
 ["Not voted issues"] = "Nicht abgestimmt";
 ["Notification address unconfirmed"] = "E-Mail-Adresse für Benachrichtigungen unbestätigt";
-["Notification email"] = "E-Mail für Benachrichtigungs";
+["Notification email"] = "E-Mail für Benachrichtigungen";
 ["Notification level not set yet"] = "Benachrichtigungseinstellungen noch nicht vorgenommen";
 ["Notifications"] = "Benachrichtigungen";
 ["Number of incoming delegations, follow link to see more details"] = "Anzahl eingehender Delegationen, Link folgen für mehr Details";
@@ -1043,5 +1043,7 @@
 ["Cancelled accounts (#{count})"] = "Gesperrte Konten (#{count})";
 ["Rejected requests (#{count})"] = "Abgelehnte Anfragen (#{count})";
 ["show incoming delegations"] = "Eingehende Delegationen zeigen";
-
+["#{hours} hours"] = "#{hours} Stunden";
+["#{hours} minutes"] = "#{minutes} Minuten";
+["just now"] = "gerade eben";
 }