Merge branch 'master' of https://git.ik.bme.hu/circle3/cloud

130e136d · Karsa Zoltán István · dc4d4e55 · 4d2c281d · 130e136d · 130e136d
Commit 130e136d authored Oct 01, 2022 by Karsa Zoltán István
Hide whitespace changes
Inline Side-by-side

Showing with 51 additions and 16 deletions

circle/circle/settings/base.py
+5 -2

circle/dashboard/forms.py
+2 -1

circle/dashboard/views/user.py
+2 -2

circle/locale/hu/LC_MESSAGES/django.po
+42 -11

No files found.
--- a/circle/circle/settings/base.py
+++ b/circle/circle/settings/base.py
@@ -443,9 +443,12 @@ LOGGING = {
           'level': 'INFO',
           'class': 'logging.handlers.SysLogHandler',
           'formatter': 'simple',
-           'address': '/var/run/syslog',
+            #'address': '/var/log/syslog',
            # 'socktype': SOCK_STREAM,
-            # 'address': ('host', '514'),
+            # to local syslogd:udp
+            #'address': ('127.0.0.1', 514),
+            # to local syslogd:file (ubuntu)
+            'address': '/dev/log',
        }
    },
    'loggers': {

--- a/circle/dashboard/forms.py
+++ b/circle/dashboard/forms.py
@@ -1433,7 +1433,7 @@ class AclUserOrGroupAddForm(forms.Form):
 class TransferOwnershipForm(forms.Form):
-    name = autocomplete.Select2ListChoiceField(
+    name = autocomplete.Select2ListCreateChoiceField(
        widget=autocomplete.ListSelect2(
            url='autocomplete.acl.user',
            attrs={'class': 'form-control',
@@ -1442,6 +1442,7 @@ class TransferOwnershipForm(forms.Form):
        label=_("E-mail address or identifier of user"))
 class AddGroupMemberForm(forms.Form):
    new_member = autocomplete.Select2ListChoiceField(
        widget=autocomplete.ListSelect2(

--- a/circle/dashboard/views/user.py
+++ b/circle/dashboard/views/user.py
@@ -629,7 +629,7 @@ class EnableTwoFactorView(LoginRequiredMixin, UpdateView):
        return super(EnableTwoFactorView, self).dispatch(*args, **kwargs)
    def get_object(self, queryset=None):
-        if self.request.user.is_anonymous():
+        if self.request.user.is_anonymous:
            raise PermissionDenied
        return self.request.user.profile
@@ -649,7 +649,7 @@ class DisableTwoFactorView(LoginRequiredMixin, FormView):
    success_url = reverse_lazy("dashboard.views.profile-preferences")
    def get_profile(self, queryset=None):
-        if self.request.user.is_anonymous():
+        if self.request.user.is_anonymous:
            raise PermissionDenied
        return self.request.user.profile

--- a/circle/locale/hu/LC_MESSAGES/django.po
+++ b/circle/locale/hu/LC_MESSAGES/django.po
@@ -483,12 +483,12 @@ msgstr "Példány limit"
 #: dashboard/forms.py:1390
 msgid "Two-factor authentication secret"
-msgstr ""
+msgstr "Kétfaktoros azonosítás kulcs"
 #: dashboard/forms.py:1391
 msgid ""
 "Remove the secret key to disable two-factor authentication for this user."
-msgstr ""
+msgstr "Törölje a titkos kulcsot a kétfaktoros azonosítás kikapcsolásához."
 #: dashboard/forms.py:1432 dashboard/templates/dashboard/lease-edit.html:86
 msgid "Name of group or user"
@@ -573,11 +573,11 @@ msgstr "Befejezési időpont"
 #: dashboard/forms.py:1796
 msgid "Two-factor authentication passcode"
-msgstr ""
+msgstr "Kétfaktoros azonosító kód"
 #: dashboard/forms.py:1797
 msgid "Get the code from your authenticator."
-msgstr ""
+msgstr "Adja meg az authentikátor alkalmazás kódját."
 #: dashboard/forms.py:1808
 #, fuzzy
@@ -699,17 +699,23 @@ msgstr "E-mail értesítések"
 msgid "Whether user wants to get digested email notifications."
 msgstr "A felhasználó kéri-e tömbösített e-mail értesítések küldését."
+<<<<<<< HEAD
 #: dashboard/models.py:204
 #, fuzzy
 #| msgid "Latest modifications"
+=======
+#: dashboard/models.py:195
+>>>>>>> 4d2c281d9c634f23b856d01444ee968725e6a018
 msgid "Desktop notifications"
-msgstr "Legutóbbi változások"
+msgstr "Asztali értesítések"
 #: dashboard/models.py:205
 msgid ""
 "Whether user wants to get desktop notification when an activity has finished "
 "and the window is not in focus."
 msgstr ""
+"Értesítések bekapcsolása, amikor egy tevékenység befejeződött és az ablak "
+"nincs a előtérben."
 #: dashboard/models.py:209
 msgid "Samba password"
@@ -729,7 +735,7 @@ msgstr "Lemezkvóta mebibyte-okban."
 #: dashboard/models.py:220
 msgid "two factor secret key"
-msgstr ""
+msgstr "kétfaktoros titkos kulcs"
 #: dashboard/models.py:284
 msgid "Can use autocomplete."
@@ -1549,7 +1555,7 @@ msgstr "Szerkesztés"
 #: dashboard/templates/dashboard/disable-two-factor.html:12
 msgid "Disable two-factor authentication"
-msgstr ""
+msgstr "Kétfaktoros azonosítás letiltása"
 #: dashboard/templates/dashboard/disable-two-factor.html:22
 #: dashboard/templates/dashboard/profile_form.html:35
@@ -1560,7 +1566,7 @@ msgstr "Tiltás"
 #: dashboard/templates/dashboard/enable-two-factor.html:11
 msgid "Enable two-factor authentication"
-msgstr ""
+msgstr "Kétfaktoros azonosítás engedélyezése"
 #: dashboard/templates/dashboard/enable-two-factor.html:15
 #, python-format
@@ -1576,6 +1582,16 @@ msgid ""
 "          </a>\n"
 "        "
 msgstr ""
+"\n"
+"          A Kétfaktoros azonosítás használatához töltse le Google "
+"Authenticator alkalmazást\n"
+"          és használja az alább QR kódot.\n"
+"          Ha segítségre van szüksége, látogassa meg a következő oldalt:\n"
+"          <a href=\"https://support.google.com/accounts/answer/1066447?hl="
+"%(lang)s\">\n"
+"            hivatalos oldal.\n"
+"          </a>\n"
+"        "
 #: dashboard/templates/dashboard/enable-two-factor.html:26
 #, fuzzy, python-format
@@ -1590,10 +1606,16 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"              Biztosan üríti a következőt: <strong>%(object)s</strong>?\n"
+"              Titkos kulcs: <strong>%(object)s</strong>?\n"
 "            "
 #: dashboard/templates/dashboard/enable-two-factor.html:38
+#, fuzzy
+#| msgid ""
+#| "            If you managed to set up the authenticator click enable to "
+#| "finalize two-factor\n"
+#| "            authentication for this account.\n"
+#| "            "
 msgid ""
 "\n"
 "            If you managed to set up the authenticator click enable to "
@@ -1601,6 +1623,9 @@ msgid ""
 "            authentication for this account.\n"
 "            "
 msgstr ""
+" Ha sikerült beállítani az authentikátor alkalmazást, kattintson az "
+"engedélyezésre            a hitelesítés véglegesítéséhez.\n"
+"            "
 #: dashboard/templates/dashboard/enable-two-factor.html:44
 #: dashboard/templates/dashboard/profile_form.html:44
@@ -2312,9 +2337,10 @@ msgstr "Jelszóváltoztatás"
 #: dashboard/templates/dashboard/profile_form.html:27
 #: templates/registration/two-factor-login.html:7
 msgid "Two-factor authentication"
-msgstr ""
+msgstr "Kétfaktoros azonosítás"
 #: dashboard/templates/dashboard/profile_form.html:29
+#, fuzzy
 msgid ""
 "\n"
 "                Two-factor authentication is currently enabled on your "
@@ -2322,8 +2348,11 @@ msgid ""
 "                click the button\n"
 "                "
 msgstr ""
+"A kétfaktoros azonosítás engedélyezve van a fiókjában, kikapcsoláshoz "
+"kattintson a gombra!"
 #: dashboard/templates/dashboard/profile_form.html:38
+#, fuzzy
 msgid ""
 "\n"
 "                Two-factor authentication is currently disabled on your "
@@ -2331,6 +2360,8 @@ msgid ""
 "                click the button\n"
 "                "
 msgstr ""
+"A kétfaktoros azonosítás engedélyezve van a fiókjában, kikapcsoláshoz "
+"kattintson a gombra!"
 #: dashboard/templates/dashboard/profile_form.html:51
 msgid "My preferences"
@@ -3587,7 +3618,7 @@ msgstr "A parancssablon létrehozásra került."
 #: dashboard/views/user.py:616
 msgid "Two-factor authentication is already enabled for your account."
-msgstr ""
+msgstr "A kétfaktoros azonosítás már engedélyezve van a fiókodban."
 #: dashboard/views/util.py:350
 msgid "Could not start operation."