Skip to content

Commit 74d5d7e

Browse files
committed
small change
1 parent ceef821 commit 74d5d7e

File tree

4 files changed

+37
-8
lines changed

4 files changed

+37
-8
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ node_modules
2020
dovenv2
2121
etsd/branding*
2222
client/node_modules
23-
ldap_conf.py
23+
ldap_conf.py

etsd/core/views.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def form_valid(self, form):
7171
email_body = send_mail_body(
7272
"core/emails/edited_users.txt",
7373
dict(
74-
action = "added",
74+
action = _("added"),
7575
authority=auth,
7676
action_user = self.request.user,
7777
),
@@ -80,29 +80,29 @@ def form_valid(self, form):
8080
subject=_("Added as user in ETSD"),
8181
message=email_body,
8282
from_email="[email protected]",
83-
recipient_list=[usr.email for usr in added_users],
83+
recipient_list=[usr.email for usr in added_users if usr.email],
8484
fail_silently=False,
8585
)
8686
if removed_users:
8787
email_body = send_mail_body(
8888
"core/emails/edited_users.txt",
8989
dict(
90-
action = "removed",
90+
action = _("removed"),
9191
authority=auth,
9292
action_user = self.request.user,
9393
),
9494
)
9595
send_mail(
96-
subject=_("Added as user in ETSD"),
96+
subject=_("Removed as a user in ETSD"),
9797
message=email_body,
9898
from_email="[email protected]",
99-
recipient_list=[usr.email for usr in removed_users],
99+
recipient_list=[usr.email for usr in removed_users if usr.email],
100100
fail_silently=False,
101101
)
102102
uml = UserManagementLog()
103103
uml.authority = auth
104-
uml.added_users = str(added_users)
105-
uml.removed_users = str(removed_users)
104+
uml.added_users = ', '.join(usr.username for usr in added_users)
105+
uml.removed_users = ', '.join(usr.username for usr in removed_users)
106106
uml.save()
107107

108108
messages.add_message(

locale/el/LC_MESSAGES/django.mo

801 Bytes
Binary file not shown.

locale/el/LC_MESSAGES/django.po

+29
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,22 @@ msgstr ""
478478
msgid "Authority Data successfully updated!"
479479
msgstr "Οι Πληροφορίες Υπηρεσίας ενημερώθηκαν επιτυχώς!"
480480

481+
#: .\etsd\core\views.py:74
482+
msgid "added"
483+
msgstr "προστεθεί"
484+
485+
#: .\etsd\core\views.py:80
486+
msgid "Added as user in ETSD"
487+
msgstr "Προστεθήκατε ως χρήστης στην Εφαρμογή Ανταλλαγής Ευαίσθητων Δεδομένων"
488+
489+
#: .\etsd\core\views.py:90
490+
msgid "removed"
491+
msgstr "αφαιρεθεί"
492+
493+
#: .\etsd\core\views.py:96
494+
msgid "Removed as a user in ETSD"
495+
msgstr "Αφαιρεθήκατε από χρήστης στην Εφαρμογή Ανταλλαγής Ευαίσθητων Δεδομένων"
496+
481497
#: .\etsd\core\views.py:82
482498
msgid "This user is not associated with any authority!"
483499
msgstr "Ο χρήστης δεν έχει Υπηρεσία."
@@ -607,6 +623,19 @@ msgstr ""
607623
"σε %(status)s από κάποιον διαχειριστή.\n"
608624
" "
609625

626+
#: .\etsd\core\templates\core\emails\edited_users.txt:4
627+
#, python-format
628+
msgid ""
629+
" \n"
630+
" You have been %(action)s as user of authority %(authority)s by %(action_user)s"
631+
" in the Electronic Transmission of Sensitive Data app."
632+
" "
633+
msgstr ""
634+
" \n"
635+
" Έχετε %(action)s ως χρήστης στην Υπηρεσία %(authority)s από τον χρήστη %(action_user)s"
636+
" στην Εφαρμογή Ανταλλαγής Ευαίσθητων Δεδομένων."
637+
" "
638+
610639
#: .\etsd\keys\templates\keys\key_pair_create.html:9
611640
#: .\etsd\keys\templates\keys\key_pair_create.html:10
612641
msgid "Create new key pair"

0 commit comments

Comments
 (0)