Rewrite TG integration, support for other webhooks

This commit is contained in:
Aarni Halinen
2022-01-13 00:05:02 +02:00
parent 6f316401f7
commit 4a530826a8
15 changed files with 461 additions and 258 deletions
+140 -90
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-18 21:36+0200\n"
"POT-Creation-Date: 2022-01-12 23:55+0200\n"
"PO-Revision-Date: 2017-11-02 23:09+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -37,7 +37,7 @@ msgstr "Sössö articles"
msgid "Today's lunch"
msgstr ""
#: infoscreen/models.py:212 webapp/models.py:70
#: infoscreen/models.py:212 webapp/models.py:73
msgid "Events"
msgstr "Events"
@@ -112,8 +112,8 @@ msgstr "Preview"
msgid "Delete"
msgstr "Delete"
#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:62
#: kaehmy/templates/list.html:36 webapp/models.py:144 webapp/models.py:173
#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:57
#: kaehmy/templates/list.html:36 webapp/models.py:147 webapp/models.py:176
msgid "Name"
msgstr "Name"
@@ -189,7 +189,7 @@ msgstr "Phone number (not public)"
msgid "Custom roles"
msgstr "Custom roles"
#: kaehmy/forms.py:49 kaehmy/templates/kaehmy.html:43
#: kaehmy/forms.py:49 kaehmy/templates/kaehmy.html:42
msgid "Preset roles"
msgstr "Preset roles"
@@ -201,156 +201,148 @@ msgstr "Invalid phone number"
msgid "Custom role with the same name already exists."
msgstr "Custom role with the same name already exists."
#: kaehmy/models.py:18
#: kaehmy/models.py:13
msgid "Kaehmy"
msgstr "Kaehmy"
#: kaehmy/models.py:25
#: kaehmy/models.py:20
msgid "Corporate affairs"
msgstr "Corporate affairs"
#: kaehmy/models.py:26 webapp/templates/freshmen.html:10
#: kaehmy/models.py:21 webapp/templates/freshmen.html:10
#: webapp/templates/navigation.html:8
msgid "Freshmen"
msgstr "Freshmen"
#: kaehmy/models.py:27 webapp/templates/international.html:10
#: kaehmy/models.py:22 webapp/templates/international.html:10
#: webapp/templates/navigation.html:14
msgid "International"
msgstr "International"
#: kaehmy/models.py:28
#: kaehmy/models.py:23
msgid "External affairs"
msgstr "External affairs"
#: kaehmy/models.py:29
#: kaehmy/models.py:24
msgid "Media"
msgstr ""
#: kaehmy/models.py:30
#: kaehmy/models.py:25
msgid "Technology"
msgstr ""
#: kaehmy/models.py:31
#: kaehmy/models.py:26
msgid "Wellbeing"
msgstr ""
#: kaehmy/models.py:32
#: kaehmy/models.py:27
msgid "Elepaja"
msgstr ""
#: kaehmy/models.py:33
#: kaehmy/models.py:28
msgid "Ceremonies"
msgstr ""
#: kaehmy/models.py:34
#: kaehmy/models.py:29
msgid "Studies"
msgstr ""
#: kaehmy/models.py:35
#: kaehmy/models.py:30
msgid "Sössö magazine"
msgstr "Sössö magazine"
#: kaehmy/models.py:36
#: kaehmy/models.py:31
msgid "Alumni relations"
msgstr "Alumni relations"
#: kaehmy/models.py:37
#: kaehmy/models.py:32
msgid "Others"
msgstr ""
#: kaehmy/models.py:39
#: kaehmy/models.py:34
msgid "Category"
msgstr ""
#: kaehmy/models.py:45
#: kaehmy/models.py:40
msgid "Description"
msgstr "Description"
#: kaehmy/models.py:48
#: kaehmy/models.py:43
msgid "Preset kaehmy role"
msgstr "Preset kaehmy role"
#: kaehmy/models.py:49
#: kaehmy/models.py:44
msgid "Preset kaehmy roles"
msgstr "Preset kaehmy roles"
#: kaehmy/models.py:56
#: kaehmy/models.py:51
msgid "Custom kaehmy role"
msgstr "Custom kaehmy role"
#: kaehmy/models.py:57
#: kaehmy/models.py:52
msgid "Custom kaehmy roles"
msgstr "Custom kaehmy roles"
#: kaehmy/models.py:63 kaehmy/templates/list.html:40 members/models.py:14
#: kaehmy/models.py:58 kaehmy/templates/list.html:40 members/models.py:14
msgid "Email"
msgstr "Email"
#: kaehmy/models.py:64
#: kaehmy/models.py:59
msgid "Timestamp"
msgstr ""
#: kaehmy/models.py:78
#: kaehmy/models.py:73
msgid "Kaehmykommentti"
msgstr "Kaehmy comment"
#: kaehmy/models.py:79
#: kaehmy/models.py:74
msgid "Kaehmykommentit"
msgstr "Kaehmy comments"
#: kaehmy/models.py:81 ohlhafv/models.py:36
#: kaehmy/models.py:76 ohlhafv/models.py:36
msgid "Message"
msgstr ""
#: kaehmy/models.py:100 kaehmy/templates/kaehmy.html:12
#: kaehmy/models.py:95 kaehmy/templates/kaehmy.html:12
msgid "Kaehmylomake"
msgstr "Kaehmy application"
#: kaehmy/models.py:101
#: kaehmy/models.py:96
msgid "Kaehmylomakkeet"
msgstr "Kaehmy applications"
#: kaehmy/models.py:104
#: kaehmy/models.py:99
msgid "Phone number"
msgstr ""
#: kaehmy/models.py:105
#: kaehmy/models.py:100
msgid "Year"
msgstr ""
#: kaehmy/models.py:106
#: kaehmy/models.py:101
msgid "Text"
msgstr ""
#: kaehmy/models.py:108
#: kaehmy/models.py:103
msgid "Custom role name"
msgstr ""
#: kaehmy/models.py:110 webapp/models.py:174
#: kaehmy/models.py:105 webapp/models.py:177
msgid "Board member"
msgstr "Board member"
#: kaehmy/models.py:118
#: kaehmy/models.py:113
msgid "Kaehmy application: {}"
msgstr "Kaehmy application: {}"
#: kaehmy/models.py:140
#: kaehmy/models.py:135
msgid "Board: {}"
msgstr ""
#: kaehmy/models.py:146
#: kaehmy/models.py:141
msgid "Official: {}"
msgstr ""
#: kaehmy/models.py:163
msgid "Telegram channel"
msgstr ""
#: kaehmy/models.py:164
msgid "Telegram channels"
msgstr ""
#: kaehmy/tables.py:13
msgid "Roles"
msgstr ""
@@ -427,31 +419,36 @@ msgid "Päivämääriä & deadlineja"
msgstr "Dates and deadlines"
#: kaehmy/templates/kaehmy.html:31
msgid "Hallitustyrkkypaneeli"
msgstr "Panel for board applicants"
#, fuzzy
#| msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
msgid "Vaalikokous, osa 1 (puheenjohtajan valinta) ja hallitustyrkkypaneeli"
msgstr "Election meeting, part 1 (chairman election)"
#: kaehmy/templates/kaehmy.html:32
msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
msgstr "Election meeting, part 1 (chairman election)"
msgid "Vaalikokous, osa 2 (hallituksen valinta)"
msgstr "Election meeting, part 2 (board election)"
#: kaehmy/templates/kaehmy.html:33
msgid "Toimikunta-appro"
msgstr "Guild committee crawl"
#: kaehmy/templates/kaehmy.html:34
msgid "Vaalikokous, osa 2 (hallituksen valinta)"
msgstr "Election meeting, part 2 (board election)"
#: kaehmy/templates/kaehmy.html:35
msgid "Vaalikokous, osa 3 (toimarien valinta)"
msgstr "Election meeting, part 3 (non-board election)"
#: kaehmy/templates/kaehmy.html:78
#, python-format
#: kaehmy/templates/kaehmy.html:77
#, fuzzy, python-format
#| msgid ""
#| "\n"
#| " Hyväksyn <a href=\"https://sik.ayy.fi/files/official/"
#| "Tietosuojaseloste%%20%%E2%%80%%93%%20Toimihenkil%%C3%%B6ksi%%20hakemisen"
#| "%%20rekisteri.pdf\" target=\"_blank\">tietosuojaselosteen</a> ja "
#| "tietojeni tallentamisen.\n"
#| " "
msgid ""
"\n"
" Hyväksyn <a href=\"https://sik.ayy.fi/files/official/"
"Tietosuojaseloste%%20%%E2%%80%%93%%20Toimihenkil%%C3%%B6ksi%%20hakemisen"
" Hyväksyn <a href=\"https://static.sahkoinsinoorikilta.fi/"
"GDPR/Tietosuojaseloste%%20%%23U2013%%20Toimihenkil%%23U00f6ksi%%20hakemisen"
"%%20rekisteri.pdf\" target=\"_blank\">tietosuojaselosteen</a> ja tietojeni "
"tallentamisen.\n"
" "
@@ -463,7 +460,7 @@ msgstr ""
"of personal data.\n"
" "
#: kaehmy/templates/kaehmy.html:84 members/templates/settings.html:23
#: kaehmy/templates/kaehmy.html:83 members/templates/settings.html:23
msgid "Submit"
msgstr "Submit"
@@ -639,12 +636,16 @@ msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
msgstr "Amazing! Your membership application has been sent."
#: members/templates/application_success.html:9
#, fuzzy
#| msgid ""
#| "Vahvistusviesti on lähetetty sähköpostiisi. Ota yhteyttä "
#| "admin@sahkoinsinoorikilta.fi.fi jos viestiä ei näy."
msgid ""
"Vahvistusviesti on lähetetty sähköpostiisi. Ota yhteyttä admin@sahkoinsinoorikilta.fi."
"fi jos viestiä ei näy."
"Vahvistusviesti on lähetetty sähköpostiisi. Ota yhteyttä "
"admin@sahkoinsinoorikilta.fi jos viestiä ei näy."
msgstr ""
"Confirmation email is sent to given email address. Contact admin@sahkoinsinoorikilta.fi."
"fi if you didn't receive it."
"Confirmation email is sent to given email address. Contact "
"admin@sahkoinsinoorikilta.fi.fi if you didn't receive it."
#: members/templates/application_success.html:10
msgid "Takaisin Sähköinsinöörikillan web-sivuille"
@@ -914,11 +915,11 @@ msgstr "Payments in register:"
msgid "Language"
msgstr "Language"
#: members/templates/settings.html:20 sikweb/base.py:217
#: members/templates/settings.html:20 sikweb/base.py:216
msgid "Finnish"
msgstr "Finnish"
#: members/templates/settings.html:21 sikweb/base.py:218
#: members/templates/settings.html:21 sikweb/base.py:217
msgid "English"
msgstr "English"
@@ -1100,7 +1101,9 @@ msgid "Challenge"
msgstr "Challenge"
#: ohlhafv/views.py:44
msgid "Sinut on haastettu Øhlhäfviin!"
#, fuzzy
#| msgid "Sinut on haastettu Øhlhäfviin!"
msgid "Sinut on haastettu Ohlhäfviin!"
msgstr "You have been challenged at Ohlhafv!"
#: templates/admin/base_site.html:44
@@ -1112,91 +1115,135 @@ msgstr "Go"
msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
#: webapp/models.py:18
#: webapp/models.py:21
msgid "Webapp"
msgstr "Webapp"
#: webapp/models.py:26
#: webapp/models.py:29
msgid "Tag"
msgstr "Tag"
#: webapp/models.py:27
#: webapp/models.py:30
msgid "Tags"
msgstr "Tags"
#: webapp/models.py:34
#: webapp/models.py:37
msgid "Tag: {}"
msgstr "Tag: {}"
#: webapp/models.py:52
#: webapp/models.py:55
msgid "Feed"
msgstr ""
#: webapp/models.py:53
#: webapp/models.py:56
msgid "Feeds"
msgstr ""
#: webapp/models.py:61 webapp/models.py:80 webapp/models.py:119
#: webapp/models.py:152 webapp/models.py:198
#: webapp/models.py:64 webapp/models.py:83 webapp/models.py:122
#: webapp/models.py:155 webapp/models.py:201
msgid "Deleted: "
msgstr "Deleted: "
#: webapp/models.py:62
#: webapp/models.py:65
msgid "{}Feed: {}"
msgstr ""
#: webapp/models.py:69
#: webapp/models.py:72
msgid "Event"
msgstr ""
#: webapp/models.py:81
#: webapp/models.py:84
msgid "{}Event: {}"
msgstr ""
#: webapp/models.py:91
#: webapp/models.py:93
msgid "Template question"
msgstr ""
#: webapp/models.py:92
#: webapp/models.py:94
msgid "Template questions"
msgstr ""
#: webapp/models.py:98
#: webapp/models.py:101
msgid "Template questions: {}"
msgstr ""
#: webapp/models.py:105
#: webapp/models.py:108
msgid "Signup form"
msgstr ""
#: webapp/models.py:106
#: webapp/models.py:109
msgid "Signup forms"
msgstr ""
#: webapp/models.py:120
#: webapp/models.py:123
msgid "#{} {}{}"
msgstr ""
#: webapp/models.py:138
#: webapp/models.py:141
msgid "Sign-up"
msgstr ""
#: webapp/models.py:139
#: webapp/models.py:142
msgid "Sign-ups"
msgstr ""
#: webapp/models.py:178
#: webapp/models.py:181
msgid "board member"
msgstr "board member"
#: webapp/models.py:185
#: webapp/models.py:188
msgid "JobAd"
msgstr ""
#: webapp/models.py:186
#: webapp/models.py:189
msgid "JobAds"
msgstr ""
#: webapp/models.py:211
#, fuzzy
#| msgid "Kaehmy"
msgid "Hook Kaehmys"
msgstr "Kaehmy"
#: webapp/models.py:212
#, fuzzy
#| msgid "Total challenges:"
msgid "Hook Ohlhafv challenges"
msgstr "Total challenges:"
#: webapp/models.py:213
msgid "Hook published news"
msgstr ""
#: webapp/models.py:214
msgid "Hook published Job Ads"
msgstr ""
#: webapp/models.py:215
msgid "Hook published events"
msgstr ""
#: webapp/models.py:216
msgid "Hook opened signups"
msgstr ""
#: webapp/models.py:241
msgid "Webhook"
msgstr ""
#: webapp/models.py:242
msgid "Webhooks"
msgstr ""
#: webapp/models.py:256
msgid "Telegram channel"
msgstr ""
#: webapp/models.py:257
msgid "Telegram channels"
msgstr ""
#: webapp/templates/contact.html:9 webapp/templates/navigation.html:20
msgid "Contact"
msgstr "Contact"
@@ -1240,3 +1287,6 @@ msgstr "Sössö"
#: webapp/templates/navigation.html:24
msgid "Corporate"
msgstr "Corporate"
#~ msgid "Hallitustyrkkypaneeli"
#~ msgstr "Panel for board applicants"