diff --git a/README.md b/README.md index 0e25d3a38..d007957b7 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,17 @@ sudo pacman -S tor python-pip python-pysocks python-cryptography \ sudo pip3 install pyqrcode pypng ``` +One package needs to be built manually from the Arch User Repository (AUR), since it is not included in the usual repositories. + +``` bash +su - epicyon +cd /tmp +git clone https://aur.archlinux.org/python-django-timezone-field.git +cd python-django-timezone-field.git +makepkg -sir +exit +``` + Or on Debian: ``` bash diff --git a/daemon.py b/daemon.py index 371764ef7..ddd6d46a3 100644 --- a/daemon.py +++ b/daemon.py @@ -6357,6 +6357,31 @@ class PubServer(BaseHTTPRequestHandler): set_config_param(base_dir, 'customSubmitText', '') + # change registrations open status + registrations_open = False + if self.server.registration or \ + get_config_param(base_dir, + "registration") == 'open': + registrations_open = True + if fields.get('regOpen'): + if fields['regOpen'] != registrations_open: + registrations_open = fields['regOpen'] + set_config_param(base_dir, 'registration', + 'open') + remaining = \ + get_config_param(base_dir, + 'registrationsRemaining') + if not remaining: + set_config_param(base_dir, + 'registrationsRemaining', + 10) + self.server.registration = True + else: + if registrations_open: + set_config_param(base_dir, 'registration', + 'closed') + self.server.registration = False + # libretranslate URL curr_libretranslate_url = \ get_config_param(base_dir, diff --git a/translations/ar.json b/translations/ar.json index 7fdaffb60..cb073f2fa 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -605,5 +605,6 @@ "Reverse timelines": "عكس الجداول الزمنية", "Moved": "انتقل", "Move": "يتحرك", - "Inactive": "غير نشط" + "Inactive": "غير نشط", + "Registrations open": "التسجيلات مفتوحة" } diff --git a/translations/bn.json b/translations/bn.json index 17e35a662..1e5a95861 100644 --- a/translations/bn.json +++ b/translations/bn.json @@ -605,5 +605,6 @@ "Reverse timelines": "বিপরীত সময়রেখা", "Moved": "সরানো হয়েছে", "Move": "সরান", - "Inactive": "নিষ্ক্রিয়" + "Inactive": "নিষ্ক্রিয়", + "Registrations open": "রেজিস্ট্রেশন খোলা" } diff --git a/translations/ca.json b/translations/ca.json index 0ea9bf927..2c83416d2 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -605,5 +605,6 @@ "Reverse timelines": "Cronologia inversa", "Moved": "Mogut", "Move": "Moure's", - "Inactive": "Inactiu" + "Inactive": "Inactiu", + "Registrations open": "Inscripcions obertes" } diff --git a/translations/cy.json b/translations/cy.json index 2e9e04e3c..aba268b6b 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -605,5 +605,6 @@ "Reverse timelines": "Gwrthdroi llinellau amser", "Moved": "Wedi symud", "Move": "Symud", - "Inactive": "Anactif" + "Inactive": "Anactif", + "Registrations open": "Cofrestriadau yn agor" } diff --git a/translations/de.json b/translations/de.json index 5c7b7edad..e86dea7e3 100644 --- a/translations/de.json +++ b/translations/de.json @@ -605,5 +605,6 @@ "Reverse timelines": "Umgekehrte Zeitlinien", "Moved": "Gerührt", "Move": "Bewegen", - "Inactive": "Inaktiv" + "Inactive": "Inaktiv", + "Registrations open": "Anmeldungen geöffnet" } diff --git a/translations/el.json b/translations/el.json index e461d7db2..88ca7ddf1 100644 --- a/translations/el.json +++ b/translations/el.json @@ -605,5 +605,6 @@ "Reverse timelines": "Αντίστροφα χρονοδιαγράμματα", "Moved": "Μετακινήθηκε", "Move": "Κίνηση", - "Inactive": "Αδρανής" + "Inactive": "Αδρανής", + "Registrations open": "Οι εγγραφές ανοίγουν" } diff --git a/translations/en.json b/translations/en.json index eced2c68a..47e180c3d 100644 --- a/translations/en.json +++ b/translations/en.json @@ -605,5 +605,6 @@ "Reverse timelines": "Reverse timelines", "Moved": "Moved", "Move": "Move", - "Inactive": "Inactive" + "Inactive": "Inactive", + "Registrations open": "Registrations open" } diff --git a/translations/es.json b/translations/es.json index 67e1d8494..dae665131 100644 --- a/translations/es.json +++ b/translations/es.json @@ -605,5 +605,6 @@ "Reverse timelines": "Líneas de tiempo inversas", "Moved": "Movida", "Move": "Muevete", - "Inactive": "Αδρανής" + "Inactive": "Αδρανής", + "Registrations open": "Inscripciones abiertas" } diff --git a/translations/fa.json b/translations/fa.json index cee03a88d..c8b7935cc 100644 --- a/translations/fa.json +++ b/translations/fa.json @@ -605,5 +605,6 @@ "Reverse timelines": "جدول های زمانی معکوس", "Moved": "منتقل شد", "Move": "حرکت", - "Inactive": "غیر فعال" + "Inactive": "غیر فعال", + "Registrations open": "ثبت نام ها باز شد" } diff --git a/translations/fr.json b/translations/fr.json index fd4685774..2bfd5a2b6 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -605,5 +605,6 @@ "Reverse timelines": "Chronologies inversées", "Moved": "Déplacée", "Move": "Déplacer", - "Inactive": "Inactive" + "Inactive": "Inactive", + "Registrations open": "Inscriptions ouvertes" } diff --git a/translations/ga.json b/translations/ga.json index e6d63cfbc..64bad3a2d 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -605,5 +605,6 @@ "Reverse timelines": "Amlínte droim ar ais", "Moved": "Ar athraíodh a ionad", "Move": "Bog", - "Inactive": "Neamhghníomhach" + "Inactive": "Neamhghníomhach", + "Registrations open": "Clárúcháin oscailte" } diff --git a/translations/hi.json b/translations/hi.json index 053b98cbd..f4d1a21c6 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -605,5 +605,6 @@ "Reverse timelines": "रिवर्स टाइमलाइन", "Moved": "ले जाया गया", "Move": "कदम", - "Inactive": "निष्क्रिय" + "Inactive": "निष्क्रिय", + "Registrations open": "पंजीकरण खुले हैं" } diff --git a/translations/it.json b/translations/it.json index 037f6ba3c..3e3fa7b54 100644 --- a/translations/it.json +++ b/translations/it.json @@ -605,5 +605,6 @@ "Reverse timelines": "Invertire le tempistiche", "Moved": "Mosso", "Move": "Spostare", - "Inactive": "Non attivo" + "Inactive": "Non attivo", + "Registrations open": "Aperte le iscrizioni" } diff --git a/translations/ja.json b/translations/ja.json index 7e6c24107..8e61db1ee 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -605,5 +605,6 @@ "Reverse timelines": "逆タイムライン", "Moved": "移動しました", "Move": "動く", - "Inactive": "非活性" + "Inactive": "非活性", + "Registrations open": "登録開始" } diff --git a/translations/ko.json b/translations/ko.json index 9c1009e68..d22c86a55 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -605,5 +605,6 @@ "Reverse timelines": "역방향 타임라인", "Moved": "움직이는", "Move": "이동하다", - "Inactive": "비활성" + "Inactive": "비활성", + "Registrations open": "등록 시작" } diff --git a/translations/ku.json b/translations/ku.json index e7d793c11..8e06ce13f 100644 --- a/translations/ku.json +++ b/translations/ku.json @@ -605,5 +605,6 @@ "Reverse timelines": "Reverse timelines", "Moved": "Moved", "Move": "Barkirin", - "Inactive": "Bêkar" + "Inactive": "Bêkar", + "Registrations open": "Qeydkirin vedibin" } diff --git a/translations/nl.json b/translations/nl.json index b9395c1b6..49eaba2fa 100644 --- a/translations/nl.json +++ b/translations/nl.json @@ -605,5 +605,6 @@ "Reverse timelines": "Omgekeerde tijdlijnen", "Moved": "Verhuisd", "Move": "Beweging", - "Inactive": "Inactief" + "Inactive": "Inactief", + "Registrations open": "Inschrijvingen geopend" } diff --git a/translations/oc.json b/translations/oc.json index 80932cde5..5572e2506 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -601,5 +601,6 @@ "Reverse timelines": "Reverse timelines", "Moved": "Moved", "Move": "Move", - "Inactive": "Inactive" + "Inactive": "Inactive", + "Registrations open": "Registrations open" } diff --git a/translations/pl.json b/translations/pl.json index 6f90633c6..42c544efd 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -605,5 +605,6 @@ "Reverse timelines": "Odwróć ramy czasowe", "Moved": "Przeniósł", "Move": "Przenosić", - "Inactive": "Nieaktywny" + "Inactive": "Nieaktywny", + "Registrations open": "Rejestracje otwarte" } diff --git a/translations/pt.json b/translations/pt.json index e0c19ea9a..0db41d52c 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -605,5 +605,6 @@ "Reverse timelines": "Cronogramas reversos", "Moved": "Mudou-se", "Move": "Jogada", - "Inactive": "Inativa" + "Inactive": "Inativa", + "Registrations open": "inscrições abertas" } diff --git a/translations/ru.json b/translations/ru.json index 470d07b7f..b72156492 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -605,5 +605,6 @@ "Reverse timelines": "Обратные сроки", "Moved": "Взолнованный", "Move": "Шаг", - "Inactive": "Неактивный" + "Inactive": "Неактивный", + "Registrations open": "Регистрация открыта" } diff --git a/translations/sw.json b/translations/sw.json index 47a64cf34..803a9c94c 100644 --- a/translations/sw.json +++ b/translations/sw.json @@ -605,5 +605,6 @@ "Reverse timelines": "Обратные сроки", "Moved": "Imehamishwa", "Move": "Sogeza", - "Inactive": "Isiyotumika" + "Inactive": "Isiyotumika", + "Registrations open": "Usajili umefunguliwa" } diff --git a/translations/tr.json b/translations/tr.json index 6ddeffb9b..65c5979b8 100644 --- a/translations/tr.json +++ b/translations/tr.json @@ -605,5 +605,6 @@ "Reverse timelines": "Обратные сроки", "Moved": "Etkilenmiş", "Move": "Hareket", - "Inactive": "etkin değil" + "Inactive": "etkin değil", + "Registrations open": "kayıtlar açık" } diff --git a/translations/uk.json b/translations/uk.json index cb3478733..c928533b4 100644 --- a/translations/uk.json +++ b/translations/uk.json @@ -605,5 +605,6 @@ "Reverse timelines": "Обратные сроки", "Moved": "Переїхав", "Move": "рухатися", - "Inactive": "Неактивний" + "Inactive": "Неактивний", + "Registrations open": "Реєстрація відкрита" } diff --git a/translations/yi.json b/translations/yi.json index ab2ddb7cd..26900cdc6 100644 --- a/translations/yi.json +++ b/translations/yi.json @@ -605,5 +605,6 @@ "Reverse timelines": "פאַרקערט טיימליינז", "Moved": "אריבערגעפארן", "Move": "מאַך", - "Inactive": "ינאַקטיוו" + "Inactive": "ינאַקטיוו", + "Registrations open": "רעדזשיסטריישאַנז עפענען" } diff --git a/translations/zh.json b/translations/zh.json index 672144b6e..c151df615 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -605,5 +605,6 @@ "Reverse timelines": "倒转时间线", "Moved": "אריבערגעפארן", "Move": "移动", - "Inactive": "无效" + "Inactive": "无效", + "Registrations open": "注册开放" } diff --git a/webapp_calendar.py b/webapp_calendar.py index cca3a6228..fc8ed42c8 100644 --- a/webapp_calendar.py +++ b/webapp_calendar.py @@ -595,10 +595,11 @@ def html_calendar(person_cache: {}, translate: {}, html_keyboard_navigation(text_mode_banner, nav_links, nav_access_keys, month_name) + # '?month=' + str(month_number) + ';year=' + str(year) + \ new_event_str = \ '
\n

\n' + \ - '➕ ' + \ + '➕ ' + \ translate['Add to the calendar'] + '\n

\n
\n' calendar_icon_str = \ diff --git a/webapp_login.py b/webapp_login.py index 61b0b352c..fe0057377 100644 --- a/webapp_login.py +++ b/webapp_login.py @@ -130,7 +130,12 @@ def html_login(translate: {}, # show the register button register_button_str = '' if get_config_param(base_dir, 'registration') == 'open': - if int(get_config_param(base_dir, 'registrationsRemaining')) > 0: + remaining = 0 + if get_config_param(base_dir, 'registrationsRemaining'): + remaining = get_config_param(base_dir, 'registrationsRemaining') + if isinstance(remaining, str): + remaining = int(remaining) + if remaining > 0: if accounts > 0: idx = 'Welcome. Please login or register a new account.' login_text = \ diff --git a/webapp_profile.py b/webapp_profile.py index bfcac1048..ffd73368d 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -1565,8 +1565,15 @@ def _html_edit_profile_instance(base_dir: str, translate: {}, ' ' + \ '
\n' + \ - '