merge main into translation

Reviewed-on: #31

src/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: 2022-02-10 19:50+0100\n"
 "Last-Translator: Clément Hamada <clementhamada@pm.me>\n"
 "Language-Team: \n"
@@ -68,11 +68,26 @@ msgid "Website"
 msgstr "Webseite"
 
 #: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
+#, fuzzy
-msgid "Apply"
+#| msgid "Apply"
+msgid " Apply"
 msgstr "Anwenden"
 
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Account löschen"
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:70
 #: accounts/templates/accounts/profile.html:46
 #: ctfs/templates/ctfs/ctf_info.html:65 ctfs/templates/ctfs/ctfs_list.html:13
 #: events/templates/events/event_info.html:66
@@ -83,13 +98,15 @@ msgstr "Anwenden"
 msgid "Score"
 msgstr "Punktzahl"
 
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
 #: accounts/templates/accounts/profile.html:60
 msgid "Registered since"
 msgstr "Registriert seit"
 
-#: accounts/templates/accounts/edit.html:61
+#: accounts/templates/accounts/edit.html:84
-msgid "Delete my account"
+#, fuzzy
+#| msgid "Delete my account"
+msgid " Delete my account"
 msgstr "Meinen Account löschen"
 
 #: accounts/templates/accounts/login.html:13
@@ -463,6 +480,10 @@ msgstr "Maximale Mitgliederanzahl erreicht."
 msgid "Team password"
 msgstr "Teampasswort"
 
+#: events/templates/events/manage_team.html:29
+msgid "Apply"
+msgstr "Anwenden"
+
 #: events/templates/events/manage_team.html:44
 #: events/templates/events/team.html:49
 msgid "Members"
@@ -520,27 +541,27 @@ msgstr "Flaggen"
 msgid "Users"
 msgstr "Nutzer"
 
-#: project/settings.py:115
+#: project/settings.py:116
 msgid "English"
 msgstr "Englisch"
 
-#: project/settings.py:116
+#: project/settings.py:117
 msgid "German"
 msgstr "Deutsch"
 
-#: project/settings.py:117
+#: project/settings.py:118
 msgid "French"
 msgstr "Französisch"
 
-#: project/settings.py:118
+#: project/settings.py:119
 msgid "Russian"
 msgstr "Russisch"
 
-#: project/settings.py:119
+#: project/settings.py:120
 msgid "Japanese"
 msgstr ""
 
-#: project/settings.py:120
+#: project/settings.py:121
 msgid "Spanish"
 msgstr ""
 

src/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,11 +69,22 @@ msgid "Website"
 msgstr ""
 
 #: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
+msgid " Apply"
-msgid "Apply"
 msgstr ""
 
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+msgid "Connected accounts"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:70
 #: accounts/templates/accounts/profile.html:46
 #: ctfs/templates/ctfs/ctf_info.html:65 ctfs/templates/ctfs/ctfs_list.html:13
 #: events/templates/events/event_info.html:66
@@ -84,13 +95,13 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
 #: accounts/templates/accounts/profile.html:60
 msgid "Registered since"
 msgstr ""
 
-#: accounts/templates/accounts/edit.html:61
+#: accounts/templates/accounts/edit.html:84
-msgid "Delete my account"
+msgid " Delete my account"
 msgstr ""
 
 #: accounts/templates/accounts/login.html:13
@@ -460,6 +471,10 @@ msgstr ""
 msgid "Team password"
 msgstr ""
 
+#: events/templates/events/manage_team.html:29
+msgid "Apply"
+msgstr ""
+
 #: events/templates/events/manage_team.html:44
 #: events/templates/events/team.html:49
 msgid "Members"
@@ -513,27 +528,27 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: project/settings.py:115
+#: project/settings.py:116
 msgid "English"
 msgstr ""
 
-#: project/settings.py:116
+#: project/settings.py:117
 msgid "German"
 msgstr ""
 
-#: project/settings.py:117
+#: project/settings.py:118
 msgid "French"
 msgstr ""
 
-#: project/settings.py:118
+#: project/settings.py:119
 msgid "Russian"
 msgstr ""
 
-#: project/settings.py:119
+#: project/settings.py:120
 msgid "Japanese"
 msgstr ""
 
-#: project/settings.py:120
+#: project/settings.py:121
 msgid "Spanish"
 msgstr ""
 

src/locale/es/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: 2022-02-09 10:55+0100\n"
 "Last-Translator: Javier Uhagón (uhagontorralvojavier@gmail.com)\n"
 "Language-Team: \n"
@@ -69,11 +69,26 @@ msgid "Website"
 msgstr "Página Web"
 
 #: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
+#, fuzzy
-msgid "Apply"
+#| msgid "Apply"
+msgid " Apply"
 msgstr "Aplicar"
 
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "Borrar cuenta"
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:70
 #: accounts/templates/accounts/profile.html:46
 #: ctfs/templates/ctfs/ctf_info.html:65 ctfs/templates/ctfs/ctfs_list.html:13
 #: events/templates/events/event_info.html:66
@@ -84,13 +99,15 @@ msgstr "Aplicar"
 msgid "Score"
 msgstr "Puntuación"
 
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
 #: accounts/templates/accounts/profile.html:60
 msgid "Registered since"
 msgstr "Registrado desde"
 
-#: accounts/templates/accounts/edit.html:61
+#: accounts/templates/accounts/edit.html:84
-msgid "Delete my account"
+#, fuzzy
+#| msgid "Delete my account"
+msgid " Delete my account"
 msgstr "Borrar mi cuenta"
 
 #: accounts/templates/accounts/login.html:13
@@ -463,6 +480,10 @@ msgstr "Tamaño máximo alcanzado."
 msgid "Team password"
 msgstr "Contraseña del equipo"
 
+#: events/templates/events/manage_team.html:29
+msgid "Apply"
+msgstr "Aplicar"
+
 #: events/templates/events/manage_team.html:44
 #: events/templates/events/team.html:49
 msgid "Members"
@@ -520,27 +541,27 @@ msgstr "Flags"
 msgid "Users"
 msgstr "Usuarios"
 
-#: project/settings.py:115
+#: project/settings.py:116
 msgid "English"
 msgstr "Inglés"
 
-#: project/settings.py:116
+#: project/settings.py:117
 msgid "German"
 msgstr "Alemán"
 
-#: project/settings.py:117
+#: project/settings.py:118
 msgid "French"
 msgstr "Francés"
 
-#: project/settings.py:118
+#: project/settings.py:119
 msgid "Russian"
 msgstr "Ruso"
 
-#: project/settings.py:119
+#: project/settings.py:120
 msgid "Japanese"
 msgstr ""
 
-#: project/settings.py:120
+#: project/settings.py:121
 msgid "Spanish"
 msgstr ""
 

src/locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -73,11 +73,26 @@ msgid "Website"
 msgstr "Site internet"
 
 #: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
+#, fuzzy
-msgid "Apply"
+#| msgid "Apply"
+msgid " Apply"
 msgstr "Appliquer"
 
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+#, fuzzy
+#| msgid "Connected accounts"
+msgid "Connected accounts"
+msgstr "Comptes connectés"
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr "Déconnecter Discord"
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr "Connecter Discord"
+
+#: accounts/templates/accounts/edit.html:70
 #: accounts/templates/accounts/profile.html:46
 #: ctfs/templates/ctfs/ctf_info.html:65 ctfs/templates/ctfs/ctfs_list.html:13
 #: events/templates/events/event_info.html:66
@@ -88,15 +103,15 @@ msgstr "Appliquer"
 msgid "Score"
 msgstr "Score"
 
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
 #: accounts/templates/accounts/profile.html:60
 msgid "Registered since"
 msgstr "Inscrit depuis"
 
-#: accounts/templates/accounts/edit.html:61
+#: accounts/templates/accounts/edit.html:84
 #, fuzzy
 #| msgid "Connected accounts"
-msgid "Delete my account"
+msgid " Delete my account"
 msgstr "Comptes connectés"
 
 #: accounts/templates/accounts/login.html:13
@@ -484,6 +499,10 @@ msgstr "Taille maximale atteinte."
 msgid "Team password"
 msgstr "Mot de passe de l'équipe"
 
+#: events/templates/events/manage_team.html:29
+msgid "Apply"
+msgstr "Appliquer"
+
 #: events/templates/events/manage_team.html:44
 #: events/templates/events/team.html:49
 msgid "Members"
@@ -541,27 +560,27 @@ msgstr ""
 msgid "Users"
 msgstr "Pseudo"
 
-#: project/settings.py:115
+#: project/settings.py:116
 msgid "English"
 msgstr "Anglais"
 
-#: project/settings.py:116
+#: project/settings.py:117
 msgid "German"
 msgstr "Allemand"
 
-#: project/settings.py:117
+#: project/settings.py:118
 msgid "French"
 msgstr "Français"
 
-#: project/settings.py:118
+#: project/settings.py:119
 msgid "Russian"
 msgstr "Russe"
 
-#: project/settings.py:119
+#: project/settings.py:120
 msgid "Japanese"
 msgstr ""
 
-#: project/settings.py:120
+#: project/settings.py:121
 msgid "Spanish"
 msgstr ""
 
@@ -662,9 +681,3 @@ msgstr "Réinitialiser"
 
 #~ msgid "End at"
 #~ msgstr "Fin"
-
-#~ msgid "Disconnect Discord"
-#~ msgstr "Déconnecter Discord"
-
-#~ msgid "Connect Discord"
-#~ msgstr "Connecter Discord"

src/locale/it/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,11 +69,22 @@ msgid "Website"
 msgstr ""
 
 #: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
+msgid " Apply"
-msgid "Apply"
 msgstr ""
 
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+msgid "Connected accounts"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:70
 #: accounts/templates/accounts/profile.html:46
 #: ctfs/templates/ctfs/ctf_info.html:65 ctfs/templates/ctfs/ctfs_list.html:13
 #: events/templates/events/event_info.html:66
@@ -84,13 +95,13 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
 #: accounts/templates/accounts/profile.html:60
 msgid "Registered since"
 msgstr ""
 
-#: accounts/templates/accounts/edit.html:61
+#: accounts/templates/accounts/edit.html:84
-msgid "Delete my account"
+msgid " Delete my account"
 msgstr ""
 
 #: accounts/templates/accounts/login.html:13
@@ -460,6 +471,10 @@ msgstr ""
 msgid "Team password"
 msgstr ""
 
+#: events/templates/events/manage_team.html:29
+msgid "Apply"
+msgstr ""
+
 #: events/templates/events/manage_team.html:44
 #: events/templates/events/team.html:49
 msgid "Members"
@@ -513,27 +528,27 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: project/settings.py:115
+#: project/settings.py:116
 msgid "English"
 msgstr ""
 
-#: project/settings.py:116
+#: project/settings.py:117
 msgid "German"
 msgstr ""
 
-#: project/settings.py:117
+#: project/settings.py:118
 msgid "French"
 msgstr ""
 
-#: project/settings.py:118
+#: project/settings.py:119
 msgid "Russian"
 msgstr ""
 
-#: project/settings.py:119
+#: project/settings.py:120
 msgid "Japanese"
 msgstr ""
 
-#: project/settings.py:120
+#: project/settings.py:121
 msgid "Spanish"
 msgstr ""
 

src/locale/ja/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,8 +49,7 @@ msgstr "パスワード"
 #: accounts/templates/accounts/edit.html:21
 #: accounts/templates/accounts/login.html:18
 #: accounts/templates/accounts/register.html:22
-#: ctfs/templates/ctfs/ctf_info.html:63
+#: ctfs/templates/ctfs/ctf_info.html:63 ctfs/templates/ctfs/ctfs_list.html:12
-#: ctfs/templates/ctfs/ctfs_list.html:12
 #: events/templates/events/ctf_info.html:65
 #: events/templates/events/event_info.html:64
 #: scoreboard/templates/scoreboard/scoreboard.html:13
@@ -70,14 +69,28 @@ msgid "Website"
 msgstr "ウェブサイト"
 
 #: accounts/templates/accounts/edit.html:36
-#: events/templates/events/manage_team.html:29
+#, fuzzy
-msgid "Apply"
+#| msgid "Apply"
+msgid " Apply"
 msgstr "適用する"
 
-#: accounts/templates/accounts/edit.html:47
+#: accounts/templates/accounts/edit.html:45
+#, fuzzy
+#| msgid "Delete account"
+msgid "Connected accounts"
+msgstr "アカウント削除"
+
+#: accounts/templates/accounts/edit.html:53
+msgid "Disconnect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:59
+msgid "Connect Discord"
+msgstr ""
+
+#: accounts/templates/accounts/edit.html:70
 #: accounts/templates/accounts/profile.html:46
-#: ctfs/templates/ctfs/ctf_info.html:65
+#: ctfs/templates/ctfs/ctf_info.html:65 ctfs/templates/ctfs/ctfs_list.html:13
-#: ctfs/templates/ctfs/ctfs_list.html:13
 #: events/templates/events/event_info.html:66
 #: events/templates/events/event_info.html:89
 #: events/templates/events/manage_team.html:40
@@ -86,13 +99,15 @@ msgstr "適用する"
 msgid "Score"
 msgstr "スコア"
 
-#: accounts/templates/accounts/edit.html:55
+#: accounts/templates/accounts/edit.html:78
 #: accounts/templates/accounts/profile.html:60
 msgid "Registered since"
 msgstr "登録日"
 
-#: accounts/templates/accounts/edit.html:61
+#: accounts/templates/accounts/edit.html:84
-msgid "Delete my account"
+#, fuzzy
+#| msgid "Delete my account"
+msgid " Delete my account"
 msgstr "アカウント削除"
 
 #: accounts/templates/accounts/login.html:13
@@ -241,15 +256,13 @@ msgstr "おめでとうございます！"
 msgid "Already flagged"
 msgstr "すでにフラグが立っています"
 
-#: ctfs/templates/ctfs/ctf_info.html:33
+#: ctfs/templates/ctfs/ctf_info.html:33 ctfs/templates/ctfs/ctf_info.html:42
-#: ctfs/templates/ctfs/ctf_info.html:42
 #: events/templates/events/ctf_info.html:36
 #: events/templates/events/ctf_info.html:45
 msgid "Start the challenge"
 msgstr "チャレンジ開始"
 
-#: ctfs/templates/ctfs/ctf_info.html:35
+#: ctfs/templates/ctfs/ctf_info.html:35 ctfs/templates/ctfs/ctf_info.html:44
-#: ctfs/templates/ctfs/ctf_info.html:44
 #: events/templates/events/ctf_info.html:38
 #: events/templates/events/ctf_info.html:47
 msgid "Download"
@@ -306,8 +319,7 @@ msgstr "このイベントは始まります。"
 msgid "You need to be registered to the event."
 msgstr "このイベントに登録する必要があります。"
 
-#: events/templates/events/create_team.html:20
+#: events/templates/events/create_team.html:20 events/views/teams.py:120
-#: events/views/teams.py:120
 msgid "Name already taken."
 msgstr "名前はすでに使用されています。"
 
@@ -471,6 +483,10 @@ msgstr "最大サイズに達しました。"
 msgid "Team password"
 msgstr "チームのパスワード"
 
+#: events/templates/events/manage_team.html:29
+msgid "Apply"
+msgstr "適用する"
+
 #: events/templates/events/manage_team.html:44
 #: events/templates/events/team.html:49
 msgid "Members"
@@ -524,27 +540,27 @@ msgstr "フラグ"
 msgid "Users"
 msgstr "ユーザー"
 
-#: project/settings.py:115
+#: project/settings.py:116
 msgid "English"
 msgstr "英語"
 
-#: project/settings.py:116
+#: project/settings.py:117
 msgid "German"
 msgstr "ドイツ語"
 
-#: project/settings.py:117
+#: project/settings.py:118
 msgid "French"
 msgstr "フランス語"
 
-#: project/settings.py:118
+#: project/settings.py:119
 msgid "Russian"
 msgstr "ロシア語"
 
-#: project/settings.py:119
+#: project/settings.py:120
 msgid "Japanese"
 msgstr "日本語"
 
-#: project/settings.py:120
+#: project/settings.py:121
 msgid "Spanish"
 msgstr "スペイン語"
 

src/locale/ru/LC_MESSAGES/django.po

@@ -239,9 +239,6 @@ msgid "Published date"
 msgstr "Дата публикации"
 
 #: ctfs/templates/ctfs/ctf_info.html:16
-#, fuzzy
-#| msgid "No article available."
-#| msgstr "Нет доступных статей."
 msgid "Challenge is not yet available."
 msgstr "Челлендж пока не доступен."
 
@@ -469,9 +466,6 @@ msgid "See more"
 msgstr "Смотреть далее"
 
 #: events/templates/events/events_list.html:44
-#, fuzzy
-#| msgid "No article available."
-#msgstr "Нет доступных статей."
 msgid "No events available."
 msgstr "Нет доступных соревнований."
 
@@ -544,27 +538,27 @@ msgstr "Флаги"
 msgid "Users"
 msgstr "Пользователи"
 
-#: project/settings.py:115
+#: project/settings.py:116
 msgid "English"
 msgstr "Английский"
 
-#: project/settings.py:116
+#: project/settings.py:117
 msgid "German"
 msgstr "Немецкий"
 
-#: project/settings.py:117
+#: project/settings.py:118
 msgid "French"
 msgstr "Французский"
 
-#: project/settings.py:118
+#: project/settings.py:119
 msgid "Russian"
 msgstr "Русский"
 
-#: project/settings.py:119
+#: project/settings.py:120
 msgid "Japanese"
 msgstr "Японский"
 
-#: project/settings.py:120
+#: project/settings.py:121
 msgid "Spanish"
 msgstr "Испанский"
 

src/resources/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: 2022-02-10 19:27+0100\n"
 "Last-Translator: Clément Hamada <clementhamada@pm.me>\n"
 "Language-Team: \n"
@@ -225,7 +225,7 @@ msgstr ""
 "Folgende Zahlungsmethoden sind für eine Spende an 42CTF oder den Kauf einer "
 "Mitgliedshaft verfügbar:"
 
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
 msgid ""
 "If you would like us to add another payment method or if you want to pay in "
 "cash, send us a message !"
@@ -233,7 +233,7 @@ msgstr ""
 "Falls Sie möchten, dass wir eine andere Zahlungsmethode hinzufügen oder "
 "lieber Bar zahlen möchten, schicken Sie uns eine Nachricht!"
 
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
 msgid ""
 "If you're paying for your membership, don't forget to send us your first and "
 "last name, as well as your 42CTF pseudo."
@@ -241,7 +241,7 @@ msgstr ""
 "Falls Sie für eine Mitgliedschaft zahlen, vergessen Sie nicht uns Ihren vor "
 "und Nachnamen, sowie Ihren 42CTF Nutzernamen mitzuteilen."
 
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
 msgid ""
 "We will only use thoe data to keep track of our members and grant you "
 "advantages, and we will never communicate them to any third party."
@@ -250,6 +250,21 @@ msgstr ""
 "Behalten und ihnen Vorteile zu bieten, und werden Sie niemals an einem "
 "Dritten übermitteln."
 
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+"                more precisely, it costs us <b>50 euros per month</b>.<br>\n"
+"                If we had <b>40 members</b> each year, it would be enough to "
+"cover the hosting of 42CTF.<br>\n"
+"                With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
 #: resources/templates/resources/edit.html:7
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"

src/resources/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -187,24 +187,39 @@ msgid ""
 "You can donate to 42CTF or pay your membership with the following means:"
 msgstr ""
 
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
 msgid ""
 "If you would like us to add another payment method or if you want to pay in "
 "cash, send us a message !"
 msgstr ""
 
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
 msgid ""
 "If you're paying for your membership, don't forget to send us your first and "
 "last name, as well as your 42CTF pseudo."
 msgstr ""
 
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
 msgid ""
 "We will only use thoe data to keep track of our members and grant you "
 "advantages, and we will never communicate them to any third party."
 msgstr ""
 
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+"                more precisely, it costs us <b>50 euros per month</b>.<br>\n"
+"                If we had <b>40 members</b> each year, it would be enough to "
+"cover the hosting of 42CTF.<br>\n"
+"                With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
 #: resources/templates/resources/edit.html:7
 msgid "Edit this page"
 msgstr ""

src/resources/locale/es/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: 2022-02-09 10:55+0100\n"
 "Last-Translator: Javier Uhagón (uhagontorralvojavier@gmail.com)\n"
 "Language-Team: \n"
@@ -215,7 +215,7 @@ msgid ""
 msgstr ""
 "Puedes donar a 42CTF o pagar tu membresía con los siguientes métodos de pago:"
 
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
 msgid ""
 "If you would like us to add another payment method or if you want to pay in "
 "cash, send us a message !"
@@ -223,7 +223,7 @@ msgstr ""
 "Si quieres que añadamos otro metodo de pago o quieres pagarnos en efectivo "
 "¡Mandanos un mensaje!"
 
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
 msgid ""
 "If you're paying for your membership, don't forget to send us your first and "
 "last name, as well as your 42CTF pseudo."
@@ -231,7 +231,7 @@ msgstr ""
 "Si estás pagando por tu membresía, no olvides mandarnos tu nombre y "
 "apellido, también tu nombre de usuario en 42CTF"
 
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
 msgid ""
 "We will only use thoe data to keep track of our members and grant you "
 "advantages, and we will never communicate them to any third party."
@@ -239,6 +239,21 @@ msgstr ""
 "Solo usarmos los datos para tener control de la lista de miembros y darte "
 "las ventajas de miembro, nunca se los daremos a ningún tercero."
 
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+"                more precisely, it costs us <b>50 euros per month</b>.<br>\n"
+"                If we had <b>40 members</b> each year, it would be enough to "
+"cover the hosting of 42CTF.<br>\n"
+"                With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
 #: resources/templates/resources/edit.html:7
 msgid "Edit this page"
 msgstr "Editar esta página"

src/resources/locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,7 +36,7 @@ msgstr ""
 "les participants doivent résoudre des challenges dans différentes catégories "
 "pour gagner des points et progresser dans le classement."
 
-#: resources/templates/resources/42ctf.html:122
+#: resources/templates/resources/42ctf.html:12
 msgid ""
 "The challenges require participants to find sort of passwords called \"flags"
 "\" and to submit them on the platform."
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 "Vous pouvez donner à 42CTF ou payer votre adhésion avec les moyens suivants :"
 
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
 msgid ""
 "If you would like us to add another payment method or if you want to pay in "
 "cash, send us a message !"
@@ -232,7 +232,7 @@ msgstr ""
 "Si vous aimeriez qu'on ajoute un autre moyen de paiement, ou si vous voulez "
 "payer en liquide, envoyez-nous un message !"
 
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
 msgid ""
 "If you're paying for your membership, don't forget to send us your first and "
 "last name, as well as your 42CTF pseudo."
@@ -240,7 +240,7 @@ msgstr ""
 "Si vous payez pour l'adhésion, n'oubliez pas de nous envoyer vos noms et "
 "prénoms, ainsi que votre pseudo 42CTF."
 
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
 msgid ""
 "We will only use thoe data to keep track of our members and grant you "
 "advantages, and we will never communicate them to any third party."
@@ -249,6 +249,21 @@ msgstr ""
 "et vous accorder des avantages, nous ne transmettrons jamais ces données à "
 "des tierces parties."
 
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+"                more precisely, it costs us <b>50 euros per month</b>.<br>\n"
+"                If we had <b>40 members</b> each year, it would be enough to "
+"cover the hosting of 42CTF.<br>\n"
+"                With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
 #: resources/templates/resources/edit.html:7
 msgid "Edit this page"
 msgstr "Modifier cette page"

src/resources/locale/it/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -187,24 +187,39 @@ msgid ""
 "You can donate to 42CTF or pay your membership with the following means:"
 msgstr ""
 
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
 msgid ""
 "If you would like us to add another payment method or if you want to pay in "
 "cash, send us a message !"
 msgstr ""
 
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
 msgid ""
 "If you're paying for your membership, don't forget to send us your first and "
 "last name, as well as your 42CTF pseudo."
 msgstr ""
 
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
 msgid ""
 "We will only use thoe data to keep track of our members and grant you "
 "advantages, and we will never communicate them to any third party."
 msgstr ""
 
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+"                more precisely, it costs us <b>50 euros per month</b>.<br>\n"
+"                If we had <b>40 members</b> each year, it would be enough to "
+"cover the hosting of 42CTF.<br>\n"
+"                With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
 #: resources/templates/resources/edit.html:7
 msgid "Edit this page"
 msgstr ""

src/resources/locale/ja/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -219,7 +219,7 @@ msgid ""
 msgstr ""
 "42CTFへのご寄付やメンバーシップのお支払いは、以下の手段で行うことができます："
 
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
 msgid ""
 "If you would like us to add another payment method or if you want to pay in "
 "cash, send us a message !"
@@ -227,7 +227,7 @@ msgstr ""
 "他のお支払い方法や現金でのお支払いをご希望の場合は、メッセージをお送りくださ"
 "い。"
 
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
 msgid ""
 "If you're paying for your membership, don't forget to send us your first and "
 "last name, as well as your 42CTF pseudo."
@@ -235,7 +235,7 @@ msgstr ""
 "メンバーシップをお支払いになる場合は、氏名と42CTFのアカウント名を忘れずにお送"
 "りください。"
 
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
 msgid ""
 "We will only use thoe data to keep track of our members and grant you "
 "advantages, and we will never communicate them to any third party."
@@ -243,6 +243,21 @@ msgstr ""
 "これらのデータは、メンバーの管理と特典の付与のためにのみ使用し、第三者に提供"
 "することはありません。"
 
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+"                more precisely, it costs us <b>50 euros per month</b>.<br>\n"
+"                If we had <b>40 members</b> each year, it would be enough to "
+"cover the hosting of 42CTF.<br>\n"
+"                With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
 #: resources/templates/resources/edit.html:7
 msgid "Edit this page"
 msgstr "このページの編集"

src/resources/locale/ru/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-16 20:02+0100\n"
+"POT-Creation-Date: 2022-03-13 18:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -189,24 +189,39 @@ msgid ""
 "You can donate to 42CTF or pay your membership with the following means:"
 msgstr ""
 
-#: resources/templates/resources/donate.html:46
+#: resources/templates/resources/donate.html:44
 msgid ""
 "If you would like us to add another payment method or if you want to pay in "
 "cash, send us a message !"
 msgstr ""
 
-#: resources/templates/resources/donate.html:48
+#: resources/templates/resources/donate.html:46
 msgid ""
 "If you're paying for your membership, don't forget to send us your first and "
 "last name, as well as your 42CTF pseudo."
 msgstr ""
 
-#: resources/templates/resources/donate.html:49
+#: resources/templates/resources/donate.html:47
 msgid ""
 "We will only use thoe data to keep track of our members and grant you "
 "advantages, and we will never communicate them to any third party."
 msgstr ""
 
+#: resources/templates/resources/donate.html:50
+msgid "What will we do with your money ?"
+msgstr ""
+
+#: resources/templates/resources/donate.html:51
+msgid ""
+"Hosting a website - and especially a CTF platform - costs money:\n"
+"                more precisely, it costs us <b>50 euros per month</b>.<br>\n"
+"                If we had <b>40 members</b> each year, it would be enough to "
+"cover the hosting of 42CTF.<br>\n"
+"                With the additional money, we could for example offer prizes "
+"for limited-time events, but we will update this page as soon as we reach "
+"this threshold :)"
+msgstr ""
+
 #: resources/templates/resources/edit.html:7
 msgid "Edit this page"
 msgstr ""

src/resources/templates/resources/donate.html

@@ -25,29 +25,34 @@
 
                 <center><h4>{% trans "Donate to 42CTF" %}</h4>
                 {% trans "You can donate to 42CTF or pay your membership with the following means:" %}<br>
-                <a href="https://www.patreon.com/42ctf" target="_blank" class="patreon li-patreon">
+                <!-- <a href="https://www.patreon.com/42ctf" target="_blank" class="patreon li-patreon">
-                    <!-- <div class="patreon-content"> -->
                             <span class="svg-box">
                                     <svg viewBox="0 0 569 546" xmlns="http://www.w3.org/2000/svg"><g><circle cx="362.589996" cy="204.589996" data-fill="1" id="Oval" r="204.589996"></circle><rect data-fill="2" height="545.799988" id="Rectangle" width="100" x="0" y="0"></rect></g></svg>
                             </span>
                             <span class="patreon-text">
                                     Patreon
                             </span>
-                    <!-- </div> -->
+                </a> -->
-                </a>
                 <a href="https://www.paypal.com/donate/?hosted_button_id=M6YBYZ63MQGAY" target="_blank">
                                     <img src="/static/img/paypal.png" width="200" style="margin-top: -10px;">
                 </a>
-                <a href="https://www.helloasso.com/associations/42ctf/adhesions/adhesion" target="_blank">
+                <!-- <a href="https://www.helloasso.com/associations/42ctf/adhesions/adhesion" target="_blank">
                     <img src="/static/img/hello_asso.png" width="180" style="margin-top: -10px;">
-                </a>
+                </a> -->
                 </center>
                 <br>
                 {% trans "If you would like us to add another payment method or if you want to pay in cash, send us a message !" %}<br><br>
 
                 {% trans "If you're paying for your membership, don't forget to send us your first and last name, as well as your 42CTF pseudo." %}
                 {% trans "We will only use thoe data to keep track of our members and grant you advantages, and we will never communicate them to any third party." %}
+                <br><br>
 
+                <h4>{% trans "What will we do with your money ?" %}</h4>
+                {% blocktranslate %}Hosting a website - and especially a CTF platform - costs money:
+                more precisely, it costs us <b>50 euros per month</b>.<br>
+                If we had <b>40 members</b> each year, it would be enough to cover the hosting of 42CTF.<br>
+                We currently have {{nb_members}} members. <br>
+                With the additional money, we could for example offer prizes for limited-time events, but we will update this page as soon as we reach this threshold :){% endblocktranslate %}
             </div>
         </div>
     </div>

src/resources/templates/resources/edit.html

@@ -9,7 +9,7 @@
             <div class="ctf-body">
                 <br>
                 <br>
-               {% trans "More information coming soon, but as you can guess it involves making a pull request to your favorite" %} <a href="https://github.com/Danhia/42CTF/">repository</a> ;)
+               {% trans "More information coming soon, but as you can guess it involves making a pull request to your favorite" %} <a href="https://gitea.42ctf.org/42CTF/website">repository</a> ;)
                 <br>
                 <br>
                 <br>

src/resources/templates/resources/translate.html

@@ -7,9 +7,9 @@
                 <center><h3>{% trans "Translate 42CTF" %}</h3></center>
             </div>
             <div class="ctf-body">
-                {% trans "42CTF source code is publicly available on this"%} <a href="https://github.com/Danhia/42CTF/">github</a>.<br>
+                {% trans "42CTF source code is publicly available on this"%} <a href="https://gitea.42ctf.org/42CTF/website">git</a>.<br>
                 {% trans "Translation does not require any programming skill and is a good way to contribute if you want to help us, by making the platform always more accessible." %}<br><br>
-                {% trans "We have a" %} <a href="https://github.com/Danhia/42CTF/wiki/Internationalization">wiki</a> {% trans "describing how to translate pages with the Django internalization module." %}<br>
+                {% trans "We have a" %} <a href="https://gitea.42ctf.org/42CTF/website/wiki/Internationalization">wiki</a> {% trans "describing how to translate pages with the Django internalization module." %}<br>
                 {% trans "We invite you to read it to know all the details, but it merely requires you to edit text files, so you see, no programming skills required ;)" %}
                 {% trans "You will need to fork the git repository, make your changes, push them, and then open a pull request so that we can merge your contributions into our repository." %}<br><br>
                 {% trans "Don't hesitate to reach for help on" %} <a class="footer_imgs" href="https://discord.gg/DwZqPpA" target="_blank"><img src="/static/img/discord.png" width="30"></a>

src/resources/urls.py

@@ -5,10 +5,4 @@ app_name = "resources"
 
 urlpatterns = [
         path('', views.resources, name='resources'),
-        path('42ctf', views.ctf42, name='42ctf'),
-        path('tools', views.tools, name='tools'),
-        path('create_challenge', views.create_challenge, name='create_challenge'),
-        path('translate', views.translate, name='translate'),
-        path('edit', views.edit, name='edit'),
-        path('donate', views.donate, name='donate'),
 ]

src/resources/views.py

@@ -1,26 +1,9 @@
 from django.shortcuts import render
-from django.core.paginator import Paginator
 from accounts.models import UserProfileInfo
+from django.contrib.auth.models import timezone
         
 # Create your views here.
 
 def resources(request):
-    return render(request, 'resources/resources.html')
+    nb_members = UserProfileInfo.objects.filter(member=True, member_until__gt=timezone.now()).count()
-
+    return render(request, 'resources/resources.html', {'nb_members':nb_members})
-def ctf42(request):
-    return render(request, 'resources/42ctf.html')
-
-def tools(request):
-    return render(request, 'resources/tools.html')
-
-def create_challenge(request):
-    return render(request, 'resources/create_challenge.html')
-
-def translate(request):
-    return render(request, 'resources/translate.html')
-
-def edit(request):
-    return render(request, 'resources/edit.html')
-
-def donate(request):
-    return render(request, 'resources/donate.html')

src/statics/css/style.css

@@ -120,6 +120,7 @@ input[type="url"] {
   background-color: #2d2d2d;
   padding: 3px;
   border-radius: 4px;
+  color: #d9d9d9;
 }
 input[type="submit"] {
   padding: 0;
@@ -356,7 +357,7 @@ footer {
   cursor: unset;
 }
 .is-member {
-  color: #2b908f;
+  color: #26fcef;
 }
 
 @media only screen and (min-width : 1200px) {

src/templates/base.html

@@ -126,7 +126,7 @@
                                         </a>
                                 </div>
                                 <div class="col-lg-4 col-12 bottom-md">
-                                        <a href="https://www.patreon.com/42ctf" target="_blank" class="patreon">
+                                        <!-- <a href="https://www.patreon.com/42ctf" target="_blank" class="patreon">
                                                 <div class="patreon-content">
                                                         <span class="svg-box">
                                                                 <svg viewBox="0 0 569 546" xmlns="http://www.w3.org/2000/svg"><g><circle cx="362.589996" cy="204.589996" data-fill="1" id="Oval" r="204.589996"></circle><rect data-fill="2" height="545.799988" id="Rectangle" width="100" x="0" y="0"></rect></g></svg>
@@ -135,6 +135,9 @@
                                                                 {% trans "Become a Patron!" %}
                                                         </span>
                                                 </div>
+                                        </a> -->
+                                        <a href="https://www.paypal.com/donate/?hosted_button_id=M6YBYZ63MQGAY" target="_blank">
+                                                <img src="/static/img/paypal.png" width="250" style="margin-top: -20px;">
                                         </a>
                                 </div>
                                 <div class="col-lg-2 footer-text col-sm-12">