From dbdd6b06f8948fa7c14bf0e9bbca1254bbdfd929 Mon Sep 17 00:00:00 2001 From: ix <0x00fi@protonmail.com> Date: Tue, 7 Sep 2021 19:52:40 +0200 Subject: [PATCH] internationalization fixed, templates url fixed, messages recompiled --- src/accounts/templates/accounts/profile.html | 2 +- src/change_lang.py | 26 +++++ .../migrations/0004_auto_20210907_1407.py | 28 ++++++ src/ctfs/models.py | 3 + src/ctfs/templates/ctfs/.ctfs_list.html.swp | Bin 12288 -> 0 bytes src/ctfs/templates/ctfs/ctf_info.html | 8 +- src/ctfs/templates/ctfs/ctfs_list.html | 4 +- .../templates/templates/ctfs/ctf_info.html | 81 ---------------- .../templates/templates/ctfs/ctfs_list.html | 53 ---------- src/ctfs/views.py | 25 ++++- src/home/templates/home/home.html | 4 +- src/home/views.py | 7 +- src/locale/de/LC_MESSAGES/django.po | 58 ++++++----- src/locale/en/LC_MESSAGES/django.po | 58 ++++++----- src/locale/es/LC_MESSAGES/django.po | 58 ++++++----- src/locale/fr/LC_MESSAGES/django.po | 91 ++++++------------ src/locale/it/LC_MESSAGES/django.po | 58 ++++++----- src/locale/ru/LC_MESSAGES/django.po | 58 ++++++----- src/project/settings.py | 9 +- .../templates/scoreboard/scoreboard.html | 2 +- src/templates/base.html | 4 +- src/templates/ctfs/ctf_info.html | 81 ---------------- src/templates/ctfs/ctfs_list.html | 53 ---------- 23 files changed, 269 insertions(+), 502 deletions(-) create mode 100644 src/change_lang.py create mode 100644 src/ctfs/migrations/0004_auto_20210907_1407.py delete mode 100644 src/ctfs/templates/ctfs/.ctfs_list.html.swp mode change 100644 => 100755 src/ctfs/templates/ctfs/ctfs_list.html delete mode 100755 src/ctfs/templates/templates/ctfs/ctf_info.html delete mode 100755 src/ctfs/templates/templates/ctfs/ctfs_list.html delete mode 100755 src/templates/ctfs/ctf_info.html delete mode 100755 src/templates/ctfs/ctfs_list.html diff --git a/src/accounts/templates/accounts/profile.html b/src/accounts/templates/accounts/profile.html index 969b29e..c80fe1f 100644 --- a/src/accounts/templates/accounts/profile.html +++ b/src/accounts/templates/accounts/profile.html @@ -18,7 +18,7 @@ {% for s in solves %} - {{ s.ctf.name }} + {{ s.ctf.name }} {{ s.ctf.category.name}} {{ s.ctf.points }} {{ s.flag_date|date:"Y-m-d H:i:s" }} diff --git a/src/change_lang.py b/src/change_lang.py new file mode 100644 index 0000000..78f17ee --- /dev/null +++ b/src/change_lang.py @@ -0,0 +1,26 @@ +from django.template import Library +from django.core.urlresolvers import resolve, reverse +from django.utils.translation import activate, get_language + +register = Library() + +@register.simple_tag(takes_context=True) +def change_lang(context, lang=None, *args, **kwargs): + """ + Get active page's url by a specified language + Usage: {% change_lang 'en' %} + """ + + path = context['request'].path + url_parts = resolve( path ) + + url = path + cur_language = get_language() + try: + activate(lang) + url = reverse( url_parts.view_name, kwargs=url_parts.kwargs ) + finally: + activate(cur_language) + + + return "%s" % url diff --git a/src/ctfs/migrations/0004_auto_20210907_1407.py b/src/ctfs/migrations/0004_auto_20210907_1407.py new file mode 100644 index 0000000..ed6825d --- /dev/null +++ b/src/ctfs/migrations/0004_auto_20210907_1407.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.7 on 2021-09-07 14:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ctfs', '0003_auto_20191003_1947'), + ] + + operations = [ + migrations.AddField( + model_name='ctf', + name='description_de', + field=models.TextField(blank=True), + ), + migrations.AddField( + model_name='ctf', + name='description_en', + field=models.TextField(blank=True), + ), + migrations.AddField( + model_name='ctf', + name='description_ru', + field=models.TextField(blank=True), + ), + ] diff --git a/src/ctfs/models.py b/src/ctfs/models.py index a9a41ce..4958f77 100644 --- a/src/ctfs/models.py +++ b/src/ctfs/models.py @@ -12,6 +12,9 @@ class CTF(models.Model): name = models.CharField(max_length=200) flag = models.CharField(max_length=100) description = models.TextField(blank=True) + description_en = models.TextField(blank=True) + description_ru = models.TextField(blank=True) + description_de = models.TextField(blank=True) file = models.FileField(blank=True, upload_to='challenges') ctf_url = models.URLField(blank=True) points = models.PositiveSmallIntegerField() diff --git a/src/ctfs/templates/ctfs/.ctfs_list.html.swp b/src/ctfs/templates/ctfs/.ctfs_list.html.swp deleted file mode 100644 index de319841c709fc7b65160961366a32629afaed84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&u`pB6vroA5I@==kPxVs!BrD+@OqO?QPVn$5DgVVv=O0598l!7XV;^6Z8I}Y z2vL9=7vR#rfdh9WPDs7bKLBy#&Xo&S5Z@WcUT@H@%CXY3^v(LsyqP!id2d!)Wk&sv z-hH3n==B+%7a05J(N~|WK75)TuP|1oQC2A1vHZEcyZ_#Y_xAk#!CQN8T)(r>`HOnO zU~4lrl47lOquz0z`la5CI}U1c(3;AOcT50aLE9FR_iM&bP94{)wOe?rA>HP5K}L zM1Tko0U|&IhyW2F0z`la5CI}U1fDq0gZl`T)8Ey#oDpiLoD`@1R}ib?9a2&*w27`W8BbcA;%( z4SE&246Q)FJ;&H1=x68~sD!qmb!Zj(1#ABi`W}+d$Iw0K9q3KS?k#}mAp%5z2oM1x zKm>>Y5%}K(PEW6Kktd_9h!6R-GZqGkJQ_02+ZX#FE5 zt1p+Hp7OY-vueW6&b*{nmWkW`ZU08<(XqCQ69B zjWSpq#TIs(wWi>02&@2oN_<)gT*$7pP(7&+qRONqH`1QiWab{uiUH%?Awmh-V}vW+ zja%5MDZ6VCwY33ruA181fS5PjcO^9ss{% trans "Published date" %} : {{ ctf.pub_date }}
- {{ ctf.description|safe }} + {% if description %} + {{ description|safe }} + {% else %} + {% trans "No translation available for this challenge. Try another lang (French or English)." %} + {% endif %}
{% if request.user.is_authenticated %} @@ -56,7 +60,7 @@ {% for s in solved_list %} - {{ s.user.username }} + {{ s.user.username }} {{ s.user.userprofileinfo.portfolio_site }} {{ s.user.userprofileinfo.score }} {{ s.flag_date }} diff --git a/src/ctfs/templates/ctfs/ctfs_list.html b/src/ctfs/templates/ctfs/ctfs_list.html old mode 100644 new mode 100755 index 3356b15..68d1982 --- a/src/ctfs/templates/ctfs/ctfs_list.html +++ b/src/ctfs/templates/ctfs/ctfs_list.html @@ -26,7 +26,7 @@ {% else %} {% endif %} - {{ ctf.name }} + {{ ctf.name }} {{ ctf.points }} {{ ctf.solved_num }} @@ -42,7 +42,7 @@
  • {% trans "Categories" %}
    • {% if cats %} {% for c in cats %} -     {{ c.name }} + {{ c.name }} {% endfor %} {% else %}
  • {% trans "No category available." %}
    • diff --git a/src/ctfs/templates/templates/ctfs/ctf_info.html b/src/ctfs/templates/templates/ctfs/ctf_info.html deleted file mode 100755 index 1e5243c..0000000 --- a/src/ctfs/templates/templates/ctfs/ctf_info.html +++ /dev/null @@ -1,81 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -{% load i18n %} -
    -
    -
    -
    -

    {{ ctf.name }}

    - {% trans "Published date" %} : {{ ctf.pub_date }} -
    -
    - {{ ctf.description|safe }} -
    -
    - {% if request.user.is_authenticated %} - {% if valitated == True %} -

    {% trans "Congratulation !" %}

    - {% elif alvalitated == True %} -

    {% trans "Already flagged" %}

    - {% if ctf.ctf_url %} - {% trans "Start the challenge" %}
    - {% elif ctf.file %} - {% trans "Download" %}
    - {% endif %} - {% else %} - {% if failed %} -

    {% trans "Wrong flag ! You can do it !" %}

    - {% endif %} - {% if ctf.ctf_url %} - {% trans "Start the challenge" %}
    - {% elif ctf.file %} - {% trans "Download" %}
    - {% endif %} -
    - {% csrf_token %} - - -
    - - {% endif %} - {% endif %} -
    -
    -
    -

    {% trans "Solved by" %}

    - {% if solved_list %} - - - - - - - - - - - {% for s in solved_list %} - - - - - - - {% endfor %} - -
    {% trans "Username" %}{% trans "Website" %}{% trans "Score" %}{% trans "Date" %}
    {{ s.user.username }}{{ s.user.userprofileinfo.portfolio_site }}{{ s.user.userprofileinfo.score }}{{ s.flag_date }}
    - {% else %} -

    {% trans "Nobody have solved this CTF." %}

    - {% endif %} -
    -
    -
    -
      -
    • {% trans "Author" %} : {{ ctf.author.username }}
      • -
    • {% trans "Point reward" %} : {{ ctf.points }}
      • - -
    -
    -
    -{% endblock %} - diff --git a/src/ctfs/templates/templates/ctfs/ctfs_list.html b/src/ctfs/templates/templates/ctfs/ctfs_list.html deleted file mode 100755 index 3356b15..0000000 --- a/src/ctfs/templates/templates/ctfs/ctfs_list.html +++ /dev/null @@ -1,53 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -{% load i18n %} -
    -
    -

    {{ cat.name }}

    - {% if ctfs %} - - - - - - - - - - - {% for ctf in ctfs %} - - {% if request.user.is_authenticated %} - {% if ctf.solved %} - - {% else %} - - {% endif %} - {% else %} - - {% endif %} - - - - - {% endfor %} - -
    {% trans "Username" %}{% trans "Score" %}{% trans "Solved" %}
    ✓✕ {{ ctf.name }}{{ ctf.points }}{{ ctf.solved_num }}
    - {% else %} -

    {% trans "No ctf available for this category." %}

    - {% endif %} -
    -
    -
      -
    • {% trans "Categories" %}
      • - {% if cats %} - {% for c in cats %} - {{ c.name }} - {% endfor %} - {% else %} -
    • {% trans "No category available." %}
      • - {% endif %} -
    -
    -
    -{% endblock %} diff --git a/src/ctfs/views.py b/src/ctfs/views.py index 203ef27..78c62df 100644 --- a/src/ctfs/views.py +++ b/src/ctfs/views.py @@ -4,6 +4,20 @@ from django.contrib.auth.models import timezone from .models import Category, CTF, CTF_flags from .forms import submit_flag from accounts.models import UserProfileInfo +from django.utils.translation import get_language + +def get_description_by_lang(ctf): + lang = get_language() + ret = None + if lang == "fr": + ret = ctf.description + elif lang == "en": + ret = ctf.description_en + elif lang == "de": + ret = ctf.description_de + elif lang == "ru": + ret = ctf.description_ru + return ret def category(request, cat_slug): cat = get_object_or_404(Category, slug=cat_slug) @@ -17,6 +31,7 @@ def ctf(request, cat_slug, ctf_slug): ctf_info = get_object_or_404(CTF, slug=ctf_slug) flagged = False solved_list = CTF_flags.objects.filter(ctf=ctf_info).order_by('flag_date') + description = get_description_by_lang(ctf_info) if request.user.is_authenticated: if CTF_flags.objects.filter(user=request.user, ctf=ctf_info): flagged = True @@ -31,18 +46,18 @@ def ctf(request, cat_slug, ctf_slug): profil.last_submission_date = timezone.now() profil.score += ctf_info.points profil.save() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'valitated': True}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'valitated': True, 'description': description}) else: - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'failed': True}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'failed': True, 'description': description}) else: form = submit_flag() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': True}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': True, 'description': description}) else: form = submit_flag() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'description': description}) else: form = submit_flag() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': flagged}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': flagged, 'description': description}) # Create your views here. diff --git a/src/home/templates/home/home.html b/src/home/templates/home/home.html index 3d2eb36..208cadb 100644 --- a/src/home/templates/home/home.html +++ b/src/home/templates/home/home.html @@ -24,7 +24,7 @@
  • {% trans "Latest challenges added" %}
    • {% if ctfs %} {% for ctf in ctfs %} - {{ ctf.name }} + {{ ctf.name }} {% endfor %} {% else %}
  • {% trans "No ctf available." %}
    • @@ -33,7 +33,7 @@
      diff --git a/src/home/views.py b/src/home/views.py index 9574ba2..a31b52e 100644 --- a/src/home/views.py +++ b/src/home/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render +from django.shortcuts import render, redirect from django.conf import settings from django.http import HttpResponse, HttpResponseRedirect from .models import new @@ -27,6 +27,8 @@ def home(request): def set_language(request, lang_code): next = '/' + if request.GET.get('next'): + next = request.GET.get('next') response = HttpResponseRedirect(next) if lang_code and check_for_language(lang_code): if next: @@ -42,6 +44,7 @@ def set_language(request, lang_code): path=settings.LANGUAGE_COOKIE_PATH, domain=settings.LANGUAGE_COOKIE_DOMAIN, ) - return response + return redirect('/'+lang_code+next) + # Create your views here. diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index b55243e..73b0b36 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-10 19:28+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,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:50 ctfs/templates/ctfs/ctfs_list.html:12 +#: ctfs/templates/ctfs/ctf_info.html:54 ctfs/templates/ctfs/ctfs_list.html:12 #: scoreboard/templates/scoreboard/scoreboard.html:12 msgid "Username" msgstr "" @@ -31,7 +31,7 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:51 +#: ctfs/templates/ctfs/ctf_info.html:55 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Website" msgstr "" @@ -54,7 +54,7 @@ msgstr "" #: accounts/templates/accounts/edit.html:66 #: accounts/templates/accounts/profile.html:37 -#: ctfs/templates/ctfs/ctf_info.html:52 ctfs/templates/ctfs/ctfs_list.html:13 +#: ctfs/templates/ctfs/ctf_info.html:56 ctfs/templates/ctfs/ctfs_list.html:13 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Score" msgstr "" @@ -78,7 +78,7 @@ msgid "Reset password" msgstr "" #: accounts/templates/accounts/login.html:31 -#: accounts/templates/accounts/register.html:38 templates/base.html:90 +#: accounts/templates/accounts/register.html:38 templates/base.html:84 #: templates/registration/password_reset_complete.html:18 #: templates/registration/password_reset_confirm.html:37 #: templates/registration/password_reset_done.html:17 @@ -108,7 +108,7 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:15 -#: ctfs/templates/ctfs/ctf_info.html:53 +#: ctfs/templates/ctfs/ctf_info.html:57 msgid "Date" msgstr "" @@ -166,39 +166,45 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:17 +#: ctfs/templates/ctfs/ctf_info.html:15 +msgid "" +"No translation available for this challenge. Try another lang (French or " +"English)." +msgstr "" + +#: ctfs/templates/ctfs/ctf_info.html:21 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:19 +#: ctfs/templates/ctfs/ctf_info.html:23 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:21 ctfs/templates/ctfs/ctf_info.html:30 +#: ctfs/templates/ctfs/ctf_info.html:25 ctfs/templates/ctfs/ctf_info.html:34 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:23 ctfs/templates/ctfs/ctf_info.html:32 +#: ctfs/templates/ctfs/ctf_info.html:27 ctfs/templates/ctfs/ctf_info.html:36 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:27 +#: ctfs/templates/ctfs/ctf_info.html:31 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:45 +#: ctfs/templates/ctfs/ctf_info.html:49 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:68 +#: ctfs/templates/ctfs/ctf_info.html:72 msgid "Nobody have solved this CTF." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:74 +#: ctfs/templates/ctfs/ctf_info.html:78 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:75 +#: ctfs/templates/ctfs/ctf_info.html:79 msgid "Point reward" msgstr "" @@ -234,27 +240,19 @@ msgstr "" msgid "Flags counter" msgstr "" -#: project/settings.py:120 -msgid "Global Site" +#: project/settings.py:111 +msgid "English" msgstr "" -#: project/settings.py:121 -msgid "Italian" -msgstr "" - -#: project/settings.py:122 +#: project/settings.py:112 msgid "German" msgstr "" -#: project/settings.py:123 +#: project/settings.py:113 msgid "French" msgstr "" -#: project/settings.py:124 -msgid "Spanish" -msgstr "" - -#: project/settings.py:125 +#: project/settings.py:114 msgid "Russian" msgstr "" @@ -286,11 +284,11 @@ msgstr "" msgid "Scoreboard" msgstr "" -#: templates/base.html:86 +#: templates/base.html:80 msgid "Logout" msgstr "" -#: templates/base.html:93 +#: templates/base.html:87 msgid "Sign Up" msgstr "" diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po index b55243e..73b0b36 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: 2021-05-10 19:28+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,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:50 ctfs/templates/ctfs/ctfs_list.html:12 +#: ctfs/templates/ctfs/ctf_info.html:54 ctfs/templates/ctfs/ctfs_list.html:12 #: scoreboard/templates/scoreboard/scoreboard.html:12 msgid "Username" msgstr "" @@ -31,7 +31,7 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:51 +#: ctfs/templates/ctfs/ctf_info.html:55 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Website" msgstr "" @@ -54,7 +54,7 @@ msgstr "" #: accounts/templates/accounts/edit.html:66 #: accounts/templates/accounts/profile.html:37 -#: ctfs/templates/ctfs/ctf_info.html:52 ctfs/templates/ctfs/ctfs_list.html:13 +#: ctfs/templates/ctfs/ctf_info.html:56 ctfs/templates/ctfs/ctfs_list.html:13 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Score" msgstr "" @@ -78,7 +78,7 @@ msgid "Reset password" msgstr "" #: accounts/templates/accounts/login.html:31 -#: accounts/templates/accounts/register.html:38 templates/base.html:90 +#: accounts/templates/accounts/register.html:38 templates/base.html:84 #: templates/registration/password_reset_complete.html:18 #: templates/registration/password_reset_confirm.html:37 #: templates/registration/password_reset_done.html:17 @@ -108,7 +108,7 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:15 -#: ctfs/templates/ctfs/ctf_info.html:53 +#: ctfs/templates/ctfs/ctf_info.html:57 msgid "Date" msgstr "" @@ -166,39 +166,45 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:17 +#: ctfs/templates/ctfs/ctf_info.html:15 +msgid "" +"No translation available for this challenge. Try another lang (French or " +"English)." +msgstr "" + +#: ctfs/templates/ctfs/ctf_info.html:21 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:19 +#: ctfs/templates/ctfs/ctf_info.html:23 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:21 ctfs/templates/ctfs/ctf_info.html:30 +#: ctfs/templates/ctfs/ctf_info.html:25 ctfs/templates/ctfs/ctf_info.html:34 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:23 ctfs/templates/ctfs/ctf_info.html:32 +#: ctfs/templates/ctfs/ctf_info.html:27 ctfs/templates/ctfs/ctf_info.html:36 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:27 +#: ctfs/templates/ctfs/ctf_info.html:31 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:45 +#: ctfs/templates/ctfs/ctf_info.html:49 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:68 +#: ctfs/templates/ctfs/ctf_info.html:72 msgid "Nobody have solved this CTF." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:74 +#: ctfs/templates/ctfs/ctf_info.html:78 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:75 +#: ctfs/templates/ctfs/ctf_info.html:79 msgid "Point reward" msgstr "" @@ -234,27 +240,19 @@ msgstr "" msgid "Flags counter" msgstr "" -#: project/settings.py:120 -msgid "Global Site" +#: project/settings.py:111 +msgid "English" msgstr "" -#: project/settings.py:121 -msgid "Italian" -msgstr "" - -#: project/settings.py:122 +#: project/settings.py:112 msgid "German" msgstr "" -#: project/settings.py:123 +#: project/settings.py:113 msgid "French" msgstr "" -#: project/settings.py:124 -msgid "Spanish" -msgstr "" - -#: project/settings.py:125 +#: project/settings.py:114 msgid "Russian" msgstr "" @@ -286,11 +284,11 @@ msgstr "" msgid "Scoreboard" msgstr "" -#: templates/base.html:86 +#: templates/base.html:80 msgid "Logout" msgstr "" -#: templates/base.html:93 +#: templates/base.html:87 msgid "Sign Up" msgstr "" diff --git a/src/locale/es/LC_MESSAGES/django.po b/src/locale/es/LC_MESSAGES/django.po index b55243e..73b0b36 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: 2021-05-10 19:28+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,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:50 ctfs/templates/ctfs/ctfs_list.html:12 +#: ctfs/templates/ctfs/ctf_info.html:54 ctfs/templates/ctfs/ctfs_list.html:12 #: scoreboard/templates/scoreboard/scoreboard.html:12 msgid "Username" msgstr "" @@ -31,7 +31,7 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:51 +#: ctfs/templates/ctfs/ctf_info.html:55 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Website" msgstr "" @@ -54,7 +54,7 @@ msgstr "" #: accounts/templates/accounts/edit.html:66 #: accounts/templates/accounts/profile.html:37 -#: ctfs/templates/ctfs/ctf_info.html:52 ctfs/templates/ctfs/ctfs_list.html:13 +#: ctfs/templates/ctfs/ctf_info.html:56 ctfs/templates/ctfs/ctfs_list.html:13 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Score" msgstr "" @@ -78,7 +78,7 @@ msgid "Reset password" msgstr "" #: accounts/templates/accounts/login.html:31 -#: accounts/templates/accounts/register.html:38 templates/base.html:90 +#: accounts/templates/accounts/register.html:38 templates/base.html:84 #: templates/registration/password_reset_complete.html:18 #: templates/registration/password_reset_confirm.html:37 #: templates/registration/password_reset_done.html:17 @@ -108,7 +108,7 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:15 -#: ctfs/templates/ctfs/ctf_info.html:53 +#: ctfs/templates/ctfs/ctf_info.html:57 msgid "Date" msgstr "" @@ -166,39 +166,45 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:17 +#: ctfs/templates/ctfs/ctf_info.html:15 +msgid "" +"No translation available for this challenge. Try another lang (French or " +"English)." +msgstr "" + +#: ctfs/templates/ctfs/ctf_info.html:21 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:19 +#: ctfs/templates/ctfs/ctf_info.html:23 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:21 ctfs/templates/ctfs/ctf_info.html:30 +#: ctfs/templates/ctfs/ctf_info.html:25 ctfs/templates/ctfs/ctf_info.html:34 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:23 ctfs/templates/ctfs/ctf_info.html:32 +#: ctfs/templates/ctfs/ctf_info.html:27 ctfs/templates/ctfs/ctf_info.html:36 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:27 +#: ctfs/templates/ctfs/ctf_info.html:31 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:45 +#: ctfs/templates/ctfs/ctf_info.html:49 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:68 +#: ctfs/templates/ctfs/ctf_info.html:72 msgid "Nobody have solved this CTF." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:74 +#: ctfs/templates/ctfs/ctf_info.html:78 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:75 +#: ctfs/templates/ctfs/ctf_info.html:79 msgid "Point reward" msgstr "" @@ -234,27 +240,19 @@ msgstr "" msgid "Flags counter" msgstr "" -#: project/settings.py:120 -msgid "Global Site" +#: project/settings.py:111 +msgid "English" msgstr "" -#: project/settings.py:121 -msgid "Italian" -msgstr "" - -#: project/settings.py:122 +#: project/settings.py:112 msgid "German" msgstr "" -#: project/settings.py:123 +#: project/settings.py:113 msgid "French" msgstr "" -#: project/settings.py:124 -msgid "Spanish" -msgstr "" - -#: project/settings.py:125 +#: project/settings.py:114 msgid "Russian" msgstr "" @@ -286,11 +284,11 @@ msgstr "" msgid "Scoreboard" msgstr "" -#: templates/base.html:86 +#: templates/base.html:80 msgid "Logout" msgstr "" -#: templates/base.html:93 +#: templates/base.html:87 msgid "Sign Up" msgstr "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index e649124..1f21fb8 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: 2021-09-06 18:30+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,11 +21,8 @@ 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:50 ctfs/templates/ctfs/ctfs_list.html:12 -#: ctfs/templates/templates/ctfs/ctf_info.html:50 -#: ctfs/templates/templates/ctfs/ctfs_list.html:12 +#: ctfs/templates/ctfs/ctf_info.html:54 ctfs/templates/ctfs/ctfs_list.html:12 #: scoreboard/templates/scoreboard/scoreboard.html:12 -#: templates/ctfs/ctf_info.html:50 templates/ctfs/ctfs_list.html:12 msgid "Username" msgstr "Pseudo" @@ -34,10 +31,8 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:51 -#: ctfs/templates/templates/ctfs/ctf_info.html:51 +#: ctfs/templates/ctfs/ctf_info.html:55 #: scoreboard/templates/scoreboard/scoreboard.html:13 -#: templates/ctfs/ctf_info.html:51 msgid "Website" msgstr "Site internet" @@ -59,11 +54,8 @@ msgstr "Connecter Discord" #: accounts/templates/accounts/edit.html:66 #: accounts/templates/accounts/profile.html:37 -#: ctfs/templates/ctfs/ctf_info.html:52 ctfs/templates/ctfs/ctfs_list.html:13 -#: ctfs/templates/templates/ctfs/ctf_info.html:52 -#: ctfs/templates/templates/ctfs/ctfs_list.html:13 +#: ctfs/templates/ctfs/ctf_info.html:56 ctfs/templates/ctfs/ctfs_list.html:13 #: scoreboard/templates/scoreboard/scoreboard.html:14 -#: templates/ctfs/ctf_info.html:52 templates/ctfs/ctfs_list.html:13 msgid "Score" msgstr "Score" @@ -116,9 +108,7 @@ msgid "Points" msgstr "Points" #: accounts/templates/accounts/profile.html:15 -#: ctfs/templates/ctfs/ctf_info.html:53 -#: ctfs/templates/templates/ctfs/ctf_info.html:53 -#: templates/ctfs/ctf_info.html:53 +#: ctfs/templates/ctfs/ctf_info.html:57 msgid "Date" msgstr "Date" @@ -150,7 +140,9 @@ msgstr "Votre compte était inactif." msgid "" "The password must contain at least one letter and at least one digit or " "punctuation character." -msgstr "Le mot de passe doit contenir au moins une lettre, un chiffre et un signe de ponctuation." +msgstr "" +"Le mot de passe doit contenir au moins une lettre, un chiffre et un signe de " +"ponctuation." #: accounts/views/views.py:52 msgid "A user with that email already exists." @@ -173,87 +165,64 @@ msgid "Updated." msgstr "Mis à jour." #: ctfs/templates/ctfs/ctf_info.html:9 -#: ctfs/templates/templates/ctfs/ctf_info.html:9 templates/ctfs/ctf_info.html:9 msgid "Published date" msgstr "Date de publication" -#: ctfs/templates/ctfs/ctf_info.html:17 -#: ctfs/templates/templates/ctfs/ctf_info.html:17 -#: templates/ctfs/ctf_info.html:17 +#: ctfs/templates/ctfs/ctf_info.html:15 +msgid "" +"No translation available for this challenge. Try another lang (French or " +"English)." +msgstr "" + +#: ctfs/templates/ctfs/ctf_info.html:21 msgid "Congratulation !" msgstr "Félicitations !" -#: ctfs/templates/ctfs/ctf_info.html:19 -#: ctfs/templates/templates/ctfs/ctf_info.html:19 -#: templates/ctfs/ctf_info.html:19 +#: ctfs/templates/ctfs/ctf_info.html:23 msgid "Already flagged" msgstr "Déjà résolu" -#: ctfs/templates/ctfs/ctf_info.html:21 ctfs/templates/ctfs/ctf_info.html:30 -#: ctfs/templates/templates/ctfs/ctf_info.html:21 -#: ctfs/templates/templates/ctfs/ctf_info.html:30 -#: templates/ctfs/ctf_info.html:21 templates/ctfs/ctf_info.html:30 +#: ctfs/templates/ctfs/ctf_info.html:25 ctfs/templates/ctfs/ctf_info.html:34 msgid "Start the challenge" msgstr "Démarrer le challenge" -#: ctfs/templates/ctfs/ctf_info.html:23 ctfs/templates/ctfs/ctf_info.html:32 -#: ctfs/templates/templates/ctfs/ctf_info.html:23 -#: ctfs/templates/templates/ctfs/ctf_info.html:32 -#: templates/ctfs/ctf_info.html:23 templates/ctfs/ctf_info.html:32 +#: ctfs/templates/ctfs/ctf_info.html:27 ctfs/templates/ctfs/ctf_info.html:36 msgid "Download" msgstr "Télécharger" -#: ctfs/templates/ctfs/ctf_info.html:27 -#: ctfs/templates/templates/ctfs/ctf_info.html:27 -#: templates/ctfs/ctf_info.html:27 +#: ctfs/templates/ctfs/ctf_info.html:31 msgid "Wrong flag ! You can do it !" msgstr "Mauvais flag ! Vous pouvez le faire !" -#: ctfs/templates/ctfs/ctf_info.html:45 -#: ctfs/templates/templates/ctfs/ctf_info.html:45 -#: templates/ctfs/ctf_info.html:45 +#: ctfs/templates/ctfs/ctf_info.html:49 msgid "Solved by" msgstr "Résolu par" -#: ctfs/templates/ctfs/ctf_info.html:68 -#: ctfs/templates/templates/ctfs/ctf_info.html:68 -#: templates/ctfs/ctf_info.html:68 +#: ctfs/templates/ctfs/ctf_info.html:72 msgid "Nobody have solved this CTF." msgstr "Personne n'a résolu ce CTF." -#: ctfs/templates/ctfs/ctf_info.html:74 -#: ctfs/templates/templates/ctfs/ctf_info.html:74 -#: templates/ctfs/ctf_info.html:74 +#: ctfs/templates/ctfs/ctf_info.html:78 msgid "Author" msgstr "Auteur" -#: ctfs/templates/ctfs/ctf_info.html:75 -#: ctfs/templates/templates/ctfs/ctf_info.html:75 -#: templates/ctfs/ctf_info.html:75 +#: ctfs/templates/ctfs/ctf_info.html:79 msgid "Point reward" msgstr "Points" #: ctfs/templates/ctfs/ctfs_list.html:14 -#: ctfs/templates/templates/ctfs/ctfs_list.html:14 -#: templates/ctfs/ctfs_list.html:14 msgid "Solved" msgstr "Résolu" #: ctfs/templates/ctfs/ctfs_list.html:37 -#: ctfs/templates/templates/ctfs/ctfs_list.html:37 -#: templates/ctfs/ctfs_list.html:37 msgid "No ctf available for this category." msgstr "Il n'y a pas de challenges dans cette catégorie." #: ctfs/templates/ctfs/ctfs_list.html:42 -#: ctfs/templates/templates/ctfs/ctfs_list.html:42 -#: templates/ctfs/ctfs_list.html:42 msgid "Categories" msgstr "Catégories" -#: ctfs/templates/ctfs/ctfs_list.html:48 -#: ctfs/templates/templates/ctfs/ctfs_list.html:48 templates/base.html:54 -#: templates/ctfs/ctfs_list.html:48 +#: ctfs/templates/ctfs/ctfs_list.html:48 templates/base.html:54 msgid "No category available." msgstr "Il n'y a pas de catégorie disponible." @@ -273,19 +242,19 @@ msgstr "Pas de challenge disponible" msgid "Flags counter" msgstr "Compteur de flags" -#: project/settings.py:118 +#: project/settings.py:111 msgid "English" msgstr "Anglais" -#: project/settings.py:119 +#: project/settings.py:112 msgid "German" msgstr "Allemand" -#: project/settings.py:120 +#: project/settings.py:113 msgid "French" msgstr "Français" -#: project/settings.py:121 +#: project/settings.py:114 msgid "Russian" msgstr "Russe" @@ -357,7 +326,9 @@ msgstr "Soumettre" msgid "" "We've emailed you instructions for setting your password. You should receive " "the email shortly!" -msgstr "Vous devrierz recevoir rapidement un email avec des instructions pour réinitialiser votre mot de passe." +msgstr "" +"Vous devrierz recevoir rapidement un email avec des instructions pour " +"réinitialiser votre mot de passe." #: templates/registration/password_reset_form.html:15 msgid "Reset" diff --git a/src/locale/it/LC_MESSAGES/django.po b/src/locale/it/LC_MESSAGES/django.po index b55243e..73b0b36 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: 2021-05-10 19:28+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,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:50 ctfs/templates/ctfs/ctfs_list.html:12 +#: ctfs/templates/ctfs/ctf_info.html:54 ctfs/templates/ctfs/ctfs_list.html:12 #: scoreboard/templates/scoreboard/scoreboard.html:12 msgid "Username" msgstr "" @@ -31,7 +31,7 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:51 +#: ctfs/templates/ctfs/ctf_info.html:55 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Website" msgstr "" @@ -54,7 +54,7 @@ msgstr "" #: accounts/templates/accounts/edit.html:66 #: accounts/templates/accounts/profile.html:37 -#: ctfs/templates/ctfs/ctf_info.html:52 ctfs/templates/ctfs/ctfs_list.html:13 +#: ctfs/templates/ctfs/ctf_info.html:56 ctfs/templates/ctfs/ctfs_list.html:13 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Score" msgstr "" @@ -78,7 +78,7 @@ msgid "Reset password" msgstr "" #: accounts/templates/accounts/login.html:31 -#: accounts/templates/accounts/register.html:38 templates/base.html:90 +#: accounts/templates/accounts/register.html:38 templates/base.html:84 #: templates/registration/password_reset_complete.html:18 #: templates/registration/password_reset_confirm.html:37 #: templates/registration/password_reset_done.html:17 @@ -108,7 +108,7 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:15 -#: ctfs/templates/ctfs/ctf_info.html:53 +#: ctfs/templates/ctfs/ctf_info.html:57 msgid "Date" msgstr "" @@ -166,39 +166,45 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:17 +#: ctfs/templates/ctfs/ctf_info.html:15 +msgid "" +"No translation available for this challenge. Try another lang (French or " +"English)." +msgstr "" + +#: ctfs/templates/ctfs/ctf_info.html:21 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:19 +#: ctfs/templates/ctfs/ctf_info.html:23 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:21 ctfs/templates/ctfs/ctf_info.html:30 +#: ctfs/templates/ctfs/ctf_info.html:25 ctfs/templates/ctfs/ctf_info.html:34 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:23 ctfs/templates/ctfs/ctf_info.html:32 +#: ctfs/templates/ctfs/ctf_info.html:27 ctfs/templates/ctfs/ctf_info.html:36 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:27 +#: ctfs/templates/ctfs/ctf_info.html:31 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:45 +#: ctfs/templates/ctfs/ctf_info.html:49 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:68 +#: ctfs/templates/ctfs/ctf_info.html:72 msgid "Nobody have solved this CTF." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:74 +#: ctfs/templates/ctfs/ctf_info.html:78 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:75 +#: ctfs/templates/ctfs/ctf_info.html:79 msgid "Point reward" msgstr "" @@ -234,27 +240,19 @@ msgstr "" msgid "Flags counter" msgstr "" -#: project/settings.py:120 -msgid "Global Site" +#: project/settings.py:111 +msgid "English" msgstr "" -#: project/settings.py:121 -msgid "Italian" -msgstr "" - -#: project/settings.py:122 +#: project/settings.py:112 msgid "German" msgstr "" -#: project/settings.py:123 +#: project/settings.py:113 msgid "French" msgstr "" -#: project/settings.py:124 -msgid "Spanish" -msgstr "" - -#: project/settings.py:125 +#: project/settings.py:114 msgid "Russian" msgstr "" @@ -286,11 +284,11 @@ msgstr "" msgid "Scoreboard" msgstr "" -#: templates/base.html:86 +#: templates/base.html:80 msgid "Logout" msgstr "" -#: templates/base.html:93 +#: templates/base.html:87 msgid "Sign Up" msgstr "" diff --git a/src/locale/ru/LC_MESSAGES/django.po b/src/locale/ru/LC_MESSAGES/django.po index 884ec19..40a03c2 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: 2021-05-10 19:28+0000\n" +"POT-Creation-Date: 2021-09-07 19:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,7 +23,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:50 ctfs/templates/ctfs/ctfs_list.html:12 +#: ctfs/templates/ctfs/ctf_info.html:54 ctfs/templates/ctfs/ctfs_list.html:12 #: scoreboard/templates/scoreboard/scoreboard.html:12 msgid "Username" msgstr "" @@ -33,7 +33,7 @@ msgid "Email" msgstr "" #: accounts/templates/accounts/edit.html:30 -#: ctfs/templates/ctfs/ctf_info.html:51 +#: ctfs/templates/ctfs/ctf_info.html:55 #: scoreboard/templates/scoreboard/scoreboard.html:13 msgid "Website" msgstr "" @@ -56,7 +56,7 @@ msgstr "" #: accounts/templates/accounts/edit.html:66 #: accounts/templates/accounts/profile.html:37 -#: ctfs/templates/ctfs/ctf_info.html:52 ctfs/templates/ctfs/ctfs_list.html:13 +#: ctfs/templates/ctfs/ctf_info.html:56 ctfs/templates/ctfs/ctfs_list.html:13 #: scoreboard/templates/scoreboard/scoreboard.html:14 msgid "Score" msgstr "счет" @@ -80,7 +80,7 @@ msgid "Reset password" msgstr "" #: accounts/templates/accounts/login.html:31 -#: accounts/templates/accounts/register.html:38 templates/base.html:90 +#: accounts/templates/accounts/register.html:38 templates/base.html:84 #: templates/registration/password_reset_complete.html:18 #: templates/registration/password_reset_confirm.html:37 #: templates/registration/password_reset_done.html:17 @@ -110,7 +110,7 @@ msgid "Points" msgstr "" #: accounts/templates/accounts/profile.html:15 -#: ctfs/templates/ctfs/ctf_info.html:53 +#: ctfs/templates/ctfs/ctf_info.html:57 msgid "Date" msgstr "" @@ -168,39 +168,45 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:17 +#: ctfs/templates/ctfs/ctf_info.html:15 +msgid "" +"No translation available for this challenge. Try another lang (French or " +"English)." +msgstr "" + +#: ctfs/templates/ctfs/ctf_info.html:21 msgid "Congratulation !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:19 +#: ctfs/templates/ctfs/ctf_info.html:23 msgid "Already flagged" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:21 ctfs/templates/ctfs/ctf_info.html:30 +#: ctfs/templates/ctfs/ctf_info.html:25 ctfs/templates/ctfs/ctf_info.html:34 msgid "Start the challenge" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:23 ctfs/templates/ctfs/ctf_info.html:32 +#: ctfs/templates/ctfs/ctf_info.html:27 ctfs/templates/ctfs/ctf_info.html:36 msgid "Download" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:27 +#: ctfs/templates/ctfs/ctf_info.html:31 msgid "Wrong flag ! You can do it !" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:45 +#: ctfs/templates/ctfs/ctf_info.html:49 msgid "Solved by" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:68 +#: ctfs/templates/ctfs/ctf_info.html:72 msgid "Nobody have solved this CTF." msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:74 +#: ctfs/templates/ctfs/ctf_info.html:78 msgid "Author" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:75 +#: ctfs/templates/ctfs/ctf_info.html:79 msgid "Point reward" msgstr "" @@ -236,27 +242,19 @@ msgstr "" msgid "Flags counter" msgstr "" -#: project/settings.py:120 -msgid "Global Site" +#: project/settings.py:111 +msgid "English" msgstr "" -#: project/settings.py:121 -msgid "Italian" -msgstr "" - -#: project/settings.py:122 +#: project/settings.py:112 msgid "German" msgstr "" -#: project/settings.py:123 +#: project/settings.py:113 msgid "French" msgstr "" -#: project/settings.py:124 -msgid "Spanish" -msgstr "" - -#: project/settings.py:125 +#: project/settings.py:114 msgid "Russian" msgstr "" @@ -288,11 +286,11 @@ msgstr "" msgid "Scoreboard" msgstr "" -#: templates/base.html:86 +#: templates/base.html:80 msgid "Logout" msgstr "Выйти" -#: templates/base.html:93 +#: templates/base.html:87 msgid "Sign Up" msgstr "" diff --git a/src/project/settings.py b/src/project/settings.py index 8cc1ab7..27a34f9 100644 --- a/src/project/settings.py +++ b/src/project/settings.py @@ -14,19 +14,14 @@ import os from django.utils.translation import gettext_lazy as _ from local_settings import * +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/ - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - # Application definition INSTALLED_APPS = [ diff --git a/src/scoreboard/templates/scoreboard/scoreboard.html b/src/scoreboard/templates/scoreboard/scoreboard.html index ea2f2ca..42772cc 100644 --- a/src/scoreboard/templates/scoreboard/scoreboard.html +++ b/src/scoreboard/templates/scoreboard/scoreboard.html @@ -18,7 +18,7 @@ {% for s in scores %} # {{ forloop.counter0|add:scores.start_index }} - {{ s.user.username }} + {{ s.user.username }} {% if s.user.userprofileinfo.portfolio_site %} {{ s.user.userprofileinfo.portfolio_site }} diff --git a/src/templates/base.html b/src/templates/base.html index 31d8ca5..b9b5012 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -48,7 +48,7 @@
      {% if cats %} {% for c in cats %} - {{ c.name }} + {{ c.name }} {% endfor %} {% else %} {% translate "No category available." %} @@ -64,7 +64,7 @@ {% get_available_languages as languages %} {% for lang_code, lang_name in languages %}
    • - + flag {{ lang_name }}
      • diff --git a/src/templates/ctfs/ctf_info.html b/src/templates/ctfs/ctf_info.html deleted file mode 100755 index 1e5243c..0000000 --- a/src/templates/ctfs/ctf_info.html +++ /dev/null @@ -1,81 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -{% load i18n %} -
      -
      -
      -
      -

      {{ ctf.name }}

      - {% trans "Published date" %} : {{ ctf.pub_date }} -
      -
      - {{ ctf.description|safe }} -
      -
      - {% if request.user.is_authenticated %} - {% if valitated == True %} -

      {% trans "Congratulation !" %}

      - {% elif alvalitated == True %} -

      {% trans "Already flagged" %}

      - {% if ctf.ctf_url %} - {% trans "Start the challenge" %}
      - {% elif ctf.file %} - {% trans "Download" %}
      - {% endif %} - {% else %} - {% if failed %} -

      {% trans "Wrong flag ! You can do it !" %}

      - {% endif %} - {% if ctf.ctf_url %} - {% trans "Start the challenge" %}
      - {% elif ctf.file %} - {% trans "Download" %}
      - {% endif %} -
      - {% csrf_token %} - - -
      - - {% endif %} - {% endif %} -
      -
      -
      -

      {% trans "Solved by" %}

      - {% if solved_list %} - - - - - - - - - - - {% for s in solved_list %} - - - - - - - {% endfor %} - -
      {% trans "Username" %}{% trans "Website" %}{% trans "Score" %}{% trans "Date" %}
      {{ s.user.username }}{{ s.user.userprofileinfo.portfolio_site }}{{ s.user.userprofileinfo.score }}{{ s.flag_date }}
      - {% else %} -

      {% trans "Nobody have solved this CTF." %}

      - {% endif %} -
      -
      -
      -
        -
      • {% trans "Author" %} : {{ ctf.author.username }}
        • -
      • {% trans "Point reward" %} : {{ ctf.points }}
        • - -
      -
      -
      -{% endblock %} - diff --git a/src/templates/ctfs/ctfs_list.html b/src/templates/ctfs/ctfs_list.html deleted file mode 100755 index 3356b15..0000000 --- a/src/templates/ctfs/ctfs_list.html +++ /dev/null @@ -1,53 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -{% load i18n %} -
      -
      -

      {{ cat.name }}

      - {% if ctfs %} - - - - - - - - - - - {% for ctf in ctfs %} - - {% if request.user.is_authenticated %} - {% if ctf.solved %} - - {% else %} - - {% endif %} - {% else %} - - {% endif %} - - - - - {% endfor %} - -
      {% trans "Username" %}{% trans "Score" %}{% trans "Solved" %}
      ✓✕ {{ ctf.name }}{{ ctf.points }}{{ ctf.solved_num }}
      - {% else %} -

      {% trans "No ctf available for this category." %}

      - {% endif %} -
      -
      -
        -
      • {% trans "Categories" %}
        • - {% if cats %} - {% for c in cats %} - {{ c.name }} - {% endfor %} - {% else %} -
      • {% trans "No category available." %}
        • - {% endif %} -
      -
      -
      -{% endblock %}