From 09377c509f53ef42dec96205e560548fecb43554 Mon Sep 17 00:00:00 2001 From: Danhia Date: Sun, 13 Mar 2022 18:14:32 +0100 Subject: [PATCH] updated git links in resources + donation section --- src/locale/de/LC_MESSAGES/django.po | 47 ++++++++++---- src/locale/en/LC_MESSAGES/django.po | 41 ++++++++---- src/locale/es/LC_MESSAGES/django.po | 47 ++++++++++---- src/locale/fr/LC_MESSAGES/django.po | 51 +++++++++------ src/locale/it/LC_MESSAGES/django.po | 41 ++++++++---- src/locale/ja/LC_MESSAGES/django.po | 62 ++++++++++++------- src/locale/ru/LC_MESSAGES/django.po | 41 ++++++++---- src/resources/locale/de/LC_MESSAGES/django.po | 23 +++++-- src/resources/locale/en/LC_MESSAGES/django.po | 23 +++++-- src/resources/locale/es/LC_MESSAGES/django.po | 23 +++++-- src/resources/locale/fr/LC_MESSAGES/django.po | 25 ++++++-- src/resources/locale/it/LC_MESSAGES/django.po | 23 +++++-- src/resources/locale/ja/LC_MESSAGES/django.po | 23 +++++-- src/resources/locale/ru/LC_MESSAGES/django.po | 23 +++++-- src/resources/templates/resources/donate.html | 17 +++-- src/resources/templates/resources/edit.html | 2 +- .../templates/resources/translate.html | 4 +- src/resources/urls.py | 6 -- src/resources/views.py | 23 +------ src/templates/base.html | 5 +- 20 files changed, 378 insertions(+), 172 deletions(-) diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 31315f4..d701a83 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/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 \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 -msgid "Apply" +#, fuzzy +#| 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 -msgid "Delete my account" +#: accounts/templates/accounts/edit.html:84 +#, 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 "" diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po index 520ad0b..b286212 100644 --- a/src/locale/en/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 -msgid "Delete my account" +#: accounts/templates/accounts/edit.html:84 +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 "" diff --git a/src/locale/es/LC_MESSAGES/django.po b/src/locale/es/LC_MESSAGES/django.po index feb899c..6a1eac9 100644 --- a/src/locale/es/LC_MESSAGES/django.po +++ b/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 -msgid "Apply" +#, fuzzy +#| 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 -msgid "Delete my account" +#: accounts/templates/accounts/edit.html:84 +#, 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 "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 244be3b..b51150c 100644 --- a/src/locale/fr/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \n" @@ -73,11 +73,26 @@ msgid "Website" msgstr "Site internet" #: accounts/templates/accounts/edit.html:36 -#: events/templates/events/manage_team.html:29 -msgid "Apply" +#, fuzzy +#| 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" diff --git a/src/locale/it/LC_MESSAGES/django.po b/src/locale/it/LC_MESSAGES/django.po index 520ad0b..b286212 100644 --- a/src/locale/it/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 -msgid "Delete my account" +#: accounts/templates/accounts/edit.html:84 +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 "" diff --git a/src/locale/ja/LC_MESSAGES/django.po b/src/locale/ja/LC_MESSAGES/django.po index 0537e62..55247bb 100644 --- a/src/locale/ja/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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/ctfs_list.html:12 +#: ctfs/templates/ctfs/ctf_info.html:63 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 -msgid "Apply" +#, fuzzy +#| 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/ctfs_list.html:13 +#: ctfs/templates/ctfs/ctf_info.html:65 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 -msgid "Delete my account" +#: accounts/templates/accounts/edit.html:84 +#, 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:42 +#: ctfs/templates/ctfs/ctf_info.html:33 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:44 +#: ctfs/templates/ctfs/ctf_info.html:35 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/views/teams.py:120 +#: events/templates/events/create_team.html:20 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 "スペイン語" diff --git a/src/locale/ru/LC_MESSAGES/django.po b/src/locale/ru/LC_MESSAGES/django.po index d66f8a1..bdacaaa 100644 --- a/src/locale/ru/LC_MESSAGES/django.po +++ b/src/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 \n" "Language-Team: LANGUAGE \n" @@ -71,11 +71,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 @@ -86,13 +97,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 -msgid "Delete my account" +#: accounts/templates/accounts/edit.html:84 +msgid " Delete my account" msgstr "" #: accounts/templates/accounts/login.html:13 @@ -470,6 +481,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" @@ -523,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 "" diff --git a/src/resources/locale/de/LC_MESSAGES/django.po b/src/resources/locale/de/LC_MESSAGES/django.po index e23519e..b24ad5b 100644 --- a/src/resources/locale/de/LC_MESSAGES/django.po +++ b/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 \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 50 euros per month.
\n" +" If we had 40 members each year, it would be enough to " +"cover the hosting of 42CTF.
\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" diff --git a/src/resources/locale/en/LC_MESSAGES/django.po b/src/resources/locale/en/LC_MESSAGES/django.po index 1a19e2b..3c855f0 100644 --- a/src/resources/locale/en/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 50 euros per month.
\n" +" If we had 40 members each year, it would be enough to " +"cover the hosting of 42CTF.
\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 "" diff --git a/src/resources/locale/es/LC_MESSAGES/django.po b/src/resources/locale/es/LC_MESSAGES/django.po index 66d5ca1..800ee4e 100644 --- a/src/resources/locale/es/LC_MESSAGES/django.po +++ b/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 50 euros per month.
\n" +" If we had 40 members each year, it would be enough to " +"cover the hosting of 42CTF.
\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" diff --git a/src/resources/locale/fr/LC_MESSAGES/django.po b/src/resources/locale/fr/LC_MESSAGES/django.po index cef8577..d2d2817 100644 --- a/src/resources/locale/fr/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 50 euros per month.
\n" +" If we had 40 members each year, it would be enough to " +"cover the hosting of 42CTF.
\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" diff --git a/src/resources/locale/it/LC_MESSAGES/django.po b/src/resources/locale/it/LC_MESSAGES/django.po index 1a19e2b..3c855f0 100644 --- a/src/resources/locale/it/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 50 euros per month.
\n" +" If we had 40 members each year, it would be enough to " +"cover the hosting of 42CTF.
\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 "" diff --git a/src/resources/locale/ja/LC_MESSAGES/django.po b/src/resources/locale/ja/LC_MESSAGES/django.po index 1c94f45..ffd0706 100644 --- a/src/resources/locale/ja/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 50 euros per month.
\n" +" If we had 40 members each year, it would be enough to " +"cover the hosting of 42CTF.
\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 "このページの編集" diff --git a/src/resources/locale/ru/LC_MESSAGES/django.po b/src/resources/locale/ru/LC_MESSAGES/django.po index a09037d..af459a6 100644 --- a/src/resources/locale/ru/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 50 euros per month.
\n" +" If we had 40 members each year, it would be enough to " +"cover the hosting of 42CTF.
\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 "" diff --git a/src/resources/templates/resources/donate.html b/src/resources/templates/resources/donate.html index dbd80df..acc445c 100644 --- a/src/resources/templates/resources/donate.html +++ b/src/resources/templates/resources/donate.html @@ -25,29 +25,34 @@

{% trans "Donate to 42CTF" %}

{% trans "You can donate to 42CTF or pay your membership with the following means:" %}
- - + - + --> - +

{% trans "If you would like us to add another payment method or if you want to pay in cash, send us a message !" %}

{% 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." %} +

+

{% trans "What will we do with your money ?" %}

+ {% blocktranslate %}Hosting a website - and especially a CTF platform - costs money: + more precisely, it costs us 50 euros per month.
+ If we had 40 members each year, it would be enough to cover the hosting of 42CTF.
+ We currently have {{nb_members}} members.
+ 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 %} diff --git a/src/resources/templates/resources/edit.html b/src/resources/templates/resources/edit.html index 2835308..2a4f666 100644 --- a/src/resources/templates/resources/edit.html +++ b/src/resources/templates/resources/edit.html @@ -9,7 +9,7 @@


- {% trans "More information coming soon, but as you can guess it involves making a pull request to your favorite" %} repository ;) + {% trans "More information coming soon, but as you can guess it involves making a pull request to your favorite" %} repository ;)


diff --git a/src/resources/templates/resources/translate.html b/src/resources/templates/resources/translate.html index 6f5f495..a881d6a 100644 --- a/src/resources/templates/resources/translate.html +++ b/src/resources/templates/resources/translate.html @@ -7,9 +7,9 @@

{% trans "Translate 42CTF" %}

- {% trans "42CTF source code is publicly available on this"%} github.
+ {% trans "42CTF source code is publicly available on this"%} git.
{% 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." %}

- {% trans "We have a" %} wiki {% trans "describing how to translate pages with the Django internalization module." %}
+ {% trans "We have a" %} wiki {% trans "describing how to translate pages with the Django internalization module." %}
{% 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." %}

{% trans "Don't hesitate to reach for help on" %} diff --git a/src/resources/urls.py b/src/resources/urls.py index 9b57e19..53f26cd 100644 --- a/src/resources/urls.py +++ b/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'), ] diff --git a/src/resources/views.py b/src/resources/views.py index 3bfbbc3..fb41648 100644 --- a/src/resources/views.py +++ b/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') - -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') \ No newline at end of file + nb_members = UserProfileInfo.objects.filter(member=True, member_until__gt=timezone.now()).count() + return render(request, 'resources/resources.html', {'nb_members':nb_members}) \ No newline at end of file diff --git a/src/templates/base.html b/src/templates/base.html index 8e97e6d..2e139c5 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -126,7 +126,7 @@
- + + +